diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-01-02 15:16:46 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-01-02 15:16:46 -0330 |
| commit | 51ee7620f82e4232baf587ee052001751c23e481 (patch) | |
| tree | 08baaf92bddeca3f33acfe1bb38620606de7a99b /cpp/include | |
| parent | The server now accepts anonymous clients. (diff) | |
| download | ice-51ee7620f82e4232baf587ee052001751c23e481.tar.bz2 ice-51ee7620f82e4232baf587ee052001751c23e481.tar.xz ice-51ee7620f82e4232baf587ee052001751c23e481.zip | |
Merged with R3_3_branch
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Slice/Preprocessor.h | 5 | ||||
| -rw-r--r-- | cpp/include/Slice/SignalHandler.h | 43 |
2 files changed, 5 insertions, 43 deletions
diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h index 1f8ace5c335..a2efc873113 100644 --- a/cpp/include/Slice/Preprocessor.h +++ b/cpp/include/Slice/Preprocessor.h @@ -54,6 +54,11 @@ private: const std::string _path; const std::string _fileName; const std::vector<std::string> _args; +#ifdef _WIN32 + std::wstring _cppFile; +#else + std::string _cppFile; +#endif FILE* _cppHandle; }; diff --git a/cpp/include/Slice/SignalHandler.h b/cpp/include/Slice/SignalHandler.h deleted file mode 100644 index 318547cf5ae..00000000000 --- a/cpp/include/Slice/SignalHandler.h +++ /dev/null @@ -1,43 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef SLICE_SIGNAL_HANDLER_H -#define SLICE_SIGNAL_HANDLER_H - -#include <IceUtil/Config.h> -#include <string> - -#ifndef SLICE_API -# ifdef SLICE_API_EXPORTS -# define SLICE_API ICE_DECLSPEC_EXPORT -# else -# define SLICE_API ICE_DECLSPEC_IMPORT -# endif -#endif - -namespace Slice -{ - -typedef void (*SignalHandlerCallback)(); - -class SLICE_API SignalHandler -{ -public: - - SignalHandler(); - ~SignalHandler(); - - static void setCallback(SignalHandlerCallback); - - static void addFile(const std::string&); -}; - -} - -#endif |