Copyright update 2020

[plugins/hexoticplugin.git] / src / HexoticPlugin / MG_Hexotic_API.cxx

diff --git a/src/HexoticPlugin/MG_Hexotic_API.cxx b/src/HexoticPlugin/MG_Hexotic_API.cxx
index 989fb5b12ced972938f20f5e2cfdb772ff3f44d7..82fc6ba90bb59195cbfbd7de742dbbd221187305 100644 (file)
--- a/src/HexoticPlugin/MG_Hexotic_API.cxx
+++ b/src/HexoticPlugin/MG_Hexotic_API.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2004-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2004-2020  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
@@ -19,6 +19,10 @@
 
 #include "MG_Hexotic_API.hxx"
 
+#ifdef WIN32
+#define NOMINMAX
+#endif
+
 #include <SMESH_Comment.hxx>
 #include <SMESH_File.hxx>
 #include <Utils_SALOME_Exception.hxx>
@@ -709,13 +713,14 @@ bool MG_Hexotic_API::LibData::Compute()
 
 MG_Hexotic_API::MG_Hexotic_API(volatile bool& cancelled_flag, double& progress)
 {
+  _useLib = false;
 #ifdef USE_MG_LIBS
   _useLib = true;
   _libData = new LibData( cancelled_flag, progress );
   _libData->Init();
-#endif
   if ( getenv("MG_HEXA_USE_EXE"))
     _useLib = false;
+#endif
 }
 
 //================================================================================
@@ -790,6 +795,8 @@ bool MG_Hexotic_API::Compute( const std::string& cmdLine, std::string& errStr )
       value = "";
       while ( i+1 < args.size() && args[i+1][0] != '-' )
       {
+        if ( strncmp( "1>", args[i+1].c_str(), 2 ) == 0 )
+          break;
         if ( !value.empty() ) value += " ";
         value += args[++i];
       }