SALOME 9.1.0 Windows version

[modules/yacs.git] / src / engine / ComplexWeight.hxx

diff --git a/src/engine/ComplexWeight.hxx b/src/engine/ComplexWeight.hxx
index e8bb55c32534723c6fbb2520f4baf742ca263025..0674ea5528a69cce4f53a3d7be7951206e5a7fee 100644 (file)
--- a/src/engine/ComplexWeight.hxx
+++ b/src/engine/ComplexWeight.hxx
@@ -20,13 +20,22 @@
 #ifndef __COMPLEXWEIGHT_HXX__
 #define __COMPLEXWEIGHT_HXX__
 
+#include "YACSlibEngineExport.hxx"
+
 #include <vector>
 
+#ifdef WIN32
+#ifdef max
+#undef max
+#endif
+#endif
+
+
 namespace YACS
 {
   namespace ENGINE
   {
-    class ComplexWeight
+    class YACSLIBENGINE_EXPORT ComplexWeight
     {
     public:
       ComplexWeight();
@@ -49,7 +58,7 @@ namespace YACS
       void setToZero() {_bootWeight=true; unsetElementary(); unsetLoop(); }
       int getNbCoresConsoLoopMax() const;
       void max(ComplexWeight &other);
-      ComplexWeight& addWeight(const ComplexWeight *other);
+      void addWeight(const ComplexWeight *other);
     protected:
       bool _bootWeight;
       // _loopWeight: vect<pair(weight,nbcorePerIteration)>, for first element of vector: nbcorePerIteration<0 -> unset, nbcorePerIteration==0 -> no loopweight (means no loop inside)