You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2009/07/15 18:45:26 UTC
svn commit: r794325 [2/3] - in /qpid/trunk: ./ qpid/cpp/docs/api/
qpid/cpp/examples/ qpid/cpp/include/ qpid/cpp/include/qpid/
qpid/cpp/include/qpid/agent/ qpid/cpp/include/qpid/client/
qpid/cpp/include/qpid/console/ qpid/cpp/include/qpid/framing/ qpid/...
Copied: qpid/trunk/qpid/cpp/include/qpid/console/Object.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/console/Object.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/console/Object.h?p2=qpid/trunk/qpid/cpp/include/qpid/console/Object.h&p1=qpid/trunk/qpid/cpp/src/qpid/console/Object.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Object.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/console/Object.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Copied: qpid/trunk/qpid/cpp/include/qpid/console/ObjectId.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/console/ObjectId.h?p2=qpid/trunk/qpid/cpp/include/qpid/console/ObjectId.h&p1=qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/console/ObjectId.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Copied: qpid/trunk/qpid/cpp/include/qpid/console/Package.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/console/Package.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/console/Package.h?p2=qpid/trunk/qpid/cpp/include/qpid/console/Package.h&p1=qpid/trunk/qpid/cpp/src/qpid/console/Package.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Package.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/console/Package.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Copied: qpid/trunk/qpid/cpp/include/qpid/console/Schema.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/console/Schema.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/console/Schema.h?p2=qpid/trunk/qpid/cpp/include/qpid/console/Schema.h&p1=qpid/trunk/qpid/cpp/src/qpid/console/Schema.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Schema.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/console/Schema.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Copied: qpid/trunk/qpid/cpp/include/qpid/console/SequenceManager.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/console/SequenceManager.h?p2=qpid/trunk/qpid/cpp/include/qpid/console/SequenceManager.h&p1=qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/console/SequenceManager.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Copied: qpid/trunk/qpid/cpp/include/qpid/console/SessionManager.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/console/SessionManager.h?p2=qpid/trunk/qpid/cpp/include/qpid/console/SessionManager.h&p1=qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/console/SessionManager.h Wed Jul 15 16:45:21 2009
@@ -10,9 +10,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -44,7 +44,7 @@
class ConsoleListener;
/**
- *
+ *
* \ingroup qmfconsoleapi
*/
class SessionManager
Copied: qpid/trunk/qpid/cpp/include/qpid/console/Value.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/console/Value.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/console/Value.h?p2=qpid/trunk/qpid/cpp/include/qpid/console/Value.h&p1=qpid/trunk/qpid/cpp/src/qpid/console/Value.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Value.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/console/Value.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Copied: qpid/trunk/qpid/cpp/include/qpid/framing/Array.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/framing/Array.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/Array.h?p2=qpid/trunk/qpid/cpp/include/qpid/framing/Array.h&p1=qpid/trunk/qpid/cpp/src/qpid/framing/Array.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/Array.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/framing/Array.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -56,7 +56,7 @@
QPID_COMMON_EXTERN Array(const std::vector<std::string>& in);
QPID_COMMON_EXTERN TypeCode getType() const { return type; }
-
+
// std collection interface.
QPID_COMMON_EXTERN const_iterator begin() const { return values.begin(); }
QPID_COMMON_EXTERN const_iterator end() const { return values.end(); }
@@ -71,7 +71,7 @@
QPID_COMMON_EXTERN void erase(iterator i) { values.erase(i); }
QPID_COMMON_EXTERN void push_back(ValuePtr value) { values.insert(end(), value); }
QPID_COMMON_EXTERN void pop_back() { values.pop_back(); }
-
+
// Non-std interface
QPID_COMMON_EXTERN void add(ValuePtr value) { push_back(value); }
Copied: qpid/trunk/qpid/cpp/include/qpid/framing/Buffer.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/Buffer.h?p2=qpid/trunk/qpid/cpp/include/qpid/framing/Buffer.h&p1=qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/framing/Buffer.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -46,7 +46,7 @@
void checkAvailable(uint32_t count) { if (position + count > size) throw OutOfBounds(); }
public:
-
+
/** Buffer input/output iterator.
* Supports using an amqp_0_10::Codec with a framing::Buffer.
*/
@@ -64,9 +64,9 @@
Buffer* buffer;
};
-
+
friend class Iterator;
-
+
QPID_COMMON_EXTERN Buffer(char* data=0, uint32_t size=0);
QPID_COMMON_EXTERN void record();
@@ -78,7 +78,7 @@
QPID_COMMON_EXTERN uint32_t getPosition() { return position; }
QPID_COMMON_EXTERN Iterator getIterator() { return Iterator(*this); }
QPID_COMMON_EXTERN char* getPointer() { return data; }
-
+
QPID_COMMON_EXTERN void putOctet(uint8_t i);
QPID_COMMON_EXTERN void putShort(uint16_t i);
QPID_COMMON_EXTERN void putLong(uint32_t i);
@@ -92,7 +92,7 @@
QPID_COMMON_EXTERN void putBin128(const uint8_t* b);
QPID_COMMON_EXTERN uint8_t getOctet();
- QPID_COMMON_EXTERN uint16_t getShort();
+ QPID_COMMON_EXTERN uint16_t getShort();
QPID_COMMON_EXTERN uint32_t getLong();
QPID_COMMON_EXTERN uint64_t getLongLong();
QPID_COMMON_EXTERN int8_t getInt8();
@@ -101,7 +101,7 @@
QPID_COMMON_EXTERN int64_t getInt64();
QPID_COMMON_EXTERN float getFloat();
QPID_COMMON_EXTERN double getDouble();
-
+
template <int n>
QPID_COMMON_EXTERN uint64_t getUInt();
Copied: qpid/trunk/qpid/cpp/include/qpid/framing/FieldTable.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/FieldTable.h?p2=qpid/trunk/qpid/cpp/include/qpid/framing/FieldTable.h&p1=qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/framing/FieldTable.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -92,7 +92,7 @@
//bool getTimestamp(const std::string& name, uint64_t& value) const;
//bool getDecimal(string& name, xxx& value);
QPID_COMMON_EXTERN void erase(const std::string& name);
-
+
QPID_COMMON_EXTERN bool operator==(const FieldTable& other) const;
@@ -108,7 +108,7 @@
// ### Hack Alert
ValueMap::iterator getValues() { return values.begin(); }
-
+
private:
ValueMap values;
Copied: qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h?p2=qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h&p1=qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h Wed Jul 15 16:45:21 2009
@@ -9,9 +9,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -39,14 +39,14 @@
//class Array;
/**
* Exception that is the base exception for all field table errors.
- *
+ *
* \ingroup clientapi
*/
class FieldValueException : public qpid::Exception {};
/**
* Exception thrown when we can't perform requested conversion
- *
+ *
* \ingroup clientapi
*/
struct InvalidConversionException : public FieldValueException {
@@ -66,7 +66,7 @@
class Data {
public:
virtual ~Data() {};
- virtual uint32_t encodedSize() const = 0;
+ virtual uint32_t encodedSize() const = 0;
virtual void encode(Buffer& buffer) = 0;
virtual void decode(Buffer& buffer) = 0;
virtual bool operator==(const Data&) const = 0;
@@ -85,14 +85,14 @@
uint8_t getType();
Data& getData() { return *data; }
uint32_t encodedSize() const { return 1 + data->encodedSize(); };
- bool empty() const { return data.get() == 0; }
+ bool empty() const { return data.get() == 0; }
void encode(Buffer& buffer);
void decode(Buffer& buffer);
QPID_COMMON_EXTERN bool operator==(const FieldValue&) const;
QPID_COMMON_EXTERN bool operator!=(const FieldValue& v) const { return !(*this == v); }
-
+
void print(std::ostream& out) const;
-
+
template <typename T> bool convertsTo() const { return false; }
template <typename T> T get() const { throw InvalidConversionException(); }
@@ -101,7 +101,7 @@
private:
uint8_t typeOctet;
- std::auto_ptr<Data> data;
+ std::auto_ptr<Data> data;
};
template <>
@@ -130,7 +130,7 @@
template <int width>
class FixedWidthValue : public FieldValue::Data {
uint8_t octets[width];
-
+
public:
FixedWidthValue() {}
FixedWidthValue(const uint8_t (&data)[width]) : octets(data) {}
@@ -151,7 +151,7 @@
bool operator==(const Data& d) const {
const FixedWidthValue<width>* rhs = dynamic_cast< const FixedWidthValue<width>* >(&d);
if (rhs == 0) return false;
- else return std::equal(&octets[0], &octets[width], &rhs->octets[0]);
+ else return std::equal(&octets[0], &octets[width], &rhs->octets[0]);
}
bool convertsToInt() const { return true; }
@@ -191,7 +191,7 @@
VariableWidthValue() {}
VariableWidthValue(const std::vector<uint8_t>& data) : octets(data) {}
VariableWidthValue(const uint8_t* start, const uint8_t* end) : octets(start, end) {}
- uint32_t encodedSize() const { return lenwidth + octets.size(); }
+ uint32_t encodedSize() const { return lenwidth + octets.size(); }
void encode(Buffer& buffer) {
buffer.putUInt<lenwidth>(octets.size());
if (octets.size() > 0)
@@ -206,16 +206,16 @@
bool operator==(const Data& d) const {
const VariableWidthValue<lenwidth>* rhs = dynamic_cast< const VariableWidthValue<lenwidth>* >(&d);
if (rhs == 0) return false;
- else return octets==rhs->octets;
+ else return octets==rhs->octets;
}
-
+
bool convertsToString() const { return true; }
std::string getString() const { return std::string(octets.begin(), octets.end()); }
void print(std::ostream& o) const { o << "V" << lenwidth << ":" << octets.size() << ":"; };
};
-template <class T>
+template <class T>
class EncodedValue : public FieldValue::Data {
T value;
public:
@@ -226,7 +226,7 @@
T& getValue() { return value; }
const T& getValue() const { return value; }
- uint32_t encodedSize() const { return value.encodedSize(); }
+ uint32_t encodedSize() const { return value.encodedSize(); }
void encode(Buffer& buffer) {
value.encode(buffer);
@@ -237,7 +237,7 @@
bool operator==(const Data& d) const {
const EncodedValue<T>* rhs = dynamic_cast< const EncodedValue<T>* >(&d);
if (rhs == 0) return false;
- else return value==rhs->value;
+ else return value==rhs->value;
}
void print(std::ostream& o) const { o << "[" << value << "]"; };
@@ -303,12 +303,12 @@
};
template <class T>
-bool getEncodedValue(FieldTable::ValuePtr vptr, T& value)
+bool getEncodedValue(FieldTable::ValuePtr vptr, T& value)
{
if (vptr) {
- const EncodedValue<T>* ev = dynamic_cast< EncodedValue<T>* >(&(vptr->getData()));
+ const EncodedValue<T>* ev = dynamic_cast< EncodedValue<T>* >(&(vptr->getData()));
if (ev != 0) {
- value = ev->getValue();
+ value = ev->getValue();
return true;
}
}
Copied: qpid/trunk/qpid/cpp/include/qpid/framing/ProtocolVersion.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/ProtocolVersion.h?p2=qpid/trunk/qpid/cpp/include/qpid/framing/ProtocolVersion.h&p1=qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/framing/ProtocolVersion.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,9 +34,9 @@
private:
uint8_t major_;
uint8_t minor_;
-
+
public:
- explicit ProtocolVersion(uint8_t _major=0, uint8_t _minor=0)
+ explicit ProtocolVersion(uint8_t _major=0, uint8_t _minor=0)
: major_(_major), minor_(_minor) {}
QPID_COMMON_EXTERN uint8_t getMajor() const { return major_; }
@@ -45,7 +45,7 @@
QPID_COMMON_EXTERN void setMinor(uint8_t minor) { minor_ = minor; }
QPID_COMMON_EXTERN const std::string toString() const;
- QPID_COMMON_EXTERN ProtocolVersion& operator=(ProtocolVersion p);
+ QPID_COMMON_EXTERN ProtocolVersion& operator=(ProtocolVersion p);
QPID_COMMON_EXTERN bool operator==(ProtocolVersion p) const;
QPID_COMMON_EXTERN bool operator!=(ProtocolVersion p) const { return ! (*this == p); }
Copied: qpid/trunk/qpid/cpp/include/qpid/framing/SequenceNumber.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/framing/SequenceNumber.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/SequenceNumber.h?p2=qpid/trunk/qpid/cpp/include/qpid/framing/SequenceNumber.h&p1=qpid/trunk/qpid/cpp/src/qpid/framing/SequenceNumber.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/SequenceNumber.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/framing/SequenceNumber.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -44,7 +44,7 @@
public:
SequenceNumber(uint32_t v=0) : value(v) {}
-
+
SequenceNumber& operator++() { ++value; return *this; }
SequenceNumber& operator--() { --value; return *this; }
bool operator==(const SequenceNumber& other) const { return value == other.value; }
@@ -54,18 +54,18 @@
void encode(Buffer& buffer) const;
void decode(Buffer& buffer);
- uint32_t encodedSize() const;
+ uint32_t encodedSize() const;
template <class S> void serialize(S& s) { s(value); }
friend inline int32_t operator-(const SequenceNumber& a, const SequenceNumber& b);
-};
+};
inline int32_t operator-(const SequenceNumber& a, const SequenceNumber& b) {
return int32_t(a.value - b.value);
}
-struct Window
+struct Window
{
SequenceNumber hwm;
SequenceNumber lwm;
Copied: qpid/trunk/qpid/cpp/include/qpid/framing/SequenceSet.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/framing/SequenceSet.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/SequenceSet.h?p2=qpid/trunk/qpid/cpp/include/qpid/framing/SequenceSet.h&p1=qpid/trunk/qpid/cpp/src/qpid/framing/SequenceSet.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/SequenceSet.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/framing/SequenceSet.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -36,11 +36,11 @@
: RangeSet<SequenceNumber>(r) {}
SequenceSet(const SequenceNumber& s) { add(s); }
SequenceSet(const SequenceNumber& start, const SequenceNumber finish) { add(start,finish); }
-
-
+
+
void encode(Buffer& buffer) const;
void decode(Buffer& buffer);
- uint32_t encodedSize() const;
+ uint32_t encodedSize() const;
QPID_COMMON_EXTERN bool contains(const SequenceNumber& s) const;
QPID_COMMON_EXTERN void add(const SequenceNumber& s);
@@ -51,17 +51,17 @@
QPID_COMMON_EXTERN void remove(const SequenceSet& set);
template <class T> void for_each(T& t) const {
- for (RangeIterator i = rangesBegin(); i != rangesEnd(); i++)
+ for (RangeIterator i = rangesBegin(); i != rangesEnd(); i++)
t(i->first(), i->last());
}
template <class T> void for_each(const T& t) const {
- for (RangeIterator i = rangesBegin(); i != rangesEnd(); i++)
+ for (RangeIterator i = rangesBegin(); i != rangesEnd(); i++)
t(i->first(), i->last());
}
friend QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const SequenceSet&);
-};
+};
}} // namespace qpid::framing
Copied: qpid/trunk/qpid/cpp/include/qpid/framing/StructHelper.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/framing/StructHelper.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/StructHelper.h?p2=qpid/trunk/qpid/cpp/include/qpid/framing/StructHelper.h&p1=qpid/trunk/qpid/cpp/src/qpid/framing/StructHelper.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/StructHelper.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/framing/StructHelper.h Wed Jul 15 16:45:21 2009
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -54,4 +54,4 @@
};
}}
-#endif
+#endif
Copied: qpid/trunk/qpid/cpp/include/qpid/framing/Uuid.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/Uuid.h?p2=qpid/trunk/qpid/cpp/include/qpid/framing/Uuid.h&p1=qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/framing/Uuid.h Wed Jul 15 16:45:21 2009
@@ -50,13 +50,13 @@
void assign(const uint8_t* data) {
uuid_copy(c_array(), data);
}
-
+
/** Set to a new unique identifier. */
void generate() { uuid_generate(c_array()); }
/** Set to all zeros. */
void clear() { uuid_clear(c_array()); }
-
+
/** Test for null (all zeros). */
// Force int 0/!0 to false/true; avoids compile warnings.
bool isNull() {
Copied: qpid/trunk/qpid/cpp/include/qpid/framing/amqp_types.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/amqp_types.h?p2=qpid/trunk/qpid/cpp/include/qpid/framing/amqp_types.h&p1=qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/framing/amqp_types.h Wed Jul 15 16:45:21 2009
@@ -9,9 +9,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,7 +22,7 @@
*/
/** \file
- * Definitions and forward declarations of all types used
+ * Definitions and forward declarations of all types used
* in AMQP messages.
*/
Copied: qpid/trunk/qpid/cpp/include/qpid/framing/amqp_types_full.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types_full.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/amqp_types_full.h?p2=qpid/trunk/qpid/cpp/include/qpid/framing/amqp_types_full.h&p1=qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types_full.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/cpp/include/qpid/log/Logger.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/log/Logger.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/log/Logger.h?p2=qpid/trunk/qpid/cpp/include/qpid/log/Logger.h&p1=qpid/trunk/qpid/cpp/src/qpid/log/Logger.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/log/Logger.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/log/Logger.h Wed Jul 15 16:45:21 2009
@@ -59,7 +59,7 @@
QPID_COMMON_EXTERN Logger();
QPID_COMMON_EXTERN ~Logger();
-
+
/** Select the messages to be logged. */
QPID_COMMON_EXTERN void select(const Selector& s);
@@ -85,14 +85,14 @@
/** Set a prefix for all messages */
QPID_COMMON_EXTERN void setPrefix(const std::string& prefix);
-
+
/** Reset the logger. */
QPID_COMMON_EXTERN void clear();
/** Get the options used to configure the logger. */
QPID_COMMON_EXTERN const Options& getOptions() const { return options; }
-
-
+
+
private:
typedef boost::ptr_vector<Output> Outputs;
typedef std::set<Statement*> Statements;
Copied: qpid/trunk/qpid/cpp/include/qpid/log/Options.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/log/Options.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/log/Options.h?p2=qpid/trunk/qpid/cpp/include/qpid/log/Options.h&p1=qpid/trunk/qpid/cpp/src/qpid/log/Options.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/cpp/include/qpid/log/Selector.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/log/Selector.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/log/Selector.h?p2=qpid/trunk/qpid/cpp/include/qpid/log/Selector.h&p1=qpid/trunk/qpid/cpp/src/qpid/log/Selector.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/log/Selector.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/log/Selector.h Wed Jul 15 16:45:21 2009
@@ -29,8 +29,8 @@
/**
* A selector identifies the set of log messages to enable.
- *
- * Thread object unsafe, pass-by-value type.
+ *
+ * Thread object unsafe, pass-by-value type.
*/
class Selector {
public:
@@ -39,7 +39,7 @@
/** Set selector from Options */
QPID_COMMON_EXTERN Selector(const Options&);
-
+
/** Equavlient to: Selector s; s.enable(l, s) */
Selector(Level l, const std::string& s=std::string()) {
enable(l,s);
@@ -47,7 +47,7 @@
Selector(const std::string& enableStr) { enable(enableStr); }
/**
- * Enable messages with level in levels where the file
+ * Enable messages with level in levels where the file
* name contains substring. Empty string matches all.
*/
void enable(Level level, const std::string& substring=std::string()) {
Copied: qpid/trunk/qpid/cpp/include/qpid/log/SinkOptions.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/log/SinkOptions.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/log/SinkOptions.h?p2=qpid/trunk/qpid/cpp/include/qpid/log/SinkOptions.h&p1=qpid/trunk/qpid/cpp/src/qpid/log/SinkOptions.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/cpp/include/qpid/log/Statement.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/log/Statement.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/log/Statement.h?p2=qpid/trunk/qpid/cpp/include/qpid/log/Statement.h&p1=qpid/trunk/qpid/cpp/src/qpid/log/Statement.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/log/Statement.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/log/Statement.h Wed Jul 15 16:45:21 2009
@@ -32,7 +32,7 @@
* - info: Informational messages.
* - notice: Normal but significant condition.
* - warning: Warn of a possible problem.
- * - error: A definite error has occured.
+ * - error: A definite error has occured.
* - critical: System in danger of severe failure.
*/
enum Level { trace, debug, info, notice, warning, error, critical };
@@ -42,7 +42,7 @@
/** Get level from string name.
*@exception if name invalid.
*/
- static Level level(const char* name);
+ static Level level(const char* name);
/** Get level from string name.
*@exception if name invalid.
@@ -52,16 +52,16 @@
}
/** String name of level */
- static const char* name(Level);
+ static const char* name(Level);
};
-
+
/** POD struct representing a logging statement in source code. */
struct Statement {
bool enabled;
const char* file;
- int line;
+ int line;
const char* function;
- Level level;
+ Level level;
QPID_COMMON_EXTERN void log(const std::string& message);
@@ -118,4 +118,4 @@
#endif /*!STATEMENT_H*/
-
+
Copied: qpid/trunk/qpid/cpp/include/qpid/management/Args.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/management/Args.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/management/Args.h?p2=qpid/trunk/qpid/cpp/include/qpid/management/Args.h&p1=qpid/trunk/qpid/cpp/src/qpid/management/Args.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/Args.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/management/Args.h Wed Jul 15 16:45:21 2009
@@ -9,9 +9,9 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
-//
+//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
//
-namespace qpid {
+namespace qpid {
namespace management {
class Args
Copied: qpid/trunk/qpid/cpp/include/qpid/management/Manageable.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/management/Manageable.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/management/Manageable.h?p2=qpid/trunk/qpid/cpp/include/qpid/management/Manageable.h&p1=qpid/trunk/qpid/cpp/src/qpid/management/Manageable.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/Manageable.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/management/Manageable.h Wed Jul 15 16:45:21 2009
@@ -9,9 +9,9 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
-//
+//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,7 +25,7 @@
#include <string>
#include "qpid/CommonImportExport.h"
-namespace qpid {
+namespace qpid {
namespace management {
class QPID_COMMON_EXTERN Manageable
Copied: qpid/trunk/qpid/cpp/include/qpid/management/ManagementEvent.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/management/ManagementEvent.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/management/ManagementEvent.h?p2=qpid/trunk/qpid/cpp/include/qpid/management/ManagementEvent.h&p1=qpid/trunk/qpid/cpp/src/qpid/management/ManagementEvent.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementEvent.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/management/ManagementEvent.h Wed Jul 15 16:45:21 2009
@@ -10,9 +10,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Copied: qpid/trunk/qpid/cpp/include/qpid/management/ManagementObject.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/management/ManagementObject.h?p2=qpid/trunk/qpid/cpp/include/qpid/management/ManagementObject.h&p1=qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/management/ManagementObject.h Wed Jul 15 16:45:21 2009
@@ -10,9 +10,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -28,7 +28,7 @@
#include "qpid/CommonImportExport.h"
#include <map>
-namespace qpid {
+namespace qpid {
namespace management {
class Manageable;
@@ -111,7 +111,7 @@
class ManagementObject : public ManagementItem
{
protected:
-
+
uint64_t createTime;
uint64_t destroyTime;
uint64_t updateTime;
@@ -125,7 +125,7 @@
static int nextThreadIndex;
bool forcePublish;
-
+
QPID_COMMON_EXTERN int getThreadIndex();
QPID_COMMON_EXTERN void writeTimestamps(qpid::framing::Buffer& buf);
@@ -181,7 +181,7 @@
typedef std::map<ObjectId, ManagementObject*> ManagementObjectMap;
}}
-
+
#endif /*!_ManagementObject_*/
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/Condition.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/Condition.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/Condition.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/Condition.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/Condition.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/Condition.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/Condition.h Wed Jul 15 16:45:21 2009
@@ -10,9 +10,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/IOHandle.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/IOHandle.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/IOHandle.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/IOHandle.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/IOHandle.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/IOHandle.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/IOHandle.h Wed Jul 15 16:45:21 2009
@@ -10,9 +10,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/IntegerTypes.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/IntegerTypes.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/IntegerTypes.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/IntegerTypes.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/IntegerTypes.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/Monitor.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/Monitor.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/Monitor.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/Monitor.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/Monitor.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/Monitor.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/Monitor.h Wed Jul 15 16:45:21 2009
@@ -10,9 +10,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/Mutex.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/Mutex.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/Mutex.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/Mutex.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/Mutex.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/Mutex.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/Mutex.h Wed Jul 15 16:45:21 2009
@@ -79,7 +79,7 @@
};
}}
-
+
#ifdef USE_APR_PLATFORM
#include "apr/Mutex.h"
#elif defined (_WIN32)
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/Runnable.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/Runnable.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/Runnable.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/Runnable.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/Runnable.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/Runnable.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/Runnable.h Wed Jul 15 16:45:21 2009
@@ -9,9 +9,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -35,7 +35,7 @@
public:
/** Type to represent a runnable as a Functor */
typedef boost::function0<void> Functor;
-
+
QPID_COMMON_EXTERN virtual ~Runnable();
/** Derived classes override run(). */
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/StrError.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/StrError.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/StrError.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/StrError.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/StrError.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/StrError.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/StrError.h Wed Jul 15 16:45:21 2009
@@ -10,9 +10,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,5 +32,5 @@
QPID_COMMON_EXTERN std::string strError(int err);
}} // namespace qpid
-
+
#endif // _sys_StrError_h
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/SystemInfo.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/SystemInfo.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/SystemInfo.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/SystemInfo.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/SystemInfo.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/SystemInfo.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/SystemInfo.h Wed Jul 15 16:45:21 2009
@@ -30,7 +30,7 @@
/**
* Retrieve information about the system we are running on.
- * Results may be dependent on OS/hardware.
+ * Results may be dependent on OS/hardware.
*/
namespace SystemInfo {
/**
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/Thread.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/Thread.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/Thread.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/Thread.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/Thread.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/Thread.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/Thread.h Wed Jul 15 16:45:21 2009
@@ -10,9 +10,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -48,11 +48,11 @@
QPID_COMMON_EXTERN Thread();
QPID_COMMON_EXTERN explicit Thread(qpid::sys::Runnable*);
QPID_COMMON_EXTERN explicit Thread(qpid::sys::Runnable&);
-
+
QPID_COMMON_EXTERN void join();
QPID_COMMON_EXTERN unsigned long id();
-
+
QPID_COMMON_EXTERN static Thread current();
/** ID of current thread for logging.
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/Time.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/Time.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/Time.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/Time.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/Time.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/Time.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/Time.h Wed Jul 15 16:45:21 2009
@@ -10,9 +10,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -86,13 +86,13 @@
friend class Duration;
TimePrivate timepoint;
-
+
public:
QPID_COMMON_EXTERN inline AbsTime() {}
QPID_COMMON_EXTERN AbsTime(const AbsTime& time0, const Duration& duration);
// Default assignment operation fine
// Default copy constructor fine
-
+
QPID_COMMON_EXTERN static AbsTime now();
QPID_COMMON_EXTERN static AbsTime FarFuture();
const TimePrivate& getPrivate(void) const { return timepoint; }
@@ -158,7 +158,7 @@
/** Time greater than any other time */
const AbsTime FAR_FUTURE = AbsTime::FarFuture();
-
+
/** Portable sleep for a number of seconds */
QPID_COMMON_EXTERN void sleep(int secs);
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/posix/Condition.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/posix/Condition.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/posix/Condition.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/posix/Condition.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/posix/Condition.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/Condition.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/posix/Condition.h Wed Jul 15 16:45:21 2009
@@ -10,9 +10,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/posix/IntegerTypes.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/posix/IntegerTypes.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/posix/Mutex.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/posix/Mutex.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/posix/Mutex.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/posix/Mutex.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/posix/Mutex.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/Mutex.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/posix/Mutex.h Wed Jul 15 16:45:21 2009
@@ -39,12 +39,12 @@
public:
typedef ::qpid::sys::ScopedLock<Mutex> ScopedLock;
typedef ::qpid::sys::ScopedUnlock<Mutex> ScopedUnlock;
-
+
inline Mutex();
inline ~Mutex();
- inline void lock();
+ inline void lock();
inline void unlock();
- inline bool trylock();
+ inline bool trylock();
protected:
@@ -60,7 +60,7 @@
public:
typedef ::qpid::sys::ScopedRlock<RWlock> ScopedRlock;
typedef ::qpid::sys::ScopedWlock<RWlock> ScopedWlock;
-
+
inline RWlock();
inline ~RWlock();
inline void wlock(); // will write-lock
@@ -78,13 +78,13 @@
* PODMutex is a POD, can be static-initialized with
* PODMutex m = QPID_PODMUTEX_INITIALIZER
*/
-struct PODMutex
+struct PODMutex
{
typedef ::qpid::sys::ScopedLock<PODMutex> ScopedLock;
- inline void lock();
+ inline void lock();
inline void unlock();
- inline bool trylock();
+ inline bool trylock();
// Must be public to be a POD:
pthread_mutex_t mutex;
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/posix/PrivatePosix.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/posix/PrivatePosix.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/PrivatePosix.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h Wed Jul 15 16:45:21 2009
@@ -10,9 +10,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -42,7 +42,7 @@
IOHandlePrivate(int f = -1) :
fd(f)
{}
-
+
int fd;
};
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/posix/Time.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/posix/Time.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/posix/Time.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/posix/Time.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/posix/Time.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/posix/check.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/posix/check.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/posix/check.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/posix/check.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/posix/check.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/check.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/posix/check.h Wed Jul 15 16:45:21 2009
@@ -10,9 +10,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Copied: qpid/trunk/qpid/cpp/include/qpid/sys/uuid.h (from r794300, qpid/trunk/qpid/cpp/src/qpid/sys/uuid.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/uuid.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/uuid.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/uuid.h&r1=794300&r2=794325&rev=794325&view=diff
==============================================================================
(empty)
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=794325&r1=794324&r2=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Wed Jul 15 16:45:21 2009
@@ -195,6 +195,7 @@
include_directories( ${Boost_INCLUDE_DIR} )
include_directories( . )
+include_directories( ../include )
include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/gen)
link_directories( ${Boost_LIBRARY_DIRS} )
@@ -511,7 +512,7 @@
qpid/client/QueueOptions.cpp
qpid/client/Results.cpp
qpid/client/SessionBase_0_10.cpp
- qpid/client/SessionBase_0_10.h
+ ../include/qpid/client/SessionBase_0_10.h
qpid/client/SessionBase_0_10Access.h
qpid/client/ConnectionAccess.h
qpid/client/SessionImpl.cpp
@@ -615,7 +616,7 @@
# qpid/agent/ManagementAgent.h \
# qpid/agent/ManagementAgentImpl.h
set (qmfagent_SOURCES
- qpid/agent/ManagementAgent.h
+ ../include/qpid/agent/ManagementAgent.h
qpid/agent/ManagementAgentImpl.cpp
qpid/agent/ManagementAgentImpl.h
qmf/Agent.cpp
@@ -656,29 +657,29 @@
# qpid/console/SessionManager.h \
# qpid/console/Value.h
set (qmfconsole_SOURCES
- qpid/console/Agent.h
+ ../include/qpid/console/Agent.h
+ ../include/qpid/console/Broker.h
+ ../include/qpid/console/ClassKey.h
+ ../include/qpid/console/ConsoleImportExport.h
+ ../include/qpid/console/ConsoleListener.h
+ ../include/qpid/console/Event.h
+ ../include/qpid/console/Object.h
+ ../include/qpid/console/ObjectId.h
+ ../include/qpid/console/Package.h
+ ../include/qpid/console/Schema.h
+ ../include/qpid/console/SequenceManager.h
+ ../include/qpid/console/SessionManager.h
+ ../include/qpid/console/Value.h
qpid/console/Agent.cpp
- qpid/console/Broker.h
qpid/console/Broker.cpp
- qpid/console/ClassKey.h
qpid/console/ClassKey.cpp
- qpid/console/ConsoleImportExport.h
- qpid/console/ConsoleListener.h
- qpid/console/Event.h
qpid/console/Event.cpp
- qpid/console/Object.h
qpid/console/Object.cpp
- qpid/console/ObjectId.h
qpid/console/ObjectId.cpp
- qpid/console/Package.h
qpid/console/Package.cpp
- qpid/console/Schema.h
qpid/console/Schema.cpp
- qpid/console/SequenceManager.h
qpid/console/SequenceManager.cpp
- qpid/console/SessionManager.h
qpid/console/SessionManager.cpp
- qpid/console/Value.h
qpid/console/Value.cpp
)
add_library (qmfconsole SHARED ${qmfconsole_SOURCES})
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=794325&r1=794324&r2=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Wed Jul 15 16:45:21 2009
@@ -61,6 +61,10 @@
EXTRA_DIST= $(platform_dist) $(rgen_srcs) $(windows_dist)
+# Define variables that are be appended to by this file and included .mk files.
+nobase_include_HEADERS =
+libqpidcommon_la_SOURCES =
+
## Generated code
# Note: generated soure and makefiles included in distribution so a
@@ -105,7 +109,7 @@
## Compiler flags
AM_CXXFLAGS = $(WARNING_CFLAGS)
AM_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
-INCLUDES = -Igen -I$(srcdir)/gen
+INCLUDES = -Igen -I$(srcdir)/gen -I$(top_srcdir)/include
#
# Destination for intalled programs and tests defined here
@@ -132,31 +136,34 @@
sbin_PROGRAMS = qpidd
qpidd_SOURCES = qpidd.cpp qpidd.h $(posix_qpidd_src)
-posix_plat_src = \
- qpid/log/posix/SinkOptions.cpp \
- qpid/sys/posix/IOHandle.cpp \
- qpid/sys/posix/Socket.cpp \
- qpid/sys/posix/AsynchIO.cpp \
- qpid/sys/posix/FileSysDir.cpp \
- qpid/sys/posix/LockFile.cpp \
- qpid/sys/posix/Time.cpp \
- qpid/sys/posix/Thread.cpp \
- qpid/sys/posix/Shlib.cpp \
- qpid/sys/posix/Mutex.cpp \
- qpid/sys/posix/Fork.cpp \
- qpid/sys/posix/StrError.cpp \
- qpid/sys/posix/PollableCondition.cpp \
- qpid/sys/posix/PipeHandle.cpp
-
-posix_plat_hdr = \
- qpid/log/posix/SinkOptions.h \
- qpid/sys/posix/check.h \
- qpid/sys/posix/Condition.h \
- qpid/sys/posix/PrivatePosix.h \
- qpid/sys/posix/Mutex.h \
- qpid/sys/posix/Fork.h \
- qpid/sys/posix/IntegerTypes.h \
- qpid/sys/posix/Time.h
+## Platform specific code.
+
+# Posix-specific code
+libqpidcommon_la_SOURCES += \
+ qpid/log/posix/SinkOptions.cpp \
+ qpid/sys/posix/IOHandle.cpp \
+ qpid/sys/posix/Socket.cpp \
+ qpid/sys/posix/AsynchIO.cpp \
+ qpid/sys/posix/FileSysDir.cpp \
+ qpid/sys/posix/LockFile.cpp \
+ qpid/sys/posix/Time.cpp \
+ qpid/sys/posix/Thread.cpp \
+ qpid/sys/posix/Shlib.cpp \
+ qpid/sys/posix/Mutex.cpp \
+ qpid/sys/posix/Fork.cpp \
+ qpid/sys/posix/StrError.cpp \
+ qpid/sys/posix/PollableCondition.cpp \
+ qpid/sys/posix/PipeHandle.cpp \
+ qpid/log/posix/SinkOptions.h \
+ qpid/sys/posix/Fork.h
+
+nobase_include_HEADERS += \
+ ../include/qpid/sys/posix/Condition.h \
+ ../include/qpid/sys/posix/IntegerTypes.h \
+ ../include/qpid/sys/posix/Mutex.h \
+ ../include/qpid/sys/posix/PrivatePosix.h \
+ ../include/qpid/sys/posix/Time.h \
+ ../include/qpid/sys/posix/check.h
if HAVE_EPOLL
poller = qpid/sys/epoll/EpollPoller.cpp
@@ -172,8 +179,7 @@
systeminfo = qpid/sys/posix/SystemInfo.cpp
endif
-platform_src = $(posix_plat_src) $(poller) $(systeminfo)
-platform_hdr = $(posix_plat_hdr)
+libqpidcommon_la_SOURCES += $(poller) $(systeminfo)
posix_broker_src = \
qpid/broker/posix/BrokerDefaults.cpp
@@ -187,7 +193,6 @@
cmoduledir=$(libdir)/qpid/client
dmodule_LTLIBRARIES =
cmodule_LTLIBRARIES =
-module_hdr =
include cluster.mk
include acl.mk
@@ -301,66 +306,157 @@
$(LIB_DLOPEN) \
$(LIB_CLOCK_GETTIME)
-libqpidcommon_la_SOURCES = \
- $(rgen_framing_srcs) \
- $(platform_src) \
- qpid/assert.cpp qpid/assert.h \
- qpid/pointer_to_other.h \
- qpid/Address.cpp \
- qpid/DataDir.cpp \
- qpid/Exception.cpp \
- qpid/Modules.cpp \
- qpid/Options.cpp \
- qpid/Plugin.cpp \
- qpid/RefCountedBuffer.h \
- qpid/RefCountedBuffer.cpp \
- qpid/Serializer.h \
- qpid/SessionState.h \
- qpid/SessionState.cpp \
- qpid/SessionId.cpp \
- qpid/StringUtils.cpp \
- qpid/Url.cpp \
- qpid/amqp_0_10/SessionHandler.h \
- qpid/amqp_0_10/SessionHandler.cpp \
- qpid/framing/AccumulatedAck.cpp \
- qpid/framing/AMQBody.cpp \
- qpid/framing/AMQMethodBody.cpp \
- qpid/framing/AMQContentBody.cpp \
- qpid/framing/AMQFrame.cpp \
- qpid/framing/AMQHeaderBody.cpp \
- qpid/framing/AMQHeartbeatBody.cpp \
- qpid/framing/Array.cpp \
- qpid/framing/BodyHandler.cpp \
- qpid/framing/Buffer.cpp \
- qpid/framing/Endian.cpp \
- qpid/framing/FieldTable.cpp \
- qpid/framing/FieldValue.cpp \
- qpid/framing/FrameSet.cpp \
- qpid/framing/FrameDecoder.cpp \
- qpid/framing/ProtocolInitiation.cpp \
- qpid/framing/ProtocolVersion.cpp \
- qpid/framing/SendContent.cpp \
- qpid/framing/SequenceNumber.cpp \
- qpid/framing/SequenceNumberSet.cpp \
- qpid/framing/SequenceSet.cpp \
- qpid/framing/Proxy.cpp \
- qpid/framing/Uuid.cpp \
- qpid/framing/AMQP_HighestVersion.h \
- qpid/framing/TransferContent.cpp \
- qpid/log/Logger.cpp \
- qpid/log/Options.cpp \
- qpid/log/OstreamOutput.cpp \
- qpid/log/Selector.cpp \
- qpid/log/Statement.cpp \
- qpid/management/Manageable.cpp \
- qpid/management/ManagementObject.cpp \
- qpid/sys/AggregateOutput.cpp \
- qpid/sys/AsynchIOHandler.cpp \
- qpid/sys/Dispatcher.cpp \
- qpid/sys/DispatchHandle.cpp \
- qpid/sys/Runnable.cpp \
- qpid/sys/Shlib.cpp \
- qpid/sys/Timer.cpp
+libqpidcommon_la_SOURCES += \
+ $(rgen_framing_srcs) \
+ $(platform_src) \
+ qpid/Address.cpp \
+ qpid/DataDir.cpp \
+ qpid/DataDir.h \
+ qpid/Exception.cpp \
+ qpid/Modules.cpp \
+ qpid/Modules.h \
+ qpid/Options.cpp \
+ qpid/Plugin.cpp \
+ qpid/Plugin.h \
+ qpid/RefCounted.h \
+ qpid/RefCountedBuffer.cpp \
+ qpid/RefCountedBuffer.h \
+ qpid/Serializer.h \
+ qpid/SessionId.cpp \
+ qpid/SessionState.cpp \
+ qpid/SessionState.h \
+ qpid/SessionState.h \
+ qpid/SharedObject.h \
+ qpid/StringUtils.cpp \
+ qpid/StringUtils.h \
+ qpid/Url.cpp \
+ qpid/Version.h \
+ qpid/amqp_0_10/Exception.h \
+ qpid/amqp_0_10/SessionHandler.cpp \
+ qpid/amqp_0_10/SessionHandler.h \
+ qpid/amqp_0_10/apply.h \
+ qpid/assert.cpp qpid/assert.h \
+ qpid/assert.h \
+ qpid/framing/AMQBody.cpp \
+ qpid/framing/AMQBody.h \
+ qpid/framing/AMQCommandControlBody.h \
+ qpid/framing/AMQContentBody.cpp \
+ qpid/framing/AMQContentBody.h \
+ qpid/framing/AMQDataBlock.h \
+ qpid/framing/AMQFrame.cpp \
+ qpid/framing/AMQFrame.h \
+ qpid/framing/AMQHeaderBody.cpp \
+ qpid/framing/AMQHeaderBody.h \
+ qpid/framing/AMQHeartbeatBody.cpp \
+ qpid/framing/AMQHeartbeatBody.h \
+ qpid/framing/AMQMethodBody.cpp \
+ qpid/framing/AMQMethodBody.h \
+ qpid/framing/AMQP_HighestVersion.h \
+ qpid/framing/AMQP_HighestVersion.h \
+ qpid/framing/AccumulatedAck.cpp \
+ qpid/framing/AccumulatedAck.h \
+ qpid/framing/Array.cpp \
+ qpid/framing/BodyFactory.h \
+ qpid/framing/BodyHandler.cpp \
+ qpid/framing/BodyHandler.h \
+ qpid/framing/Buffer.cpp \
+ qpid/framing/ChannelHandler.h \
+ qpid/framing/Endian.cpp \
+ qpid/framing/Endian.h \
+ qpid/framing/FieldTable.cpp \
+ qpid/framing/FieldValue.cpp \
+ qpid/framing/FrameDecoder.cpp \
+ qpid/framing/FrameDecoder.h \
+ qpid/framing/FrameDefaultVisitor.h \
+ qpid/framing/FrameHandler.h \
+ qpid/framing/FrameSet.cpp \
+ qpid/framing/FrameSet.h \
+ qpid/framing/Handler.h \
+ qpid/framing/HeaderProperties.h \
+ qpid/framing/InitiationHandler.h \
+ qpid/framing/InputHandler.h \
+ qpid/framing/Invoker.h \
+ qpid/framing/MethodBodyFactory.h \
+ qpid/framing/MethodContent.h \
+ qpid/framing/ModelMethod.h \
+ qpid/framing/OutputHandler.h \
+ qpid/framing/ProtocolInitiation.cpp \
+ qpid/framing/ProtocolInitiation.h \
+ qpid/framing/ProtocolVersion.cpp \
+ qpid/framing/Proxy.cpp \
+ qpid/framing/Proxy.h \
+ qpid/framing/SendContent.cpp \
+ qpid/framing/SendContent.h \
+ qpid/framing/SequenceNumber.cpp \
+ qpid/framing/SequenceNumberSet.cpp \
+ qpid/framing/SequenceNumberSet.h \
+ qpid/framing/SequenceSet.cpp \
+ qpid/framing/TransferContent.cpp \
+ qpid/framing/TransferContent.h \
+ qpid/framing/TypeFilter.h \
+ qpid/framing/Uuid.cpp \
+ qpid/framing/Visitor.h \
+ qpid/framing/amqp_framing.h \
+ qpid/framing/frame_functors.h \
+ qpid/framing/variant.h \
+ qpid/log/Helpers.h \
+ qpid/log/Logger.cpp \
+ qpid/log/Options.cpp \
+ qpid/log/OstreamOutput.cpp \
+ qpid/log/OstreamOutput.h \
+ qpid/log/Selector.cpp \
+ qpid/log/Statement.cpp \
+ qpid/memory.h \
+ qpid/pointer_to_other.h \
+ qpid/ptr_map.h \
+ qpid/sys/AggregateOutput.cpp \
+ qpid/sys/AggregateOutput.h \
+ qpid/sys/AsynchIO.h \
+ qpid/sys/AsynchIOHandler.cpp \
+ qpid/sys/AsynchIOHandler.h \
+ qpid/sys/AtomicCount.h \
+ qpid/sys/AtomicValue.h \
+ qpid/sys/AtomicValue_gcc.h \
+ qpid/sys/AtomicValue_mutex.h \
+ qpid/sys/BlockingQueue.h \
+ qpid/sys/Codec.h \
+ qpid/sys/ConnectionCodec.h \
+ qpid/sys/ConnectionInputHandler.h \
+ qpid/sys/ConnectionInputHandlerFactory.h \
+ qpid/sys/ConnectionOutputHandler.h \
+ qpid/sys/ConnectionOutputHandlerPtr.h \
+ qpid/sys/CopyOnWriteArray.h \
+ qpid/sys/DeletionManager.h \
+ qpid/sys/DispatchHandle.cpp \
+ qpid/sys/DispatchHandle.h \
+ qpid/sys/Dispatcher.cpp \
+ qpid/sys/Dispatcher.h \
+ qpid/sys/ExceptionHolder.h \
+ qpid/sys/FileSysDir.h \
+ qpid/sys/Fork.h \
+ qpid/sys/LockFile.h \
+ qpid/sys/LockPtr.h \
+ qpid/sys/OutputControl.h \
+ qpid/sys/OutputTask.h \
+ qpid/sys/PipeHandle.h \
+ qpid/sys/PollableCondition.h \
+ qpid/sys/PollableQueue.h \
+ qpid/sys/Poller.h \
+ qpid/sys/ProtocolFactory.h \
+ qpid/sys/Runnable.cpp \
+ qpid/sys/ScopedIncrement.h \
+ qpid/sys/SecurityLayer.h \
+ qpid/sys/Semaphore.h \
+ qpid/sys/Shlib.cpp \
+ qpid/sys/Shlib.h \
+ qpid/sys/ShutdownHandler.h \
+ qpid/sys/Socket.h \
+ qpid/sys/StateMonitor.h \
+ qpid/sys/TimeoutHandler.h \
+ qpid/sys/Timer.cpp \
+ qpid/sys/Timer.h \
+ qpid/sys/Waitable.h \
+ qpid/sys/alloca.h
if HAVE_SASL
libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.h
@@ -373,74 +469,160 @@
libqpidbroker_la_SOURCES = \
$(mgen_broker_cpp) \
$(posix_broker_src) \
- qpid/amqp_0_10/Connection.h \
qpid/amqp_0_10/Connection.cpp \
+ qpid/amqp_0_10/Connection.h \
+ qpid/broker/AclModule.h \
+ qpid/broker/Bridge.cpp \
+ qpid/broker/Bridge.h \
qpid/broker/Broker.cpp \
+ qpid/broker/Broker.h \
+ qpid/broker/BrokerImportExport.h \
qpid/broker/BrokerSingleton.cpp \
- qpid/broker/Exchange.cpp \
- qpid/broker/ExpiryPolicy.cpp \
- qpid/broker/Queue.cpp \
- qpid/broker/QueueCleaner.cpp \
- qpid/broker/QueueListeners.cpp \
- qpid/broker/PersistableMessage.cpp \
- qpid/broker/Bridge.cpp \
+ qpid/broker/BrokerSingleton.h \
qpid/broker/Connection.cpp \
- qpid/broker/ConnectionHandler.cpp \
+ qpid/broker/Connection.h \
qpid/broker/ConnectionFactory.cpp \
+ qpid/broker/ConnectionFactory.h \
+ qpid/broker/ConnectionHandler.cpp \
+ qpid/broker/ConnectionHandler.h \
+ qpid/broker/ConnectionState.h \
+ qpid/broker/ConnectionToken.h \
+ qpid/broker/Consumer.h \
qpid/broker/Daemon.cpp \
+ qpid/broker/Daemon.h \
+ qpid/broker/Deliverable.h \
qpid/broker/DeliverableMessage.cpp \
+ qpid/broker/DeliverableMessage.h \
+ qpid/broker/DeliveryAdapter.h \
+ qpid/broker/DeliveryId.h \
qpid/broker/DeliveryRecord.cpp \
+ qpid/broker/DeliveryRecord.h \
qpid/broker/DirectExchange.cpp \
+ qpid/broker/DirectExchange.h \
qpid/broker/DtxAck.cpp \
+ qpid/broker/DtxAck.h \
qpid/broker/DtxBuffer.cpp \
+ qpid/broker/DtxBuffer.h \
qpid/broker/DtxManager.cpp \
+ qpid/broker/DtxManager.h \
qpid/broker/DtxTimeout.cpp \
+ qpid/broker/DtxTimeout.h \
qpid/broker/DtxWorkRecord.cpp \
+ qpid/broker/DtxWorkRecord.h \
+ qpid/broker/Exchange.cpp \
+ qpid/broker/Exchange.h \
qpid/broker/ExchangeRegistry.cpp \
+ qpid/broker/ExchangeRegistry.h \
+ qpid/broker/ExpiryPolicy.cpp \
+ qpid/broker/ExpiryPolicy.h \
qpid/broker/FanOutExchange.cpp \
+ qpid/broker/FanOutExchange.h \
+ qpid/broker/HandlerImpl.h \
qpid/broker/HeadersExchange.cpp \
+ qpid/broker/HeadersExchange.h \
qpid/broker/IncompleteMessageList.cpp \
+ qpid/broker/IncompleteMessageList.h \
qpid/broker/Link.cpp \
+ qpid/broker/Link.h \
qpid/broker/LinkRegistry.cpp \
+ qpid/broker/LinkRegistry.h \
qpid/broker/Message.cpp \
+ qpid/broker/Message.h \
qpid/broker/MessageAdapter.cpp \
+ qpid/broker/MessageAdapter.h \
qpid/broker/MessageBuilder.cpp \
+ qpid/broker/MessageBuilder.h \
+ qpid/broker/MessageStore.h \
qpid/broker/MessageStoreModule.cpp \
+ qpid/broker/MessageStoreModule.h \
qpid/broker/NameGenerator.cpp \
+ qpid/broker/NameGenerator.h \
qpid/broker/NullMessageStore.cpp \
+ qpid/broker/NullMessageStore.h \
+ qpid/broker/OwnershipToken.h \
+ qpid/broker/Persistable.h \
+ qpid/broker/PersistableConfig.h \
+ qpid/broker/PersistableExchange.h \
+ qpid/broker/PersistableMessage.cpp \
+ qpid/broker/PersistableMessage.h \
+ qpid/broker/PersistableQueue.h \
+ qpid/broker/Queue.cpp \
+ qpid/broker/Queue.h \
qpid/broker/QueueBindings.cpp \
+ qpid/broker/QueueBindings.h \
+ qpid/broker/QueueCleaner.cpp \
+ qpid/broker/QueueCleaner.h \
qpid/broker/QueueEvents.cpp \
+ qpid/broker/QueueEvents.h \
+ qpid/broker/QueueListeners.cpp \
+ qpid/broker/QueueListeners.h \
qpid/broker/QueuePolicy.cpp \
+ qpid/broker/QueuePolicy.h \
qpid/broker/QueueRegistry.cpp \
+ qpid/broker/QueueRegistry.h \
+ qpid/broker/QueuedMessage.h \
+ qpid/broker/RateFlowcontrol.h \
qpid/broker/RateTracker.cpp \
- qpid/broker/RecoveryManagerImpl.cpp \
- qpid/broker/RecoveredEnqueue.cpp \
+ qpid/broker/RateTracker.h \
+ qpid/broker/RecoverableConfig.h \
+ qpid/broker/RecoverableExchange.h \
+ qpid/broker/RecoverableMessage.h \
+ qpid/broker/RecoverableQueue.h \
+ qpid/broker/RecoverableTransaction.h \
qpid/broker/RecoveredDequeue.cpp \
+ qpid/broker/RecoveredDequeue.h \
+ qpid/broker/RecoveredEnqueue.cpp \
+ qpid/broker/RecoveredEnqueue.h \
+ qpid/broker/RecoveryManager.h \
+ qpid/broker/RecoveryManagerImpl.cpp \
+ qpid/broker/RecoveryManagerImpl.h \
qpid/broker/RetryList.cpp \
+ qpid/broker/RetryList.h \
qpid/broker/SaslAuthenticator.cpp \
+ qpid/broker/SaslAuthenticator.h \
qpid/broker/SecureConnection.cpp \
+ qpid/broker/SecureConnection.h \
qpid/broker/SecureConnectionFactory.cpp \
- qpid/broker/SemanticState.h \
+ qpid/broker/SecureConnectionFactory.h \
qpid/broker/SemanticState.cpp \
+ qpid/broker/SemanticState.h \
qpid/broker/SessionAdapter.cpp \
- qpid/broker/SessionState.h \
- qpid/broker/SessionState.cpp \
- qpid/broker/SessionManager.h \
- qpid/broker/SessionManager.cpp \
+ qpid/broker/SessionAdapter.h \
+ qpid/broker/SessionAdapter.h \
qpid/broker/SessionContext.h \
- qpid/broker/SessionHandler.h \
qpid/broker/SessionHandler.cpp \
- qpid/broker/SignalHandler.h \
+ qpid/broker/SessionHandler.h \
+ qpid/broker/SessionManager.cpp \
+ qpid/broker/SessionManager.h \
+ qpid/broker/SessionManager.h \
+ qpid/broker/SessionState.cpp \
+ qpid/broker/SessionState.h \
qpid/broker/SignalHandler.cpp \
+ qpid/broker/SignalHandler.h \
qpid/broker/System.cpp \
+ qpid/broker/System.h \
qpid/broker/Timer.cpp \
+ qpid/broker/Timer.h \
qpid/broker/TopicExchange.cpp \
+ qpid/broker/TopicExchange.h \
+ qpid/broker/TransactionalStore.h \
qpid/broker/TxAccept.cpp \
+ qpid/broker/TxAccept.h \
qpid/broker/TxBuffer.cpp \
+ qpid/broker/TxBuffer.h \
+ qpid/broker/TxOp.h \
+ qpid/broker/TxOpVisitor.h \
qpid/broker/TxPublish.cpp \
+ qpid/broker/TxPublish.h \
qpid/broker/Vhost.cpp \
+ qpid/broker/Vhost.h \
+ qpid/management/IdAllocator.h \
+ qpid/management/Manageable.cpp \
qpid/management/ManagementAgent.cpp \
+ qpid/management/ManagementAgent.h \
qpid/management/ManagementExchange.cpp \
+ qpid/management/ManagementExchange.h \
+ qpid/management/ManagementObject.cpp \
qpid/sys/TCPIOPlugin.cpp
@@ -449,20 +631,29 @@
libqpidclient_la_SOURCES = \
$(rgen_client_srcs) \
qpid/client/Bounds.cpp \
+ qpid/client/Bounds.h \
+ qpid/client/ChainableFrameHandler.h \
+ qpid/client/Completion.cpp \
+ qpid/client/CompletionImpl.h \
qpid/client/Connection.cpp \
+ qpid/client/ConnectionAccess.h \
qpid/client/ConnectionHandler.cpp \
+ qpid/client/ConnectionHandler.h \
qpid/client/ConnectionImpl.cpp \
+ qpid/client/ConnectionImpl.h \
qpid/client/ConnectionSettings.cpp \
qpid/client/Connector.cpp \
+ qpid/client/Connector.h \
qpid/client/Demux.cpp \
+ qpid/client/Demux.h \
qpid/client/Dispatcher.cpp \
- qpid/client/FailoverManager.cpp \
- qpid/client/FailoverListener.h \
+ qpid/client/Dispatcher.h \
+ qpid/client/Execution.h \
qpid/client/FailoverListener.cpp \
+ qpid/client/FailoverListener.h \
+ qpid/client/FailoverManager.cpp \
qpid/client/Future.cpp \
qpid/client/FutureCompletion.cpp \
- qpid/client/Completion.cpp \
- qpid/client/CompletionImpl.h \
qpid/client/FutureResult.cpp \
qpid/client/LoadPlugins.cpp \
qpid/client/LocalQueue.cpp \
@@ -473,279 +664,94 @@
qpid/client/MessageImpl.h \
qpid/client/MessageListener.cpp \
qpid/client/MessageReplayTracker.cpp \
+ qpid/client/PrivateImplRef.h \
qpid/client/QueueOptions.cpp \
qpid/client/Results.cpp \
+ qpid/client/Results.h \
+ qpid/client/Sasl.h \
qpid/client/SaslFactory.cpp \
+ qpid/client/SaslFactory.h \
qpid/client/SessionBase_0_10.cpp \
- qpid/client/SessionBase_0_10.h \
qpid/client/SessionBase_0_10Access.h \
- qpid/client/ConnectionAccess.h \
qpid/client/SessionImpl.cpp \
+ qpid/client/SessionImpl.h \
qpid/client/StateManager.cpp \
+ qpid/client/StateManager.h \
qpid/client/Subscription.cpp \
qpid/client/SubscriptionImpl.cpp \
- qpid/client/SubscriptionImpl.h \
+ qpid/client/SubscriptionImpl.h \
qpid/client/SubscriptionManager.cpp \
qpid/client/SubscriptionManagerImpl.cpp \
qpid/client/SubscriptionManagerImpl.h
-nobase_include_HEADERS = \
- $(platform_hdr) \
- $(module_hdr) \
- qpid/amqp_0_10/apply.h \
- qpid/assert.h \
- qpid/Address.h \
- qpid/DataDir.h \
- qpid/Exception.h \
- qpid/sys/ExceptionHolder.h \
- qpid/amqp_0_10/Exception.h \
- qpid/Modules.h \
- qpid/Msg.h \
- qpid/Options.h \
- qpid/Plugin.h \
- qpid/ptr_map.h \
- qpid/RangeSet.h \
- qpid/RefCounted.h \
- qpid/SessionId.h \
- qpid/SessionState.h \
- qpid/SharedObject.h \
- qpid/StringUtils.h \
- qpid/Url.h \
- qpid/InlineVector.h \
- qpid/InlineAllocator.h \
- qpid/memory.h \
- qpid/Version.h \
- qpid/broker/Broker.h \
- qpid/broker/AclModule.h \
- qpid/broker/SessionAdapter.h \
- qpid/broker/Exchange.h \
- qpid/broker/Queue.h \
- qpid/broker/QueueListeners.h \
- qpid/broker/QueueCleaner.h \
- qpid/broker/BrokerImportExport.h \
- qpid/broker/BrokerSingleton.h \
- qpid/broker/Bridge.h \
- qpid/broker/Connection.h \
- qpid/broker/ConnectionState.h \
- qpid/broker/ConnectionFactory.h \
- qpid/broker/ConnectionHandler.h \
- qpid/broker/ConnectionToken.h \
- qpid/broker/OwnershipToken.h \
- qpid/broker/Consumer.h \
- qpid/broker/Daemon.h \
- qpid/broker/Deliverable.h \
- qpid/broker/DeliverableMessage.h \
- qpid/broker/DeliveryAdapter.h \
- qpid/broker/DeliveryId.h \
- qpid/broker/DeliveryRecord.h \
- qpid/broker/DirectExchange.h \
- qpid/broker/DtxAck.h \
- qpid/broker/DtxBuffer.h \
- qpid/broker/DtxManager.h \
- qpid/broker/DtxTimeout.h \
- qpid/broker/DtxWorkRecord.h \
- qpid/broker/ExchangeRegistry.h \
- qpid/broker/ExpiryPolicy.h \
- qpid/broker/FanOutExchange.h \
- qpid/broker/HandlerImpl.h \
- qpid/broker/HeadersExchange.h \
- qpid/broker/IncompleteMessageList.h \
- qpid/broker/Link.h \
- qpid/broker/LinkRegistry.h \
- qpid/broker/Message.h \
- qpid/broker/MessageAdapter.h \
- qpid/broker/MessageBuilder.h \
- qpid/broker/MessageStore.h \
- qpid/broker/MessageStoreModule.h \
- qpid/broker/NameGenerator.h \
- qpid/broker/NullMessageStore.h \
- qpid/broker/Persistable.h \
- qpid/broker/PersistableConfig.h \
- qpid/broker/PersistableExchange.h \
- qpid/broker/PersistableMessage.h \
- qpid/broker/PersistableQueue.h \
- qpid/broker/QueueBindings.h \
- qpid/broker/QueueEvents.h \
- qpid/broker/QueuedMessage.h \
- qpid/broker/QueuePolicy.h \
- qpid/broker/QueueRegistry.h \
- qpid/broker/RateFlowcontrol.h \
- qpid/broker/RateTracker.h \
- qpid/broker/RecoverableConfig.h \
- qpid/broker/RecoverableExchange.h \
- qpid/broker/RecoverableMessage.h \
- qpid/broker/RecoverableQueue.h \
- qpid/broker/RecoverableTransaction.h \
- qpid/broker/RecoveredDequeue.h \
- qpid/broker/RecoveredEnqueue.h \
- qpid/broker/RecoveryManager.h \
- qpid/broker/RecoveryManagerImpl.h \
- qpid/broker/RetryList.h \
- qpid/broker/SaslAuthenticator.h \
- qpid/broker/SecureConnection.h \
- qpid/broker/SecureConnectionFactory.h \
- qpid/broker/SessionAdapter.h \
- qpid/broker/SessionManager.h \
- qpid/broker/System.h \
- qpid/broker/Timer.h \
- qpid/broker/TopicExchange.h \
- qpid/broker/TransactionalStore.h \
- qpid/broker/TxAccept.h \
- qpid/broker/TxBuffer.h \
- qpid/broker/TxOp.h \
- qpid/broker/TxOpVisitor.h \
- qpid/broker/TxPublish.h \
- qpid/broker/Vhost.h \
- qpid/client/Bounds.h \
- qpid/client/ChainableFrameHandler.h \
- qpid/client/ClientImportExport.h \
- qpid/client/Completion.h \
- qpid/client/Connection.h \
- qpid/client/ConnectionHandler.h \
- qpid/client/ConnectionImpl.h \
- qpid/client/ConnectionSettings.h \
- qpid/client/Connector.h \
- qpid/client/Demux.h \
- qpid/client/Dispatcher.h \
- qpid/client/Execution.h \
- qpid/client/FailoverManager.h \
- qpid/client/Subscription.h \
- qpid/client/SubscriptionSettings.h \
- qpid/client/FlowControl.h \
- qpid/client/Future.h \
- qpid/client/FutureCompletion.h \
- qpid/client/FutureResult.h \
- qpid/client/Handle.h \
- qpid/client/PrivateImplRef.h \
- qpid/client/LocalQueue.h \
- qpid/client/QueueOptions.h \
- qpid/client/Message.h \
- qpid/client/MessageListener.h \
- qpid/client/MessageReplayTracker.h \
- qpid/client/Results.h \
- qpid/client/Sasl.h \
- qpid/client/SaslFactory.h \
- qpid/client/SessionBase_0_10.h \
- qpid/client/Session.h \
- qpid/client/SessionImpl.h \
- qpid/client/AsyncSession.h \
- qpid/client/StateManager.h \
- qpid/client/SubscriptionManager.h \
- qpid/client/TypedResult.h \
- qpid/framing/AMQBody.h \
- qpid/framing/AMQCommandControlBody.h \
- qpid/framing/AMQContentBody.h \
- qpid/framing/AMQDataBlock.h \
- qpid/framing/AMQFrame.h \
- qpid/framing/AMQHeaderBody.h \
- qpid/framing/AMQHeartbeatBody.h \
- qpid/framing/AMQMethodBody.h \
- qpid/framing/AMQP_HighestVersion.h \
- qpid/framing/AccumulatedAck.h \
- qpid/framing/Array.h \
- qpid/framing/BodyHandler.h \
- qpid/framing/BodyFactory.h \
- qpid/framing/MethodBodyFactory.h \
- qpid/framing/Buffer.h \
- qpid/framing/ChannelHandler.h \
- qpid/framing/Endian.h \
- qpid/framing/FieldTable.h \
- qpid/framing/FieldValue.h \
- qpid/framing/FrameDefaultVisitor.h \
- qpid/framing/FrameDecoder.h \
- qpid/framing/FrameHandler.h \
- qpid/framing/FrameSet.h \
- qpid/framing/Handler.h \
- qpid/framing/HeaderProperties.h \
- qpid/framing/Invoker.h \
- qpid/framing/InputHandler.h \
- qpid/framing/InitiationHandler.h \
- qpid/framing/MethodContent.h \
- qpid/framing/ModelMethod.h \
- qpid/framing/OutputHandler.h \
- qpid/framing/ProtocolInitiation.h \
- qpid/framing/ProtocolVersion.h \
- qpid/framing/Proxy.h \
- qpid/framing/SendContent.h \
- qpid/framing/SequenceNumber.h \
- qpid/framing/SequenceSet.h \
- qpid/framing/SequenceNumberSet.h \
- qpid/framing/StructHelper.h \
- qpid/framing/TransferContent.h \
- qpid/framing/TypeFilter.h \
- qpid/framing/Uuid.h \
- qpid/framing/Visitor.h \
- qpid/framing/amqp_framing.h \
- qpid/framing/amqp_types.h \
- qpid/framing/amqp_types_full.h \
- qpid/framing/frame_functors.h \
- qpid/framing/variant.h \
- qpid/log/Helpers.h \
- qpid/log/Options.h \
- qpid/log/Logger.h \
- qpid/log/OstreamOutput.h \
- qpid/log/Selector.h \
- qpid/log/SinkOptions.h \
- qpid/log/Statement.h \
- qpid/management/Args.h \
- qpid/management/IdAllocator.h \
- qpid/management/Manageable.h \
- qpid/management/ManagementAgent.h \
- qpid/management/ManagementEvent.h \
- qpid/management/ManagementExchange.h \
- qpid/management/ManagementObject.h \
- qpid/sys/alloca.h \
- qpid/sys/AggregateOutput.h \
- qpid/sys/AsynchIO.h \
- qpid/sys/AsynchIOHandler.h \
- qpid/sys/AtomicCount.h \
- qpid/sys/AtomicValue.h \
- qpid/sys/AtomicValue_gcc.h \
- qpid/sys/AtomicValue_mutex.h \
- qpid/sys/BlockingQueue.h \
- qpid/sys/Codec.h \
- qpid/sys/CopyOnWriteArray.h \
- qpid/sys/Condition.h \
- qpid/sys/ConnectionCodec.h \
- qpid/sys/ConnectionInputHandler.h \
- qpid/sys/ConnectionInputHandlerFactory.h \
- qpid/sys/ConnectionOutputHandler.h \
- qpid/sys/ConnectionOutputHandlerPtr.h \
- qpid/sys/DeletionManager.h \
- qpid/sys/Dispatcher.h \
- qpid/sys/DispatchHandle.h \
- qpid/sys/FileSysDir.h \
- qpid/sys/IntegerTypes.h \
- qpid/sys/IOHandle.h \
- qpid/sys/LockFile.h \
- qpid/sys/LockPtr.h \
- qpid/sys/Monitor.h \
- qpid/sys/Mutex.h \
- qpid/sys/OutputControl.h \
- qpid/sys/OutputTask.h \
- qpid/sys/PipeHandle.h \
- qpid/sys/PollableCondition.h \
- qpid/sys/PollableQueue.h \
- qpid/sys/Poller.h \
- qpid/sys/ProtocolFactory.h \
- qpid/sys/Runnable.h \
- qpid/sys/Fork.h \
- qpid/sys/ScopedIncrement.h \
- qpid/sys/SecurityLayer.h \
- qpid/sys/Semaphore.h \
- qpid/sys/SystemInfo.h \
- qpid/sys/Shlib.h \
- qpid/sys/ShutdownHandler.h \
- qpid/sys/Socket.h \
- qpid/sys/StateMonitor.h \
- qpid/sys/StrError.h \
- qpid/sys/Waitable.h \
- qpid/sys/Thread.h \
- qpid/sys/Time.h \
- qpid/sys/Timer.h \
- qpid/sys/TimeoutHandler.h \
- qpid/sys/uuid.h \
- qpid/CommonImportExport.h
+# NOTE: only public header files (which should be in ../include)
+# should go in this list. Private headers should go in the SOURCES
+# list for one of the libraries or executables that includes it.
+
+nobase_include_HEADERS += \
+ ../include/qpid/Address.h \
+ ../include/qpid/CommonImportExport.h \
+ ../include/qpid/Exception.h \
+ ../include/qpid/InlineAllocator.h \
+ ../include/qpid/InlineVector.h \
+ ../include/qpid/Msg.h \
+ ../include/qpid/Options.h \
+ ../include/qpid/RangeSet.h \
+ ../include/qpid/SessionId.h \
+ ../include/qpid/Url.h \
+ ../include/qpid/client/AsyncSession.h \
+ ../include/qpid/client/ClientImportExport.h \
+ ../include/qpid/client/Completion.h \
+ ../include/qpid/client/Connection.h \
+ ../include/qpid/client/ConnectionSettings.h \
+ ../include/qpid/client/FailoverManager.h \
+ ../include/qpid/client/FlowControl.h \
+ ../include/qpid/client/Future.h \
+ ../include/qpid/client/FutureCompletion.h \
+ ../include/qpid/client/FutureResult.h \
+ ../include/qpid/client/Handle.h \
+ ../include/qpid/client/LocalQueue.h \
+ ../include/qpid/client/Message.h \
+ ../include/qpid/client/MessageListener.h \
+ ../include/qpid/client/MessageReplayTracker.h \
+ ../include/qpid/client/QueueOptions.h \
+ ../include/qpid/client/Session.h \
+ ../include/qpid/client/SessionBase_0_10.h \
+ ../include/qpid/client/Subscription.h \
+ ../include/qpid/client/SubscriptionManager.h \
+ ../include/qpid/client/SubscriptionSettings.h \
+ ../include/qpid/client/TypedResult.h \
+ ../include/qpid/framing/Array.h \
+ ../include/qpid/framing/Buffer.h \
+ ../include/qpid/framing/FieldTable.h \
+ ../include/qpid/framing/FieldValue.h \
+ ../include/qpid/framing/ProtocolVersion.h \
+ ../include/qpid/framing/SequenceNumber.h \
+ ../include/qpid/framing/SequenceSet.h \
+ ../include/qpid/framing/StructHelper.h \
+ ../include/qpid/framing/Uuid.h \
+ ../include/qpid/framing/amqp_types.h \
+ ../include/qpid/framing/amqp_types_full.h \
+ ../include/qpid/log/Logger.h \
+ ../include/qpid/log/Options.h \
+ ../include/qpid/log/Selector.h \
+ ../include/qpid/log/SinkOptions.h \
+ ../include/qpid/log/Statement.h \
+ ../include/qpid/management/Args.h \
+ ../include/qpid/management/Manageable.h \
+ ../include/qpid/management/ManagementEvent.h \
+ ../include/qpid/management/ManagementObject.h \
+ ../include/qpid/sys/Condition.h \
+ ../include/qpid/sys/IOHandle.h \
+ ../include/qpid/sys/IntegerTypes.h \
+ ../include/qpid/sys/Monitor.h \
+ ../include/qpid/sys/Mutex.h \
+ ../include/qpid/sys/Runnable.h \
+ ../include/qpid/sys/StrError.h \
+ ../include/qpid/sys/SystemInfo.h \
+ ../include/qpid/sys/Thread.h \
+ ../include/qpid/sys/Time.h \
+ ../include/qpid/sys/uuid.h
# Force build of qpidd during dist phase so help2man will work.
dist-hook: $(BUILT_SOURCES)
Modified: qpid/trunk/qpid/cpp/src/qmf.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf.mk?rev=794325&r1=794324&r2=794325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf.mk (original)
+++ qpid/trunk/qpid/cpp/src/qmf.mk Wed Jul 15 16:45:21 2009
@@ -20,46 +20,47 @@
#
# qmf agent library makefile fragment, to be included in Makefile.am
#
-lib_LTLIBRARIES += \
- libqmfcommon.la \
+lib_LTLIBRARIES += \
+ libqmfcommon.la \
libqmfagent.la
-module_hdr += \
- qpid/agent/ManagementAgent.h \
- qpid/agent/ManagementAgentImpl.h \
- qpid/agent/QmfAgentImportExport.h \
- qmf/Agent.h \
- qmf/Console.h \
- qmf/Event.h \
- qmf/Message.h \
- qmf/MessageImpl.h \
- qmf/Object.h \
- qmf/ObjectId.h \
- qmf/ObjectIdImpl.h \
- qmf/ObjectImpl.h \
- qmf/Query.h \
- qmf/QueryImpl.h \
- qmf/ResilientConnection.h \
- qmf/Schema.h \
- qmf/SchemaImpl.h \
- qmf/Typecode.h \
- qmf/Value.h \
- qmf/ValueImpl.h
+# Public header files
+nobase_include_HEADERS += \
+ ../include/qpid/agent/ManagementAgent.h \
+ ../include/qpid/agent/QmfAgentImportExport.h
+
-libqmfcommon_la_SOURCES = \
- qmf/Agent.cpp \
- qmf/ResilientConnection.cpp \
- qmf/MessageImpl.cpp \
- qmf/SchemaImpl.cpp \
- qmf/ValueImpl.cpp \
- qmf/ObjectIdImpl.cpp \
- qmf/ObjectImpl.cpp \
- qmf/QueryImpl.cpp
+libqmfcommon_la_SOURCES = \
+ qmf/Agent.cpp \
+ qmf/Agent.h \
+ qmf/Console.h \
+ qmf/Event.h \
+ qmf/Message.h \
+ qmf/MessageImpl.cpp \
+ qmf/MessageImpl.h \
+ qmf/Object.h \
+ qmf/ObjectId.h \
+ qmf/ObjectIdImpl.cpp \
+ qmf/ObjectIdImpl.h \
+ qmf/ObjectImpl.cpp \
+ qmf/ObjectImpl.h \
+ qmf/Query.h \
+ qmf/QueryImpl.cpp \
+ qmf/QueryImpl.h \
+ qmf/ResilientConnection.cpp \
+ qmf/ResilientConnection.h \
+ qmf/Schema.h \
+ qmf/SchemaImpl.cpp \
+ qmf/SchemaImpl.h \
+ qmf/Typecode.h \
+ qmf/Value.h \
+ qmf/ValueImpl.cpp \
+ qmf/ValueImpl.h
-libqmfagent_la_SOURCES = \
- qpid/agent/ManagementAgent.h \
- qpid/agent/ManagementAgentImpl.cpp \
- qpid/agent/ManagementAgentImpl.h \
+libqmfagent_la_SOURCES = \
+ ../include/qpid/agent/ManagementAgent.h \
+ qpid/agent/ManagementAgentImpl.cpp \
+ qpid/agent/ManagementAgentImpl.h \
qmf/Agent.cpp
libqmfagent_la_LIBADD = libqpidclient.la
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org