diff options
| author | Jose <jose@zeroc.com> | 2015-12-15 18:35:14 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-15 18:35:14 +0100 |
| commit | de0939c485861ad124f64e213883c74571eefa2b (patch) | |
| tree | c6dc163ddcee5aa0d878eb2463b57fc6a32a5f47 /cpp/src/Ice/Instance.cpp | |
| parent | Removed iOS workaround from udp test (diff) | |
| download | ice-de0939c485861ad124f64e213883c74571eefa2b.tar.bz2 ice-de0939c485861ad124f64e213883c74571eefa2b.tar.xz ice-de0939c485861ad124f64e213883c74571eefa2b.zip | |
C++11 mapping: fixes to InitializationData
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index e94431d3a2d..bcc79091555 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -1043,6 +1043,14 @@ IceInternal::Instance::setLogger(const Ice::LoggerPtr& logger) _initData.logger = logger; } +#ifdef ICE_CPP11_MAPPING +void +IceInternal::Instance::setThreadHook(function<void ()> threadStart, function<void ()> threadStop) +{ + _initData.threadStart = move(threadStart); + _initData.threadStop = move(threadStop); +} +#else void IceInternal::Instance::setThreadHook(const Ice::ThreadNotificationPtr& threadHook) { @@ -1051,6 +1059,7 @@ IceInternal::Instance::setThreadHook(const Ice::ThreadNotificationPtr& threadHoo // _initData.threadHook = threadHook; } +#endif namespace { |