icepatch changes. added missing code to AbortException. reverted ProgressCB

    to interface

1 files changed, 7 insertions, 12 deletions

diff --git a/cpp/include/IcePatch/ClientUtil.h b/cpp/include/IcePatch/ClientUtil.h
index d6f73113dfc..9fef610b0ff 100644
--- a/cpp/include/IcePatch/ClientUtil.h
+++ b/cpp/include/IcePatch/ClientUtil.h
@@ -19,18 +19,17 @@ namespace IcePatch
 {
 
 class ICE_PATCH_API AbortException : public IceUtil::Exception
-{
+{

+public:

+    AbortException(const char*, int);

+    virtual std::string ice_name() const;

+    virtual IceUtil::Exception* ice_clone() const;

+    virtual void ice_throw() const;

 };
 
-class ICE_PATCH_API ProgressCB : public IceUtil::Mutex
+class ICE_PATCH_API ProgressCB
 {
 public:
-
-    ProgressCB();
-    virtual ~ProgressCB();
-    void abort();
-    bool isAborted();
-
     virtual void startDownload(Ice::Int, Ice::Int) = 0;
     virtual void updateDownload(Ice::Int, Ice::Int) = 0;
     virtual void finishedDownload(Ice::Int) = 0;
@@ -38,10 +37,6 @@ public:
     virtual void startUncompress(Ice::Int, Ice::Int) = 0;
     virtual void updateUncompress(Ice::Int, Ice::Int) = 0;
     virtual void finishedUncompress(Ice::Int) = 0;
-
- private:
-
-    bool _aborted;
 };
 
 ICE_PATCH_API std::string pathToName(const std::string&);