diff options
| author | Jose <jose@zeroc.com> | 2018-06-13 17:23:57 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-06-13 17:24:20 +0200 |
| commit | 360817896b3db5087a4cfde16f0eb5acf25eb24b (patch) | |
| tree | 5ea8aa85dbe1efaec1eb1f6b80170d0728bca9f0 /cpp/test/include | |
| parent | Bumped wait time for controller to register (necessary for slow Android emula... (diff) | |
| download | ice-360817896b3db5087a4cfde16f0eb5acf25eb24b.tar.bz2 ice-360817896b3db5087a4cfde16f0eb5acf25eb24b.tar.xz ice-360817896b3db5087a4cfde16f0eb5acf25eb24b.zip | |
C++ TestHelper simplications
Diffstat (limited to 'cpp/test/include')
| -rw-r--r-- | cpp/test/include/TestHelper.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/cpp/test/include/TestHelper.h b/cpp/test/include/TestHelper.h index 0fe70986285..ee711ff617b 100644 --- a/cpp/test/include/TestHelper.h +++ b/cpp/test/include/TestHelper.h @@ -24,16 +24,8 @@ #include <Ice/CommunicatorF.h> #include <Ice/ProxyF.h> #include <Ice/Initialize.h> - -#if defined(ICE_OS_UWP) || (TARGET_OS_IPHONE != 0) -# include <Ice/Logger.h> -# include <Ice/LocalException.h> - -# include <cassert> -# include <cstdlib> -# include <string> -# include <iostream> -#endif +#include <Ice/Logger.h> +#include <Ice/LocalException.h> #include <IceUtil/IceUtil.h> @@ -189,8 +181,7 @@ public: void serverReady(); void shutdown(); - static void shutdownOnInterrupt(); - static void shutdownOnInterruptCallback(int); + void shutdownOnInterrupt(); virtual void run(int argc, char* argv[]) = 0; @@ -198,7 +189,9 @@ private: ControllerHelper* _controllerHelper; Ice::CommunicatorPtr _communicator; - IceUtil::Mutex _mutex; +#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) + IceUtil::CtrlCHandler* _ctrlCHandler; +#endif }; #if defined(ICE_OS_UWP) || (TARGET_OS_IPHONE != 0) |