diff options
| author | Jose <jose@zeroc.com> | 2013-07-12 14:41:21 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-07-12 14:41:21 +0200 |
| commit | 9c0318cb3d66ebe717aefbae786c4f28fa4b3e91 (patch) | |
| tree | 9f2c478995e580320bc931fef95c95dfbffb4a0a /cpp/src | |
| parent | Fix to allow transceivers to read more data than requested. (diff) | |
| download | ice-9c0318cb3d66ebe717aefbae786c4f28fa4b3e91.tar.bz2 ice-9c0318cb3d66ebe717aefbae786c4f28fa4b3e91.tar.xz ice-9c0318cb3d66ebe717aefbae786c4f28fa4b3e91.zip | |
minor fixes for initgroups
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 1ba733637e6..92c47ef7d20 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -56,7 +56,7 @@ # include <sys/types.h> #endif -#ifdef __linux +#if defined(__linux) || defined(__sun) # include <grp.h> // for initgroups #endif @@ -924,7 +924,8 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi } else { - throw "Unknown user account `" + newUser + "'"; + InitializationException ex(__FILE__, __LINE__, "Unknown user account `" + newUser + "'"); + throw ex; } } diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index 4fa62779a04..2da76f782d7 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -38,7 +38,7 @@ #endif #endif -#ifdef __linux +#if defined(__linux) || defined(__sun) # include <grp.h> // for initgroups #endif |