Use tempfile.mkdtemp to create temporary directory

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

diff --git a/src/engine/ComplexWeight.cxx b/src/engine/ComplexWeight.cxx
index a55f454a2c3c39bcafd6bd5f8e6f524bf79c8610..5101cccc4f9192d10f38c18e951054b93c78277c 100644 (file)
--- a/src/engine/ComplexWeight.cxx
+++ b/src/engine/ComplexWeight.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2022  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -17,12 +17,17 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+
 #include "ComplexWeight.hxx"
 
 #include "Exception.hxx"
 
 using namespace YACS::ENGINE;
 
+#ifdef WIN32
+#include <algorithm>
+#endif
+
 ComplexWeight::ComplexWeight()
 {
   setToZero();
@@ -104,7 +109,7 @@ void ComplexWeight::max(ComplexWeight &other)
     _loopWeight=other._loopWeight;  
 }
 
-ComplexWeight& ComplexWeight::addWeight(const ComplexWeight *other)
+void ComplexWeight::addWeight(const ComplexWeight *other)
 {
   bool found;
   if ((!_bootWeight) && ((other->isUnsetLoopWeight() && this->isDefaultValueLoop()) || (this->isUnsetLoopWeight() && other->isDefaultValueLoop())))