diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/NodeI.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/PlatformInfo.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 6 |
4 files changed, 7 insertions, 9 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index e0dd6f16705..fa65046637c 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -381,7 +381,7 @@ Database::removeApplicationDescriptor(ObserverSessionI* session, const std::stri ApplicationHelper helper(p->second); unload(helper, entries); } - catch(const DeploymentException& ex) + catch(const DeploymentException&) { // // For some reasons the application became invalid. If diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index aedb23467c0..1f5d6b4fd18 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -18,10 +18,6 @@ #include <IceGrid/WaitQueue.h> #include <IceGrid/TraceLevels.h> -#if defined(_WIN32) -# include <direct.h> // For _getcwd -#endif - using namespace std; using namespace IcePatch2; using namespace IceGrid; diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp index 3fe3e834aa5..55b9e982be7 100644 --- a/cpp/src/IceGrid/PlatformInfo.cpp +++ b/cpp/src/IceGrid/PlatformInfo.cpp @@ -18,7 +18,9 @@ #include <IcePatch2/Util.h> -#if !defined(_WIN32) +#if defined(_WIN32) +# include <direct.h> // For _getcwd +#else # include <sys/utsname.h> # if defined(__APPLE__) # include <sys/sysctl.h> diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index bbcfb99a79e..bac1b356779 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -446,14 +446,14 @@ ServerEntry::syncImpl(AdapterPrxDict& adpts, int& activationTimeout, int& deacti { nodeCache.get(destroy.node)->destroyServer(destroy.descriptor->id); } - catch(NodeNotExistException& ex) + catch(NodeNotExistException&) { if(!load.descriptor) { throw NodeUnreachableException(destroy.node, "node is not active"); } } - catch(NodeUnreachableException& ex) + catch(NodeUnreachableException&) { if(!load.descriptor) { @@ -468,7 +468,7 @@ ServerEntry::syncImpl(AdapterPrxDict& adpts, int& activationTimeout, int& deacti { proxy = nodeCache.get(load.node)->loadServer(load, adpts, activationTimeout, deactivationTimeout); } - catch(NodeNotExistException& ex) + catch(NodeNotExistException&) { throw NodeUnreachableException(load.node, "node is not active"); } |