Delivery of windows porting

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ad9fc2c8464ac2f24277882f2215f567ea93cd32..080ef8049cd1332cfcd5559de71cf329182cbbff 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -69,9 +69,4 @@ ADD_SUBDIRECTORY(GlyphCIH) # EDF15785
 ADD_SUBDIRECTORY(ElectromagnetismVecteur)
 ADD_SUBDIRECTORY(ElectromagnetismStreamTraceur)
 ADD_SUBDIRECTORY(ElectromagnetismFluxDisc)
-
-IF(NOT WIN32)
-  # still being under investigations
-  MESSAGE(WARNING "ElectromagnetismRotation will be skipped")
-  ADD_SUBDIRECTORY(ElectromagnetismRotation)
-ENDIF(NOT WIN32)
+ADD_SUBDIRECTORY(ElectromagnetismRotation)

diff --git a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationHelper/ElectromagnetismRotationHelper.cxx b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationHelper/ElectromagnetismRotationHelper.cxx
index b7c303201cdc7a4f0c9842f3dc02f6692dc7ffdf..e62425a7c3daa23b3c57ff5f77381aa271b06d51 100644 (file)
--- a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationHelper/ElectromagnetismRotationHelper.cxx
+++ b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationHelper/ElectromagnetismRotationHelper.cxx
@@ -35,10 +35,6 @@
 
 const char ZE_SEPP[]="@@][@@";
 
-const char ElectromagnetismRotationGrp::START[]="GRP_";
-
-const char ElectromagnetismRotationFam::START[]="FAM_";
-
 ElectromagnetismRotationStatus::ElectromagnetismRotationStatus(const char *name):_status(false),_name(name)
 {
 }
@@ -67,13 +63,18 @@ bool ElectromagnetismRotationGrp::isSameAs(const ElectromagnetismRotationGrp& ot
     return false;
 }
 
+ElectromagnetismRotationGrp::ElectromagnetismRotationGrp(const char *name):ElectromagnetismRotationStatus(name)
+{
+  std::ostringstream oss; oss << ElectromagnetismRotationGrp::start() << name; _ze_key_name=oss.str();
+}
+
 ElectromagnetismRotationFam::ElectromagnetismRotationFam(const char *name):ElectromagnetismRotationStatus(name),_id(0)
 {
   std::size_t pos(_name.find(ZE_SEPP));
   std::string name0(_name.substr(0,pos)),name1(_name.substr(pos+strlen(ZE_SEPP)));
   std::istringstream iss(name1);
   iss >> _id;
-  std::ostringstream oss; oss << START << name; _ze_key_name=oss.str(); _name=name0;
+  std::ostringstream oss; oss << ElectromagnetismRotationFam::start() << name; _ze_key_name=oss.str(); _name=name0;
 }
 
 bool ElectromagnetismRotationFam::isSameAs(const ElectromagnetismRotationFam& other) const

diff --git a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationHelper/ElectromagnetismRotationHelper.h b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationHelper/ElectromagnetismRotationHelper.h
index aade3927d19c2a7fd580fb30743f12ca66fd26b5..2c743d3e2c3cb8d08b79770dd009f5a26e81484f 100644 (file)
--- a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationHelper/ElectromagnetismRotationHelper.h
+++ b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationHelper/ElectromagnetismRotationHelper.h
@@ -25,6 +25,7 @@
 #include <set>
 #include <map>
 
+#define MEDLOADERFORPV_EXPORTS
 #include "MEDLoaderForPV.h"
 
 class MEDLOADERFORPV_EXPORT ElectromagnetismRotationStatus
@@ -41,20 +42,20 @@ public:
   virtual void printMySelf(std::ostream& os) const;
   virtual bool isSameAs(const ElectromagnetismRotationStatus& other) const;
 protected:
-mutable bool _status;
-std::string _name;
-std::string _ze_key_name;
+  mutable bool _status;
+  std::string _name;
+  std::string _ze_key_name;
 };
 
 class MEDLOADERFORPV_EXPORT ElectromagnetismRotationGrp : public ElectromagnetismRotationStatus
 {
 public:
-  ElectromagnetismRotationGrp(const char *name):ElectromagnetismRotationStatus(name) { std::ostringstream oss; oss << START << name; _ze_key_name=oss.str(); }
+  ElectromagnetismRotationGrp(const char *name);
   void setFamilies(const std::vector<std::string>& fams) { _fams=fams; }
   const std::vector<std::string>& getFamiliesLyingOn() const { return _fams; }
   bool isSameAs(const ElectromagnetismRotationGrp& other) const;
+  static const char* start() { return "GRP_"; }
 public:
-  static const char START[];
   std::vector<std::string> _fams;
 };
 
@@ -66,8 +67,7 @@ public:
   void fillIdsToKeep(std::set<int>& s) const;
   int getId() const { return _id; }
   bool isSameAs(const ElectromagnetismRotationFam& other) const;
-public:
-  static const char START[];
+  static const char* start() { return "FAM_"; }
 private:
   int _id;
 };

diff --git a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx
index ce20795926a07d6f3903f6a6f6b1e0bf15fb4134..dfe3af6d382e70eec3a871c32c21de9daa8bc3e7 100644 (file)
--- a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx
+++ b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx
@@ -406,12 +406,12 @@ int vtkElectromagnetismRotation::GetSILUpdateStamp()
 
 const char* vtkElectromagnetismRotation::GetGrpStart()
 {
-  return ElectromagnetismRotationGrp::START;
+  return ElectromagnetismRotationGrp::start();
 }
 
 const char* vtkElectromagnetismRotation::GetFamStart()
 {
-  return ElectromagnetismRotationFam::START;
+  return ElectromagnetismRotationFam::start();
 }
 
 void vtkElectromagnetismRotation::PrintSelf(ostream& os, vtkIndent indent)