From bb79c97b98e762a6b236bfb370377ba6e2c18689 Mon Sep 17 00:00:00 2001
From: "Stephen D. Huston" <shuston@apache.org>
Date: Mon, 22 Jun 2009 15:55:38 +0000
Subject: Resolve Windows build errors/warnings

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@787286 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qmf/Agent.cpp                 |  2 --
 cpp/src/qmf/Object.h                  |  2 +-
 cpp/src/qmf/ObjectId.h                |  4 ++--
 cpp/src/qmf/Query.h                   |  2 +-
 cpp/src/qmf/ResilientConnection.cpp   |  7 ++++---
 cpp/src/qmf/Schema.h                  | 14 +++++++-------
 cpp/src/qmf/Value.h                   |  2 +-
 cpp/src/qpid/console/SessionManager.h |  2 +-
 8 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/qmf/Agent.cpp b/cpp/src/qmf/Agent.cpp
index 84f37c5bb4..e4aeca8a84 100644
--- a/cpp/src/qmf/Agent.cpp
+++ b/cpp/src/qmf/Agent.cpp
@@ -36,8 +36,6 @@
 #include <string>
 #include <deque>
 #include <map>
-#include <unistd.h>
-#include <fcntl.h>
 #include <iostream>
 #include <fstream>
 #include <boost/shared_ptr.hpp>
diff --git a/cpp/src/qmf/Object.h b/cpp/src/qmf/Object.h
index 6416aa3c8c..8caab8d6dc 100644
--- a/cpp/src/qmf/Object.h
+++ b/cpp/src/qmf/Object.h
@@ -26,7 +26,7 @@
 
 namespace qmf {
 
-    class ObjectImpl;
+    struct ObjectImpl;
     class Object {
     public:
         Object(const SchemaObjectClass* type);
diff --git a/cpp/src/qmf/ObjectId.h b/cpp/src/qmf/ObjectId.h
index d27c804773..1ceae20bd8 100644
--- a/cpp/src/qmf/ObjectId.h
+++ b/cpp/src/qmf/ObjectId.h
@@ -20,13 +20,13 @@
  * under the License.
  */
 
-#include <stdint.h>
+#include <qpid/sys/IntegerTypes.h>
 
 namespace qmf {
 
     // TODO: Add to/from string and << operator
 
-    class ObjectIdImpl;
+    struct ObjectIdImpl;
     class ObjectId {
     public:
         ObjectId();
diff --git a/cpp/src/qmf/Query.h b/cpp/src/qmf/Query.h
index 346d8c336b..78bc6f4ae2 100644
--- a/cpp/src/qmf/Query.h
+++ b/cpp/src/qmf/Query.h
@@ -25,7 +25,7 @@
 
 namespace qmf {
 
-    class QueryImpl;
+    struct QueryImpl;
     class Query {
     public:
         Query();
diff --git a/cpp/src/qmf/ResilientConnection.cpp b/cpp/src/qmf/ResilientConnection.cpp
index 7ebd0a47c1..3a32d11df4 100644
--- a/cpp/src/qmf/ResilientConnection.cpp
+++ b/cpp/src/qmf/ResilientConnection.cpp
@@ -27,6 +27,7 @@
 #include <qpid/sys/Runnable.h>
 #include <qpid/sys/Mutex.h>
 #include <qpid/sys/Condition.h>
+#include <qpid/sys/Time.h>
 #include <qpid/log/Statement.h>
 #include <qpid/RefCounted.h>
 #include <boost/bind.hpp>
@@ -144,7 +145,7 @@ void RCSession::run()
 {
     try {
         subscriptions->run();
-    } catch (exception& e) {
+    } catch (exception& /*e*/) {
         connImpl.sessionClosed(this);
     }
 }
@@ -350,7 +351,7 @@ void ResilientConnectionImpl::run()
                 delay *= delayFactor;
         }
 
-        ::sleep(delay);
+        ::qpid::sys::sleep(delay);
     }
 }
 
@@ -373,7 +374,7 @@ void ResilientConnectionImpl::sessionClosed(RCSession*)
 
 void ResilientConnectionImpl::EnqueueEvent(ResilientConnectionEvent::EventKind kind,
                                            void* sessionContext,
-                                           const MessageImpl& message,
+                                           const qmf::MessageImpl& message,
                                            const string& errorText)
 {
     Mutex::ScopedLock _lock(lock);
diff --git a/cpp/src/qmf/Schema.h b/cpp/src/qmf/Schema.h
index c4106393ff..e3ab90e3e3 100644
--- a/cpp/src/qmf/Schema.h
+++ b/cpp/src/qmf/Schema.h
@@ -21,7 +21,7 @@
  */
 
 #include <qmf/Typecode.h>
-#include <stdint.h>
+#include <qpid/sys/IntegerTypes.h>
 
 namespace qmf {
 
@@ -29,12 +29,12 @@ namespace qmf {
     enum Direction { DIR_IN = 1, DIR_OUT = 2, DIR_IN_OUT = 3 };
     enum ClassKind { CLASS_OBJECT = 1, CLASS_EVENT = 2 };
 
-    class SchemaArgumentImpl;
-    class SchemaMethodImpl;
-    class SchemaPropertyImpl;
-    class SchemaStatisticImpl;
-    class SchemaObjectClassImpl;
-    class SchemaEventClassImpl;
+    struct SchemaArgumentImpl;
+    struct SchemaMethodImpl;
+    struct SchemaPropertyImpl;
+    struct SchemaStatisticImpl;
+    struct SchemaObjectClassImpl;
+    struct SchemaEventClassImpl;
 
     /**
      */
diff --git a/cpp/src/qmf/Value.h b/cpp/src/qmf/Value.h
index 7d54293e08..a45df14ea9 100644
--- a/cpp/src/qmf/Value.h
+++ b/cpp/src/qmf/Value.h
@@ -26,7 +26,7 @@
 namespace qmf {
 
     class Object;
-    class ValueImpl;
+    struct ValueImpl;
 
     class Value {
     public:
diff --git a/cpp/src/qpid/console/SessionManager.h b/cpp/src/qpid/console/SessionManager.h
index 770d4b3d28..bbb4983bce 100644
--- a/cpp/src/qpid/console/SessionManager.h
+++ b/cpp/src/qpid/console/SessionManager.h
@@ -52,7 +52,7 @@ class SessionManager
   public:
     typedef std::vector<std::string> NameVector;
     typedef std::vector<ClassKey> KeyVector;
-    ~SessionManager();
+    QPID_CONSOLE_EXTERN ~SessionManager();
 
     struct Settings {
         bool rcvObjects;
-- 
cgit v1.2.1