1 files changed, 18 insertions, 8 deletions
diff --git a/cpp/src/qpid/framing/Proxy.h b/cpp/src/qpid/framing/Proxy.h
index 3dc082097a..0884e9cbd2 100644
--- a/cpp/src/qpid/framing/Proxy.h
+++ b/cpp/src/qpid/framing/Proxy.h
@@ -19,8 +19,10 @@
  *
  */
 
-#include "FrameHandler.h"
-#include "ProtocolVersion.h"
+#include "qpid/framing/FrameHandler.h"
+#include "qpid/framing/ProtocolVersion.h"
+
+#include "qpid/CommonImportExport.h"
 
 namespace qpid {
 namespace framing {
@@ -33,18 +35,26 @@ class AMQBody;
 class Proxy
 {
   public:
-    Proxy(FrameHandler& h);
-    virtual ~Proxy();
+    class ScopedSync
+    {
+        Proxy& proxy;
+      public:
+        QPID_COMMON_EXTERN ScopedSync(Proxy& p);
+        QPID_COMMON_EXTERN ~ScopedSync();
+    };
 
-    void send(const AMQBody&);
+    QPID_COMMON_EXTERN Proxy(FrameHandler& h);
+    QPID_COMMON_EXTERN virtual ~Proxy();
 
-    ProtocolVersion getVersion() const;
+    QPID_COMMON_EXTERN void send(const AMQBody&);
 
-    FrameHandler& getHandler();
-    void setHandler(FrameHandler&);
+    QPID_COMMON_EXTERN ProtocolVersion getVersion() const;
 
+    QPID_COMMON_EXTERN FrameHandler& getHandler();
+    QPID_COMMON_EXTERN void setHandler(FrameHandler&);
   private:
     FrameHandler* out;
+    bool sync;
 };
 
 }} // namespace qpid::framing