fixing issues with preprocessor directives

classifier/classifierbase/VecClassifier.h

@@ -14,8 +14,12 @@
 #include "vislearning/cbaselib/LabeledSet.h"
 #include "vislearning/cbaselib/ClassificationResult.h"
 
-#define ROADWORKS fthrow(NICE::Exception, "clone(): not yet implemented!");
-#define ROADWORKSADD fthrow(NICE::Exception, "teach (int classno, const NICE::Vector & x ): not yet implemented!");
+#ifndef ROADWORKSVC
+#define ROADWORKSVC fthrow(NICE::Exception, "clone(): not yet implemented!");
+#endif
+#ifndef ROADWORKSADDVC
+#define ROADWORKSADDVC fthrow(NICE::Exception, "teach (int classno, const NICE::Vector & x ): not yet implemented!");
+#endif
 
 namespace OBJREC
 {
@@ -55,18 +59,18 @@ class VecClassifier : public NICE::Persistent
     /** clone this object */
     virtual VecClassifier *clone ( void ) const
     {
-      ROADWORKS;
+      ROADWORKSVC;
     };
     
     virtual void teach (int classno, const NICE::Vector & x )
     {
-      ROADWORKSADD;
+      ROADWORKSADDVC;
     };
 
 };
 
-#undef ROADWORKS
-
+#undef ROADWORKSVC
+#undef ROADWORKSADDVC
 
 } // namespace
 

math/ftransform/PCA.h

@@ -8,7 +8,7 @@
 #ifndef PCAINCLUDE
 #define PCAINCLUDE
 
-#include "core/image/Filter.h"
+//#include "core/image/Filter.h"
 #include "core/vector/VectorT.h"
 #include "core/vector/MatrixT.h"