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/01/08 00:36:30 UTC
svn commit: r732559 - in /qpid/trunk/qpid/cpp/src/qpid/console: Broker.cpp
ClassKey.cpp Event.cpp Object.cpp ObjectId.cpp ObjectId.h Package.h
Schema.cpp SessionManager.cpp
Author: shuston
Date: Wed Jan 7 15:36:30 2009
New Revision: 732559
URL: http://svn.apache.org/viewvc?rev=732559&view=rev
Log:
Namespace and IntegerTypes.h tweaks to build on Windows Visual C++
Modified:
qpid/trunk/qpid/cpp/src/qpid/console/Broker.cpp
qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.cpp
qpid/trunk/qpid/cpp/src/qpid/console/Event.cpp
qpid/trunk/qpid/cpp/src/qpid/console/Object.cpp
qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.cpp
qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h
qpid/trunk/qpid/cpp/src/qpid/console/Package.h
qpid/trunk/qpid/cpp/src/qpid/console/Schema.cpp
qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/console/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Broker.cpp?rev=732559&r1=732558&r2=732559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Broker.cpp Wed Jan 7 15:36:30 2009
@@ -66,7 +66,7 @@
return url.str();
}
-void Broker::encodeHeader(framing::Buffer& buf, uint8_t opcode, uint32_t seq) const
+void Broker::encodeHeader(Buffer& buf, uint8_t opcode, uint32_t seq) const
{
buf.putOctet('A');
buf.putOctet('M');
@@ -75,7 +75,7 @@
buf.putLong (seq);
}
-bool Broker::checkHeader(framing::Buffer& buf, uint8_t *opcode, uint32_t *seq) const
+bool Broker::checkHeader(Buffer& buf, uint8_t *opcode, uint32_t *seq) const
{
if (buf.getSize() < 8)
return false;
@@ -90,7 +90,7 @@
return h1 == 'A' && h2 == 'M' && h3 == '2';
}
-void Broker::received(client::Message& msg)
+void Broker::received(qpid::client::Message& msg)
{
string data = msg.getData();
Buffer inBuffer(const_cast<char*>(data.c_str()), data.size());
Modified: qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.cpp?rev=732559&r1=732558&r2=732559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.cpp Wed Jan 7 15:36:30 2009
@@ -90,7 +90,7 @@
return !(*this < other);
}
-void ClassKey::encode(framing::Buffer& buffer) const
+void ClassKey::encode(qpid::framing::Buffer& buffer) const
{
buffer.putShortString(package);
buffer.putShortString(name);
Modified: qpid/trunk/qpid/cpp/src/qpid/console/Event.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Event.cpp?rev=732559&r1=732558&r2=732559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Event.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Event.cpp Wed Jan 7 15:36:30 2009
@@ -32,7 +32,7 @@
using qpid::framing::Uuid;
using qpid::framing::FieldTable;
-Event::Event(Broker* _broker, SchemaClass* _schema, framing::Buffer& buffer) :
+Event::Event(Broker* _broker, SchemaClass* _schema, qpid::framing::Buffer& buffer) :
broker(_broker), schema(_schema)
{
timestamp = buffer.getLongLong();
Modified: qpid/trunk/qpid/cpp/src/qpid/console/Object.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Object.cpp?rev=732559&r1=732558&r2=732559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Object.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Object.cpp Wed Jan 7 15:36:30 2009
@@ -30,6 +30,7 @@
using namespace qpid::console;
using namespace qpid::sys;
+using namespace qpid;
using namespace std;
using qpid::framing::Uuid;
using qpid::framing::FieldTable;
@@ -79,12 +80,12 @@
(*this)[key] = Value::Ptr(new DoubleValue(val));
}
-void Object::AttributeMap::addUuid(const string& key, const framing::Uuid& val)
+void Object::AttributeMap::addUuid(const string& key, const Uuid& val)
{
(*this)[key] = Value::Ptr(new UuidValue(val));
}
-void Object::AttributeMap::addMap(const string& key, const framing::FieldTable& val)
+void Object::AttributeMap::addMap(const string& key, const FieldTable& val)
{
(*this)[key] = Value::Ptr(new MapValue(val));
}
Modified: qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.cpp?rev=732559&r1=732558&r2=732559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.cpp Wed Jan 7 15:36:30 2009
@@ -23,6 +23,7 @@
#include "qpid/framing/Buffer.h"
using namespace qpid::console;
+using namespace qpid;
using namespace std;
ObjectId::ObjectId(framing::Buffer& buffer)
Modified: qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h?rev=732559&r1=732558&r2=732559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h Wed Jan 7 15:36:30 2009
@@ -22,6 +22,7 @@
#define _QPID_CONSOLE_OBJECTID_H
#include <iostream>
+#include "qpid/sys/IntegerTypes.h"
namespace qpid {
namespace framing {
Modified: qpid/trunk/qpid/cpp/src/qpid/console/Package.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Package.h?rev=732559&r1=732558&r2=732559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Package.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Package.h Wed Jan 7 15:36:30 2009
@@ -23,6 +23,7 @@
#include <string>
#include <map>
+#include "qpid/sys/IntegerTypes.h"
namespace qpid {
namespace console {
Modified: qpid/trunk/qpid/cpp/src/qpid/console/Schema.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Schema.cpp?rev=732559&r1=732558&r2=732559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Schema.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Schema.cpp Wed Jan 7 15:36:30 2009
@@ -24,6 +24,7 @@
#include "qpid/framing/FieldTable.h"
using namespace qpid::console;
+using namespace qpid;
using std::string;
using std::vector;
Modified: qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.cpp?rev=732559&r1=732558&r2=732559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.cpp Wed Jan 7 15:36:30 2009
@@ -30,6 +30,7 @@
using namespace qpid::console;
using namespace qpid::sys;
+using namespace qpid;
using namespace std;
using qpid::framing::Buffer;
using qpid::framing::FieldTable;