mac warning e windows error compiling fixed

11 years ago · 9d0721b830
parent aed1b8a49d
commit 9d0721b830
2 changed files with 3 additions and 1 deletions
--- a/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp
+++ b/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp
@ -40,7 +40,7 @@
 //M*/

 #ifndef __OPENCV_SALIENCY_SPECIALIZED_CLASSES_HPP__
-#define __OPENCV_SALIENCY_SPECIALIZED_CLASSES_HPP_
+#define __OPENCV_SALIENCY_SPECIALIZED_CLASSES_HPP__

 #include "saliencyBaseClasses.hpp"
 #include "BING/kyheader.h"
--- a/modules/saliency/src/BING/CmTimer.h
+++ b/modules/saliency/src/BING/CmTimer.h
@ -63,6 +63,8 @@ public:
 private:
    CStr title;

+    CmTimer& operator=(const CmTimer&);
+
    bool is_started;
    clock_t start_clock;
    clock_t cumulative_clock;