You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2009/06/22 17:55:39 UTC
svn commit: r787286 - in /qpid/trunk/qpid/cpp/src: qmf/Agent.cpp
qmf/Object.h qmf/ObjectId.h qmf/Query.h qmf/ResilientConnection.cpp
qmf/Schema.h qmf/Value.h qpid/console/SessionManager.h
Author: shuston
Date: Mon Jun 22 15:55:38 2009
New Revision: 787286
URL: http://svn.apache.org/viewvc?rev=787286&view=rev
Log:
Resolve Windows build errors/warnings
Modified:
qpid/trunk/qpid/cpp/src/qmf/Agent.cpp
qpid/trunk/qpid/cpp/src/qmf/Object.h
qpid/trunk/qpid/cpp/src/qmf/ObjectId.h
qpid/trunk/qpid/cpp/src/qmf/Query.h
qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp
qpid/trunk/qpid/cpp/src/qmf/Schema.h
qpid/trunk/qpid/cpp/src/qmf/Value.h
qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.h
Modified: qpid/trunk/qpid/cpp/src/qmf/Agent.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/Agent.cpp?rev=787286&r1=787285&r2=787286&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Agent.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/Agent.cpp Mon Jun 22 15:55:38 2009
@@ -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>
Modified: qpid/trunk/qpid/cpp/src/qmf/Object.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/Object.h?rev=787286&r1=787285&r2=787286&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Object.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/Object.h Mon Jun 22 15:55:38 2009
@@ -26,7 +26,7 @@
namespace qmf {
- class ObjectImpl;
+ struct ObjectImpl;
class Object {
public:
Object(const SchemaObjectClass* type);
Modified: qpid/trunk/qpid/cpp/src/qmf/ObjectId.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/ObjectId.h?rev=787286&r1=787285&r2=787286&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ObjectId.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/ObjectId.h Mon Jun 22 15:55:38 2009
@@ -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();
Modified: qpid/trunk/qpid/cpp/src/qmf/Query.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/Query.h?rev=787286&r1=787285&r2=787286&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Query.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/Query.h Mon Jun 22 15:55:38 2009
@@ -25,7 +25,7 @@
namespace qmf {
- class QueryImpl;
+ struct QueryImpl;
class Query {
public:
Query();
Modified: qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp?rev=787286&r1=787285&r2=787286&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp Mon Jun 22 15:55:38 2009
@@ -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 @@
{
try {
subscriptions->run();
- } catch (exception& e) {
+ } catch (exception& /*e*/) {
connImpl.sessionClosed(this);
}
}
@@ -350,7 +351,7 @@
delay *= delayFactor;
}
- ::sleep(delay);
+ ::qpid::sys::sleep(delay);
}
}
@@ -373,7 +374,7 @@
void ResilientConnectionImpl::EnqueueEvent(ResilientConnectionEvent::EventKind kind,
void* sessionContext,
- const MessageImpl& message,
+ const qmf::MessageImpl& message,
const string& errorText)
{
Mutex::ScopedLock _lock(lock);
Modified: qpid/trunk/qpid/cpp/src/qmf/Schema.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/Schema.h?rev=787286&r1=787285&r2=787286&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Schema.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/Schema.h Mon Jun 22 15:55:38 2009
@@ -21,7 +21,7 @@
*/
#include <qmf/Typecode.h>
-#include <stdint.h>
+#include <qpid/sys/IntegerTypes.h>
namespace qmf {
@@ -29,12 +29,12 @@
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;
/**
*/
Modified: qpid/trunk/qpid/cpp/src/qmf/Value.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/Value.h?rev=787286&r1=787285&r2=787286&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Value.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/Value.h Mon Jun 22 15:55:38 2009
@@ -26,7 +26,7 @@
namespace qmf {
class Object;
- class ValueImpl;
+ struct ValueImpl;
class Value {
public:
Modified: qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.h?rev=787286&r1=787285&r2=787286&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.h Mon Jun 22 15:55:38 2009
@@ -52,7 +52,7 @@
public:
typedef std::vector<std::string> NameVector;
typedef std::vector<ClassKey> KeyVector;
- ~SessionManager();
+ QPID_CONSOLE_EXTERN ~SessionManager();
struct Settings {
bool rcvObjects;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org