From ee4a66a377de426be9db092a1fee3b2e26b7c885 Mon Sep 17 00:00:00 2001 From: nds Date: Thu, 17 May 2007 07:50:36 +0000 Subject: [PATCH] Modification for Win32 platform --- bin/setenv.py | 7 +++++-- src/DSC/DSC_Basic/ConnectionManager_i.cxx | 2 +- src/DSC/DSC_Basic/ConnectionManager_i.hxx | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/setenv.py b/bin/setenv.py index 517df5af6..b401b3709 100755 --- 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 260c88c7f..59f3b2624 100644 --- 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 e3475f243..c0459f482 100644 --- 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); -- 2.39.2