Author: astitcher
Date: Thu Jun 12 22:00:21 2014
New Revision: 1602305
URL: http://svn.apache.org/r1602305
Log:
QPID-3921: Don't leak use qpid/Options.h header unnecessarily.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
qpid/trunk/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?rev=1602305&r1=1602304&r2=1602305&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Thu Jun 12 22:00:21 2014
@@ -25,6 +25,7 @@
#include "qpid/broker/BrokerImportExport.h"
#include "qpid/DataDir.h"
+#include "qpid/Options.h"
#include "qpid/Plugin.h"
#include "qpid/broker/DtxManager.h"
#include "qpid/broker/ExchangeRegistry.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h?rev=1602305&r1=1602304&r2=1602305&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h Thu Jun 12 22:00:21 2014
@@ -29,8 +29,6 @@
#include "qpid/broker/TransactionalStore.h"
#include "qpid/framing/FieldTable.h"
-#include <qpid/Options.h>
-
#include <boost/shared_ptr.hpp>
#include <boost/intrusive_ptr.hpp>
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp?rev=1602305&r1=1602304&r2=1602305&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp Thu Jun 12
22:00:21 2014
@@ -18,7 +18,10 @@
* under the License.
*
*/
+
#include "qpid/Plugin.h"
+
+#include "qpid/Options.h"
#include "qpid/SaslFactory.h"
#include "qpid/NullSaslServer.h"
#include "qpid/broker/Broker.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp?rev=1602305&r1=1602304&r2=1602305&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp Thu Jun 12
22:00:21 2014
@@ -21,6 +21,7 @@
#include "qpid/sys/TransportFactory.h"
+#include "qpid/Options.h"
#include "qpid/Plugin.h"
#include "qpid/broker/Broker.h"
#include "qpid/log/Statement.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h?rev=1602305&r1=1602304&r2=1602305&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h Thu Jun 12
22:00:21 2014
@@ -22,20 +22,23 @@
#ifndef QPID_LEGACYSTORE_MESSAGESTOREIMPL_H
#define QPID_LEGACYSTORE_MESSAGESTOREIMPL_H
-#include <string>
+#include "qpid/broker/MessageStore.h"
-#include "db-inc.h"
+#include "qpid/Options.h"
+#include "qpid/broker/Broker.h"
#include "qpid/legacystore/Cursor.h"
#include "qpid/legacystore/IdDbt.h"
#include "qpid/legacystore/IdSequence.h"
#include "qpid/legacystore/JournalImpl.h"
#include "qpid/legacystore/jrnl/jcfg.h"
#include "qpid/legacystore/PreparedTransaction.h"
-#include "qpid/broker/Broker.h"
-#include "qpid/broker/MessageStore.h"
+#include "qpid/legacystore/TxnCtxt.h"
#include "qpid/management/Manageable.h"
#include "qmf/org/apache/qpid/legacystore/Store.h"
-#include "qpid/legacystore/TxnCtxt.h"
+
+#include <string>
+
+#include "db-inc.h"
// Assume DB_VERSION_MAJOR == 4
#if (DB_VERSION_MINOR == 2)
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h?rev=1602305&r1=1602304&r2=1602305&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h Thu Jun 12
22:00:21 2014
@@ -22,8 +22,9 @@
#ifndef QPID_LINEARSTORE_MESSAGESTOREIMPL_H
#define QPID_LINEARSTORE_MESSAGESTOREIMPL_H
-#include <iomanip>
#include "qpid/broker/MessageStore.h"
+
+#include "qpid/Options.h"
#include "qpid/linearstore/IdSequence.h"
#include "qpid/linearstore/JournalLogImpl.h"
#include "qpid/linearstore/journal/jcfg.h"
@@ -32,6 +33,8 @@
#include "qmf/org/apache/qpid/linearstore/Store.h"
+#include <iomanip>
+
// Assume DB_VERSION_MAJOR == 4
#if (DB_VERSION_MINOR == 2)
#include <errno.h>
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp?rev=1602305&r1=1602304&r2=1602305&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp Thu Jun 12 22:00:21 2014
@@ -32,6 +32,7 @@
#include "qpid/sys/SecuritySettings.h"
#include <boost/bind.hpp>
+#include <boost/lexical_cast.hpp>
#include <memory>
#include <netdb.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
