diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-12-28 07:01:51 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-12-28 07:01:51 +0100 |
| commit | 6ed55f267f29880782978fbb7d63799ed89cff65 (patch) | |
| tree | 12cf5e33d7cbafc26c194edaff38f17e01f1e59a /cpp | |
| parent | Fix for bug 1945, Sun & HP-UX compilation fixes (diff) | |
| download | ice-6ed55f267f29880782978fbb7d63799ed89cff65.tar.bz2 ice-6ed55f267f29880782978fbb7d63799ed89cff65.tar.xz ice-6ed55f267f29880782978fbb7d63799ed89cff65.zip | |
More HP & Sun compilation fixes
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/IceSSL/Plugin.h | 4 | ||||
| -rw-r--r-- | cpp/src/Ice/UdpTransceiver.h | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/SessionServantManager.cpp | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h index 18b88f336f0..d81003d19f4 100644 --- a/cpp/include/IceSSL/Plugin.h +++ b/cpp/include/IceSSL/Plugin.h @@ -17,11 +17,11 @@ #include <vector> #include <list> -// For struct sockaddr_in +// For struct sockaddr_storage #ifdef _WIN32 # include <winsock2.h> #else -# include <netinet/in.h> +# include <sys/socket.h> #endif #ifndef ICE_SSL_API diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h index 4898c3cc54c..c1e8900c213 100644 --- a/cpp/src/Ice/UdpTransceiver.h +++ b/cpp/src/Ice/UdpTransceiver.h @@ -10,6 +10,10 @@ #ifndef ICE_UDP_TRANSCEIVER_H #define ICE_UDP_TRANSCEIVER_H +#ifdef __hpux +# define _XOPEN_SOURCE_EXTENDED +#endif + #include <Ice/InstanceF.h> #include <Ice/TraceLevelsF.h> #include <Ice/LoggerF.h> diff --git a/cpp/src/IceGrid/SessionServantManager.cpp b/cpp/src/IceGrid/SessionServantManager.cpp index b2b8577a925..6c15d2cc997 100644 --- a/cpp/src/IceGrid/SessionServantManager.cpp +++ b/cpp/src/IceGrid/SessionServantManager.cpp @@ -17,7 +17,7 @@ using namespace IceGrid; SessionServantManager::SessionServantManager(const Ice::ObjectAdapterPtr& adapter, const string& instanceName, - const bool checkConnection, + bool checkConnection, const string& serverAdminCategory, const Ice::ObjectPtr& serverAdminRouter, const AdminCallbackRouterPtr& adminCallbackRouter @@ -110,7 +110,7 @@ SessionServantManager::setSessionControl(const Ice::ObjectPtr& session, // Allow invocations on the session servants and the given objects. // Ice::IdentitySeq allIds = ids; - allIds.insert(allIds.end(), p->second.identities.begin(), p->second.identities.end()); + copy(p->second.identities.begin(), p->second.identities.end(), back_inserter(allIds)); p->second.identitySet->add(allIds); // |