diff options
| author | Bernard Normier <bernard@zeroc.com> | 2019-07-15 05:14:32 -0400 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-07-15 11:14:32 +0200 |
| commit | 2e60ce8af12b12a8c1aed18c7bea2413016d4004 (patch) | |
| tree | 4f5f578bb99ea4713cbc1d0e57346b6036c70f10 /cpp/src/IceGrid/IceGridNode.cpp | |
| parent | Test script minor warning fixes (diff) | |
| download | ice-2e60ce8af12b12a8c1aed18c7bea2413016d4004.tar.bz2 ice-2e60ce8af12b12a8c1aed18c7bea2413016d4004.tar.xz ice-2e60ce8af12b12a8c1aed18c7bea2413016d4004.zip | |
Port to AIX with g++, xlC_r and xlclang++ (#434)
Diffstat (limited to 'cpp/src/IceGrid/IceGridNode.cpp')
| -rw-r--r-- | cpp/src/IceGrid/IceGridNode.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index f80cf673236..9a96452a520 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -32,7 +32,12 @@ using namespace Ice; using namespace IceInternal; using namespace IceGrid; +// Work-around for anonymous namspace bug in xlclang++ +#ifdef __ibmxl__ +namespace IceGridNodeNamespace +#else namespace +#endif { class ProcessI : public Process @@ -110,6 +115,10 @@ setNoIndexingAttribute(const string& path) } +#ifdef __ibmxl__ +using namespace IceGridNodeNamespace; +#endif + CollocatedRegistry::CollocatedRegistry(const CommunicatorPtr& com, const ActivatorPtr& activator, bool nowarn, |