diff options
| author | Marc Laukien <marc@zeroc.com> | 2005-01-27 21:22:48 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2005-01-27 21:22:48 +0000 |
| commit | 1decea8e7dcbf1c7836d27401d63229c49191556 (patch) | |
| tree | d4bd9e931ea34841bc194b711f77f9cec4a499b3 /cpp/include/IcePatch2/Util.h | |
| parent | bug fix for thread per connection (diff) | |
| download | ice-1decea8e7dcbf1c7836d27401d63229c49191556.tar.bz2 ice-1decea8e7dcbf1c7836d27401d63229c49191556.tar.xz ice-1decea8e7dcbf1c7836d27401d63229c49191556.zip | |
icepatch2 changes
Diffstat (limited to 'cpp/include/IcePatch2/Util.h')
| -rw-r--r-- | cpp/include/IcePatch2/Util.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/cpp/include/IcePatch2/Util.h b/cpp/include/IcePatch2/Util.h index cabe5d8af1e..23617060a00 100644 --- a/cpp/include/IcePatch2/Util.h +++ b/cpp/include/IcePatch2/Util.h @@ -24,7 +24,7 @@ ICE_PATCH2_API std::string lastError(); ICE_PATCH2_API std::string bytesToString(const Ice::ByteSeq&); ICE_PATCH2_API Ice::ByteSeq stringToBytes(const std::string&); -ICE_PATCH2_API std::string normalize(const std::string&); +ICE_PATCH2_API std::string simplify(const std::string&); ICE_PATCH2_API std::string getSuffix(const std::string&); ICE_PATCH2_API std::string getWithoutSuffix(const std::string&); @@ -108,15 +108,6 @@ struct FileInfoLess: public std::binary_function<const FileInfo&, const FileInfo } }; -struct PathLess: public std::binary_function<const FileInfo&, const FileInfo&, bool> -{ - bool - operator()(const FileInfo& lhs, const FileInfo& rhs) - { - return lhs.path < rhs.path; - } -}; - class ICE_PATCH2_API GetFileInfoSeqCB { public: @@ -128,7 +119,8 @@ public: virtual bool compress(const std::string&) = 0; }; -ICE_PATCH2_API void getFileInfoSeq(const std::string&, int, GetFileInfoSeqCB*, FileInfoSeq&); +ICE_PATCH2_API bool getFileInfoSeq(const std::string&, int, GetFileInfoSeqCB*, FileInfoSeq&); +ICE_PATCH2_API bool getFileInfoSeqSubDir(const std::string&, const std::string&, int, GetFileInfoSeqCB*, FileInfoSeq&); ICE_PATCH2_API void saveFileInfoSeq(const std::string&, const FileInfoSeq&); ICE_PATCH2_API void loadFileInfoSeq(const std::string&, FileInfoSeq&); |