Modification for Win32 platform

diff --git a/bin/setenv.py b/bin/setenv.py
index 517df5af671aee88eef1ae3bb32808ea33f33d26..b401b37099c32b1fab83b404659ed9d9eae5ad23 100755 (executable)
--- a/bin/setenv.py
+++ b/bin/setenv.py
@@ -47,8 +47,11 @@ def add_path(directory, variable_name):
         newpath=[]
         for _dir in os.environ[variable_name].split(splitsym):
             if os.path.exists(_dir):
-                if not os.path.samefile(_dir, directory):
-                  newpath.append(_dir)
+                if sys.platform != "win32":
+                    if not os.path.samefile(_dir, directory):
+                        newpath.append(_dir)
+                else:
+                    newpath.append(_dir)
             else:
                 if os.path.abspath(_dir) != os.path.abspath(directory):
                   newpath.append(_dir)

diff --git a/src/DSC/DSC_Basic/ConnectionManager_i.cxx b/src/DSC/DSC_Basic/ConnectionManager_i.cxx
index 260c88c7f87de2b98e5e6cae32b7a1a77cd4b12f..59f3b262408963334a2fbbaa08e133dabe894598 100644 (file)
--- a/src/DSC/DSC_Basic/ConnectionManager_i.cxx
+++ b/src/DSC/DSC_Basic/ConnectionManager_i.cxx
@@ -73,7 +73,7 @@ throw (Engines::DSC::PortNotDefined,
 }
 
 void
-ConnectionManager_i::disconnect(const Engines::ConnectionManager::connectionId id,
+ConnectionManager_i::disconnect(Engines::ConnectionManager::connectionId id,
                                Engines::DSC::Message message)
 throw (Engines::ConnectionManager::BadId)
 {

diff --git a/src/DSC/DSC_Basic/ConnectionManager_i.hxx b/src/DSC/DSC_Basic/ConnectionManager_i.hxx
index e3475f2430e6653c091f2a975422dd2280762075..c0459f482cdaf9565b744b7d29d01c714b131ed5 100644 (file)
--- a/src/DSC/DSC_Basic/ConnectionManager_i.hxx
+++ b/src/DSC/DSC_Basic/ConnectionManager_i.hxx
@@ -63,7 +63,7 @@ class DSC_BASIC_EXPORT ConnectionManager_i :
      *
      * \see Engines::ConnectionManager::disconnect
      */
-    void disconnect(const Engines::ConnectionManager::connectionId id,
+    void disconnect(Engines::ConnectionManager::connectionId id,
                    Engines::DSC::Message message)
       throw (Engines::ConnectionManager::BadId);