diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-09-02 15:25:35 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-09-02 15:25:35 +0000 |
| commit | d99431205bc8c179b7cd52d4934818cddb29290c (patch) | |
| tree | f7327563eedf2f86ca5ac37b0487d6dfc93f2bae /cpp/include | |
| parent | more IcePatch work (diff) | |
| download | ice-d99431205bc8c179b7cd52d4934818cddb29290c.tar.bz2 ice-d99431205bc8c179b7cd52d4934818cddb29290c.tar.xz ice-d99431205bc8c179b7cd52d4934818cddb29290c.zip | |
fixes
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Ice/Application.h | 7 | ||||
| -rw-r--r-- | cpp/include/IcePatch/Util.h | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h index 45686caae85..10189f193fb 100644 --- a/cpp/include/Ice/Application.h +++ b/cpp/include/Ice/Application.h @@ -65,17 +65,10 @@ public: static void ignoreInterrupt(); static void defaultInterrupt(); - // - // Return true if communicator()->shutdown() has been called - // because of an interrupt. - // - static bool isShutdownFromInterrupt(); - private: static const char* _appName; static CommunicatorPtr _communicator; - static bool _shutdown; #ifdef _WIN32 friend BOOL WINAPI interruptHandler(DWORD); diff --git a/cpp/include/IcePatch/Util.h b/cpp/include/IcePatch/Util.h index e415c8c8a21..200cd9c1b9e 100644 --- a/cpp/include/IcePatch/Util.h +++ b/cpp/include/IcePatch/Util.h @@ -28,8 +28,7 @@ enum FileType { FileTypeNotExist, FileTypeDirectory, - FileTypeRegular, - FileTypeUnknown + FileTypeRegular }; struct FileInfo @@ -47,8 +46,8 @@ ICE_PATCH_API Ice::StringSeq readDirectory(const std::string&); ICE_PATCH_API void createDirectory(const std::string&); ICE_PATCH_API Ice::ByteSeq getMD5(const std::string&); -ICE_PATCH_API Ice::ByteSeq getPartialMD5(const std::string&, Ice::Int); ICE_PATCH_API void createMD5(const std::string&); +ICE_PATCH_API Ice::ByteSeq calcPartialMD5(const std::string&, Ice::Int); ICE_PATCH_API Ice::ByteSeq getBZ2(const std::string&, Ice::Int, Ice::Int); ICE_PATCH_API void createBZ2(const std::string&); |