diff options
| author | Jose <jose@zeroc.com> | 2016-01-15 10:17:10 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-15 10:17:10 +0100 |
| commit | 4354438d569d8255232e3ee2e7e7fd302a63ec7c (patch) | |
| tree | adf096d6251006517e103d1692c1656e71a7f57c /cpp | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| download | ice-4354438d569d8255232e3ee2e7e7fd302a63ec7c.tar.bz2 ice-4354438d569d8255232e3ee2e7e7fd302a63ec7c.tar.xz ice-4354438d569d8255232e3ee2e7e7fd302a63ec7c.zip | |
ICE-6821 getSystemErrno should not be inlined
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Ice/Config.h | 7 | ||||
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h index df86c77b149..cf5a401118d 100644 --- a/cpp/include/Ice/Config.h +++ b/cpp/include/Ice/Config.h @@ -94,12 +94,7 @@ typedef double Double; namespace IceInternal { -// TODO: Should not be inline, this is not performance critical. -#ifdef _WIN32 -inline int getSystemErrno() { return GetLastError(); } -#else -inline int getSystemErrno() { return errno; } -#endif +ICE_API int getSystemErrno(); } diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index cc7cd41a812..f4c6924c74d 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -87,6 +87,20 @@ using namespace Windows::Networking::Sockets; using namespace Windows::Networking::Connectivity; #endif +#ifdef _WIN32 +int +IceInternal::getSystemErrno() +{ + return GetLastError(); +} +#else +int +IceInternal::getSystemErrno() +{ + return errno; +} +#endif + namespace { |