diff options
Diffstat (limited to 'cpp')
53 files changed, 161 insertions, 165 deletions
diff --git a/cpp/Makefile b/cpp/Makefile index 586a934cce..15d73b4bd9 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -53,10 +53,6 @@ XSL := code_gen.xsl framing.xsl STYLESHEETS := $(XSL:%=$(CURDIR)/etc/stylesheets/%) TRANSFORM := java -jar $(CURDIR)/tools/saxon8.jar -o results.out $(SPEC) -.PHONY: generate - -generate: gen/timestamp - # Restart make if code is re-generated to get proper dependencies. # Remove "clean" to avoid infinite loop. REMAKE := exec $(MAKE) $(MAKECMDGOALS:clean=) @@ -78,7 +74,7 @@ LIB_CMD = $(CXX) -shared -o $@ $(LDFLAGS) $(CXXFLAGS) -lapr-1 COMMON_LIB := lib/libqpid_common.so.1.0 COMMON_DIRS := qpid/concurrent qpid/framing qpid/io qpid COMMON_SRC := $(wildcard gen/qpid/framing/*.cpp $(COMMON_DIRS:%=src/%/*.cpp)) -$(COMMON_LIB): generate $(COMMON_SRC:.cpp=.o) +$(COMMON_LIB): gen/timestamp $(COMMON_SRC:.cpp=.o) $(LIB_CMD) $(COMMON_SRC:.cpp=.o) all: $(COMMON_LIB) UNITTESTS := $(UNITTESTS) $(wildcard $(COMMON_DIRS:%=test/unit/%/*Test.cpp)) diff --git a/cpp/src/qpid/broker/AutoDelete.cpp b/cpp/src/qpid/broker/AutoDelete.cpp index 22076e9e0c..434bd4a3a0 100644 --- a/cpp/src/qpid/broker/AutoDelete.cpp +++ b/cpp/src/qpid/broker/AutoDelete.cpp @@ -15,7 +15,7 @@ * limitations under the License. * */ -#include "./qpid/broker/AutoDelete.h" +#include "qpid/broker/AutoDelete.h" using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/AutoDelete.h b/cpp/src/qpid/broker/AutoDelete.h index 77a5a338e3..9faa4aa4c4 100644 --- a/cpp/src/qpid/broker/AutoDelete.h +++ b/cpp/src/qpid/broker/AutoDelete.h @@ -20,10 +20,10 @@ #include <iostream> #include <queue> -#include "./qpid/concurrent/MonitorImpl.h" -#include "./qpid/broker/Queue.h" -#include "./qpid/broker/QueueRegistry.h" -#include "./qpid/concurrent/ThreadFactoryImpl.h" +#include "qpid/concurrent/MonitorImpl.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/QueueRegistry.h" +#include "qpid/concurrent/ThreadFactoryImpl.h" namespace qpid { namespace broker{ diff --git a/cpp/src/qpid/broker/Binding.h b/cpp/src/qpid/broker/Binding.h index 4202d390c3..0e8f9b5d6c 100644 --- a/cpp/src/qpid/broker/Binding.h +++ b/cpp/src/qpid/broker/Binding.h @@ -18,7 +18,7 @@ #ifndef _Binding_ #define _Binding_ -#include "./qpid/framing/FieldTable.h" +#include "qpid/framing/FieldTable.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index 27ce840d01..fe859b240b 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -17,13 +17,13 @@ */ #include <iostream> #include <memory> -#include "./qpid/broker/Broker.h" -#include "./qpid/io/Acceptor.h" -#include "./qpid/broker/Configuration.h" -#include "./qpid/QpidError.h" -#include "./qpid/broker/SessionHandlerFactoryImpl.h" -#include "./qpid/io/BlockingAPRAcceptor.h" -#include "./qpid/io/LFAcceptor.h" +#include "qpid/broker/Broker.h" +#include "qpid/io/Acceptor.h" +#include "qpid/broker/Configuration.h" +#include "qpid/QpidError.h" +#include "qpid/broker/SessionHandlerFactoryImpl.h" +#include "qpid/io/BlockingAPRAcceptor.h" +#include "qpid/io/LFAcceptor.h" using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h index 3423dc0910..40b171e838 100644 --- a/cpp/src/qpid/broker/Broker.h +++ b/cpp/src/qpid/broker/Broker.h @@ -19,10 +19,10 @@ * */ -#include "./qpid/io/Acceptor.h" -#include "./qpid/broker/Configuration.h" -#include "./qpid/concurrent/Runnable.h" -#include "./qpid/broker/SessionHandlerFactoryImpl.h" +#include "qpid/io/Acceptor.h" +#include "qpid/broker/Configuration.h" +#include "qpid/concurrent/Runnable.h" +#include "qpid/broker/SessionHandlerFactoryImpl.h" #include <boost/noncopyable.hpp> #include <tr1/memory> diff --git a/cpp/src/qpid/broker/Channel.cpp b/cpp/src/qpid/broker/Channel.cpp index 8d1cce9f1b..5497eda842 100644 --- a/cpp/src/qpid/broker/Channel.cpp +++ b/cpp/src/qpid/broker/Channel.cpp @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "./qpid/broker/Channel.h" -#include "./qpid/QpidError.h" +#include "qpid/broker/Channel.h" +#include "qpid/QpidError.h" #include <iostream> #include <sstream> #include <assert.h> diff --git a/cpp/src/qpid/broker/Channel.h b/cpp/src/qpid/broker/Channel.h index a20f4d9599..e742f45279 100644 --- a/cpp/src/qpid/broker/Channel.h +++ b/cpp/src/qpid/broker/Channel.h @@ -20,16 +20,16 @@ #include <algorithm> #include <map> -#include "./qpid/framing/AMQContentBody.h" -#include "./qpid/framing/AMQHeaderBody.h" +#include "qpid/framing/AMQContentBody.h" +#include "qpid/framing/AMQHeaderBody.h" #include "qpid/framing/BasicPublishBody.h" -#include "./qpid/broker/Binding.h" -#include "./qpid/broker/Consumer.h" -#include "./qpid/broker/Message.h" -#include "./qpid/concurrent/MonitorImpl.h" -#include "./qpid/broker/NameGenerator.h" -#include "./qpid/framing/OutputHandler.h" -#include "./qpid/broker/Queue.h" +#include "qpid/broker/Binding.h" +#include "qpid/broker/Consumer.h" +#include "qpid/broker/Message.h" +#include "qpid/concurrent/MonitorImpl.h" +#include "qpid/broker/NameGenerator.h" +#include "qpid/framing/OutputHandler.h" +#include "qpid/broker/Queue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/Configuration.cpp b/cpp/src/qpid/broker/Configuration.cpp index d4b27e4dd2..7aefe19b2b 100644 --- a/cpp/src/qpid/broker/Configuration.cpp +++ b/cpp/src/qpid/broker/Configuration.cpp @@ -15,7 +15,7 @@ * limitations under the License. * */ -#include "./qpid/broker/Configuration.h" +#include "qpid/broker/Configuration.h" #include <string.h> using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/Configuration.h b/cpp/src/qpid/broker/Configuration.h index 3785e1bac0..61ecc89ed9 100644 --- a/cpp/src/qpid/broker/Configuration.h +++ b/cpp/src/qpid/broker/Configuration.h @@ -21,7 +21,7 @@ #include <cstdlib> #include <iostream> #include <vector> -#include "./qpid/Exception.h" +#include "qpid/Exception.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/Consumer.h b/cpp/src/qpid/broker/Consumer.h index 7d346a4a0a..73b7ca9ed1 100644 --- a/cpp/src/qpid/broker/Consumer.h +++ b/cpp/src/qpid/broker/Consumer.h @@ -18,7 +18,7 @@ #ifndef _Consumer_ #define _Consumer_ -#include "./qpid/broker/Message.h" +#include "qpid/broker/Message.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/DirectExchange.cpp b/cpp/src/qpid/broker/DirectExchange.cpp index aa90d8dd81..63cfda8f51 100644 --- a/cpp/src/qpid/broker/DirectExchange.cpp +++ b/cpp/src/qpid/broker/DirectExchange.cpp @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "./qpid/broker/DirectExchange.h" -#include "./qpid/broker/ExchangeBinding.h" +#include "qpid/broker/DirectExchange.h" +#include "qpid/broker/ExchangeBinding.h" #include <iostream> using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/DirectExchange.h b/cpp/src/qpid/broker/DirectExchange.h index ce58a174c6..e998d3caa6 100644 --- a/cpp/src/qpid/broker/DirectExchange.h +++ b/cpp/src/qpid/broker/DirectExchange.h @@ -20,11 +20,11 @@ #include <map> #include <vector> -#include "./qpid/broker/Exchange.h" -#include "./qpid/framing/FieldTable.h" -#include "./qpid/broker/Message.h" -#include "./qpid/concurrent/MonitorImpl.h" -#include "./qpid/broker/Queue.h" +#include "qpid/broker/Exchange.h" +#include "qpid/framing/FieldTable.h" +#include "qpid/broker/Message.h" +#include "qpid/concurrent/MonitorImpl.h" +#include "qpid/broker/Queue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/Exchange.h b/cpp/src/qpid/broker/Exchange.h index 7b8bb1c034..f84f0d969e 100644 --- a/cpp/src/qpid/broker/Exchange.h +++ b/cpp/src/qpid/broker/Exchange.h @@ -18,9 +18,9 @@ #ifndef _Exchange_ #define _Exchange_ -#include "./qpid/framing/FieldTable.h" -#include "./qpid/broker/Message.h" -#include "./qpid/broker/Queue.h" +#include "qpid/framing/FieldTable.h" +#include "qpid/broker/Message.h" +#include "qpid/broker/Queue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/ExchangeBinding.cpp b/cpp/src/qpid/broker/ExchangeBinding.cpp index 61f44f634c..115bf4f9ec 100644 --- a/cpp/src/qpid/broker/ExchangeBinding.cpp +++ b/cpp/src/qpid/broker/ExchangeBinding.cpp @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "./qpid/broker/ExchangeBinding.h" -#include "./qpid/broker/Exchange.h" +#include "qpid/broker/ExchangeBinding.h" +#include "qpid/broker/Exchange.h" using namespace qpid::broker; using namespace qpid::framing; diff --git a/cpp/src/qpid/broker/ExchangeBinding.h b/cpp/src/qpid/broker/ExchangeBinding.h index fda5fab153..692aa8a57f 100644 --- a/cpp/src/qpid/broker/ExchangeBinding.h +++ b/cpp/src/qpid/broker/ExchangeBinding.h @@ -18,9 +18,9 @@ #ifndef _ExchangeBinding_ #define _ExchangeBinding_ -#include "./qpid/broker/Binding.h" -#include "./qpid/framing/FieldTable.h" -#include "./qpid/broker/Queue.h" +#include "qpid/broker/Binding.h" +#include "qpid/framing/FieldTable.h" +#include "qpid/broker/Queue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/ExchangeRegistry.cpp b/cpp/src/qpid/broker/ExchangeRegistry.cpp index 0755393e68..f69c258ac1 100644 --- a/cpp/src/qpid/broker/ExchangeRegistry.cpp +++ b/cpp/src/qpid/broker/ExchangeRegistry.cpp @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "./qpid/broker/ExchangeRegistry.h" -#include "./qpid/concurrent/MonitorImpl.h" +#include "qpid/broker/ExchangeRegistry.h" +#include "qpid/concurrent/MonitorImpl.h" using namespace qpid::broker; using namespace qpid::concurrent; diff --git a/cpp/src/qpid/broker/ExchangeRegistry.h b/cpp/src/qpid/broker/ExchangeRegistry.h index 7728ed0eff..335f1ad0ab 100644 --- a/cpp/src/qpid/broker/ExchangeRegistry.h +++ b/cpp/src/qpid/broker/ExchangeRegistry.h @@ -19,8 +19,8 @@ #define _ExchangeRegistry_ #include <map> -#include "./qpid/broker/Exchange.h" -#include "./qpid/concurrent/Monitor.h" +#include "qpid/broker/Exchange.h" +#include "qpid/concurrent/Monitor.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/FanOutExchange.cpp b/cpp/src/qpid/broker/FanOutExchange.cpp index 1b4e3643d0..0a184d5993 100644 --- a/cpp/src/qpid/broker/FanOutExchange.cpp +++ b/cpp/src/qpid/broker/FanOutExchange.cpp @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "./qpid/broker/FanOutExchange.h" -#include "./qpid/broker/ExchangeBinding.h" +#include "qpid/broker/FanOutExchange.h" +#include "qpid/broker/ExchangeBinding.h" #include <algorithm> using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/FanOutExchange.h b/cpp/src/qpid/broker/FanOutExchange.h index f79dd28ec5..b3255e3b0f 100644 --- a/cpp/src/qpid/broker/FanOutExchange.h +++ b/cpp/src/qpid/broker/FanOutExchange.h @@ -20,11 +20,11 @@ #include <map> #include <vector> -#include "./qpid/broker/Exchange.h" -#include "./qpid/framing/FieldTable.h" -#include "./qpid/broker/Message.h" -#include "./qpid/concurrent/MonitorImpl.h" -#include "./qpid/broker/Queue.h" +#include "qpid/broker/Exchange.h" +#include "qpid/framing/FieldTable.h" +#include "qpid/broker/Message.h" +#include "qpid/concurrent/MonitorImpl.h" +#include "qpid/broker/Queue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/HeadersExchange.cpp b/cpp/src/qpid/broker/HeadersExchange.cpp index 35feef22dd..12827da26b 100644 --- a/cpp/src/qpid/broker/HeadersExchange.cpp +++ b/cpp/src/qpid/broker/HeadersExchange.cpp @@ -15,10 +15,10 @@ * limitations under the License. * */ -#include "./qpid/broker/HeadersExchange.h" -#include "./qpid/broker/ExchangeBinding.h" -#include "./qpid/framing/Value.h" -#include "./qpid/QpidError.h" +#include "qpid/broker/HeadersExchange.h" +#include "qpid/broker/ExchangeBinding.h" +#include "qpid/framing/Value.h" +#include "qpid/QpidError.h" #include <algorithm> diff --git a/cpp/src/qpid/broker/HeadersExchange.h b/cpp/src/qpid/broker/HeadersExchange.h index a330e050f5..5c7525ee7c 100644 --- a/cpp/src/qpid/broker/HeadersExchange.h +++ b/cpp/src/qpid/broker/HeadersExchange.h @@ -19,11 +19,11 @@ #define _HeadersExchange_ #include <vector> -#include "./qpid/broker/Exchange.h" -#include "./qpid/framing/FieldTable.h" -#include "./qpid/broker/Message.h" -#include "./qpid/concurrent/MonitorImpl.h" -#include "./qpid/broker/Queue.h" +#include "qpid/broker/Exchange.h" +#include "qpid/framing/FieldTable.h" +#include "qpid/broker/Message.h" +#include "qpid/concurrent/MonitorImpl.h" +#include "qpid/broker/Queue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp index 7210ecc2f2..53cfe4ee43 100644 --- a/cpp/src/qpid/broker/Message.cpp +++ b/cpp/src/qpid/broker/Message.cpp @@ -15,9 +15,9 @@ * limitations under the License. * */ -#include "./qpid/concurrent/MonitorImpl.h" -#include "./qpid/broker/Message.h" -#include "./qpid/broker/ExchangeRegistry.h" +#include "qpid/concurrent/MonitorImpl.h" +#include "qpid/broker/Message.h" +#include "qpid/broker/ExchangeRegistry.h" #include <iostream> using namespace std::tr1;//for *_pointer_cast methods diff --git a/cpp/src/qpid/broker/Message.h b/cpp/src/qpid/broker/Message.h index 7ba8767baf..c4e52db333 100644 --- a/cpp/src/qpid/broker/Message.h +++ b/cpp/src/qpid/broker/Message.h @@ -18,13 +18,13 @@ #ifndef _Message_ #define _Message_ -#include "./memory.h" -#include "./qpid/framing/AMQContentBody.h" -#include "./qpid/framing/AMQHeaderBody.h" -#include "./qpid/framing/BasicHeaderProperties.h" -#include "./qpid/framing/BasicPublishBody.h" -#include "./qpid/broker/ConnectionToken.h" -#include "./qpid/framing/OutputHandler.h" +#include "memory.h" +#include "qpid/framing/AMQContentBody.h" +#include "qpid/framing/AMQHeaderBody.h" +#include "qpid/framing/BasicHeaderProperties.h" +#include "qpid/framing/BasicPublishBody.h" +#include "qpid/broker/ConnectionToken.h" +#include "qpid/framing/OutputHandler.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/NameGenerator.cpp b/cpp/src/qpid/broker/NameGenerator.cpp index d9b758c5a0..5f1b1431f3 100644 --- a/cpp/src/qpid/broker/NameGenerator.cpp +++ b/cpp/src/qpid/broker/NameGenerator.cpp @@ -15,7 +15,7 @@ * limitations under the License. * */ -#include "./qpid/broker/NameGenerator.h" +#include "qpid/broker/NameGenerator.h" #include <sstream> using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/NameGenerator.h b/cpp/src/qpid/broker/NameGenerator.h index 38f3c0a4c1..71643ef675 100644 --- a/cpp/src/qpid/broker/NameGenerator.h +++ b/cpp/src/qpid/broker/NameGenerator.h @@ -18,7 +18,7 @@ #ifndef _NameGenerator_ #define _NameGenerator_ -#include "./qpid/broker/Message.h" +#include "qpid/broker/Message.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp index d672074555..ee9bff4513 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/cpp/src/qpid/broker/Queue.cpp @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "./qpid/broker/Queue.h" -#include "./qpid/concurrent/MonitorImpl.h" +#include "qpid/broker/Queue.h" +#include "qpid/concurrent/MonitorImpl.h" #include <iostream> using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h index 6cf9088633..d3cd29989d 100644 --- a/cpp/src/qpid/broker/Queue.h +++ b/cpp/src/qpid/broker/Queue.h @@ -20,14 +20,14 @@ #include <vector> #include <queue> -#include "./memory.h" +#include "memory.h" #include "apr_time.h" -#include "./qpid/framing/amqp_types.h" -#include "./qpid/broker/Binding.h" -#include "./qpid/broker/ConnectionToken.h" -#include "./qpid/broker/Consumer.h" -#include "./qpid/broker/Message.h" -#include "./qpid/concurrent/MonitorImpl.h" +#include "qpid/framing/amqp_types.h" +#include "qpid/broker/Binding.h" +#include "qpid/broker/ConnectionToken.h" +#include "qpid/broker/Consumer.h" +#include "qpid/broker/Message.h" +#include "qpid/concurrent/MonitorImpl.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/QueueRegistry.cpp b/cpp/src/qpid/broker/QueueRegistry.cpp index f2cb46648e..1f7684e608 100644 --- a/cpp/src/qpid/broker/QueueRegistry.cpp +++ b/cpp/src/qpid/broker/QueueRegistry.cpp @@ -15,9 +15,9 @@ * limitations under the License. * */ -#include "./qpid/broker/QueueRegistry.h" -#include "./qpid/concurrent/MonitorImpl.h" -#include "./qpid/broker/SessionHandlerImpl.h" +#include "qpid/broker/QueueRegistry.h" +#include "qpid/concurrent/MonitorImpl.h" +#include "qpid/broker/SessionHandlerImpl.h" #include <sstream> #include <assert.h> diff --git a/cpp/src/qpid/broker/QueueRegistry.h b/cpp/src/qpid/broker/QueueRegistry.h index 9e6778153e..42d75fc3e0 100644 --- a/cpp/src/qpid/broker/QueueRegistry.h +++ b/cpp/src/qpid/broker/QueueRegistry.h @@ -19,8 +19,8 @@ #define _QueueRegistry_ #include <map> -#include "./qpid/concurrent/MonitorImpl.h" -#include "./qpid/broker/Queue.h" +#include "qpid/concurrent/MonitorImpl.h" +#include "qpid/broker/Queue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/Router.cpp b/cpp/src/qpid/broker/Router.cpp index 6a81816aea..d5853473af 100644 --- a/cpp/src/qpid/broker/Router.cpp +++ b/cpp/src/qpid/broker/Router.cpp @@ -15,7 +15,7 @@ * limitations under the License. * */ -#include "./qpid/broker/Router.h" +#include "qpid/broker/Router.h" using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/Router.h b/cpp/src/qpid/broker/Router.h index 23739e6527..3b4a3a0a4c 100644 --- a/cpp/src/qpid/broker/Router.h +++ b/cpp/src/qpid/broker/Router.h @@ -18,8 +18,8 @@ #ifndef _Router_ #define _Router_ -#include "./qpid/broker/ExchangeRegistry.h" -#include "./qpid/broker/Message.h" +#include "qpid/broker/ExchangeRegistry.h" +#include "qpid/broker/Message.h" /** * A routing functor diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp index 8afff976e1..60ee9cc4ad 100644 --- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp +++ b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp @@ -15,10 +15,10 @@ * limitations under the License. * */ -#include "./qpid/broker/SessionHandlerFactoryImpl.h" -#include "./qpid/broker/SessionHandlerImpl.h" -#include "./qpid/broker/FanOutExchange.h" -#include "./qpid/broker/HeadersExchange.h" +#include "qpid/broker/SessionHandlerFactoryImpl.h" +#include "qpid/broker/SessionHandlerImpl.h" +#include "qpid/broker/FanOutExchange.h" +#include "qpid/broker/HeadersExchange.h" using namespace qpid::broker; using namespace qpid::io; diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h index 2875cf63e6..25b4c0c13a 100644 --- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h +++ b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h @@ -18,14 +18,14 @@ #ifndef _SessionHandlerFactoryImpl_ #define _SessionHandlerFactoryImpl_ -#include "./qpid/framing/AMQFrame.h" -#include "./qpid/broker/AutoDelete.h" -#include "./qpid/broker/DirectExchange.h" -#include "./qpid/broker/ExchangeRegistry.h" -#include "./qpid/framing/ProtocolInitiation.h" -#include "./qpid/broker/QueueRegistry.h" -#include "./qpid/io/SessionHandlerFactory.h" -#include "./qpid/io/TimeoutHandler.h" +#include "qpid/framing/AMQFrame.h" +#include "qpid/broker/AutoDelete.h" +#include "qpid/broker/DirectExchange.h" +#include "qpid/broker/ExchangeRegistry.h" +#include "qpid/framing/ProtocolInitiation.h" +#include "qpid/broker/QueueRegistry.h" +#include "qpid/io/SessionHandlerFactory.h" +#include "qpid/io/TimeoutHandler.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/SessionHandlerImpl.cpp b/cpp/src/qpid/broker/SessionHandlerImpl.cpp index 49d43d8f8b..157fca5acb 100644 --- a/cpp/src/qpid/broker/SessionHandlerImpl.cpp +++ b/cpp/src/qpid/broker/SessionHandlerImpl.cpp @@ -16,11 +16,11 @@ * */ #include <iostream> -#include "./qpid/broker/SessionHandlerImpl.h" -#include "./qpid/broker/FanOutExchange.h" -#include "./qpid/broker/HeadersExchange.h" -#include "./qpid/broker/Router.h" -#include "./qpid/broker/TopicExchange.h" +#include "qpid/broker/SessionHandlerImpl.h" +#include "qpid/broker/FanOutExchange.h" +#include "qpid/broker/HeadersExchange.h" +#include "qpid/broker/Router.h" +#include "qpid/broker/TopicExchange.h" #include "assert.h" using namespace std::tr1; diff --git a/cpp/src/qpid/broker/SessionHandlerImpl.h b/cpp/src/qpid/broker/SessionHandlerImpl.h index 09a4a67e66..4504541623 100644 --- a/cpp/src/qpid/broker/SessionHandlerImpl.h +++ b/cpp/src/qpid/broker/SessionHandlerImpl.h @@ -22,21 +22,21 @@ #include <sstream> #include <vector> #include <exception> -#include "./qpid/framing/AMQFrame.h" +#include "qpid/framing/AMQFrame.h" #include "qpid/framing/AMQP_ClientProxy.h" #include "qpid/framing/AMQP_ServerOperations.h" -#include "./qpid/broker/AutoDelete.h" -#include "./qpid/broker/ExchangeRegistry.h" -#include "./qpid/broker/Channel.h" -#include "./qpid/broker/ConnectionToken.h" -#include "./qpid/broker/DirectExchange.h" -#include "./qpid/framing/OutputHandler.h" -#include "./qpid/framing/ProtocolInitiation.h" -#include "./qpid/broker/QueueRegistry.h" -#include "./qpid/io/SessionContext.h" -#include "./qpid/io/SessionHandler.h" -#include "./qpid/io/TimeoutHandler.h" -#include "./qpid/broker/TopicExchange.h" +#include "qpid/broker/AutoDelete.h" +#include "qpid/broker/ExchangeRegistry.h" +#include "qpid/broker/Channel.h" +#include "qpid/broker/ConnectionToken.h" +#include "qpid/broker/DirectExchange.h" +#include "qpid/framing/OutputHandler.h" +#include "qpid/framing/ProtocolInitiation.h" +#include "qpid/broker/QueueRegistry.h" +#include "qpid/io/SessionContext.h" +#include "qpid/io/SessionHandler.h" +#include "qpid/io/TimeoutHandler.h" +#include "qpid/broker/TopicExchange.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/TopicExchange.cpp b/cpp/src/qpid/broker/TopicExchange.cpp index 2affa6057d..6498e7600d 100644 --- a/cpp/src/qpid/broker/TopicExchange.cpp +++ b/cpp/src/qpid/broker/TopicExchange.cpp @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "./qpid/broker/TopicExchange.h" -#include "./qpid/broker/ExchangeBinding.h" +#include "qpid/broker/TopicExchange.h" +#include "qpid/broker/ExchangeBinding.h" #include <algorithm> using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/TopicExchange.h b/cpp/src/qpid/broker/TopicExchange.h index 8bad7aab4c..29772f5bce 100644 --- a/cpp/src/qpid/broker/TopicExchange.h +++ b/cpp/src/qpid/broker/TopicExchange.h @@ -20,11 +20,11 @@ #include <tr1/unordered_map> #include <vector> -#include "./qpid/broker/Exchange.h" -#include "./qpid/framing/FieldTable.h" -#include "./qpid/broker/Message.h" -#include "./qpid/concurrent/MonitorImpl.h" -#include "./qpid/broker/Queue.h" +#include "qpid/broker/Exchange.h" +#include "qpid/framing/FieldTable.h" +#include "qpid/broker/Message.h" +#include "qpid/concurrent/MonitorImpl.h" +#include "qpid/broker/Queue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/framing/AMQBody.h b/cpp/src/qpid/framing/AMQBody.h index 1c7f9419ed..e9d77225fa 100644 --- a/cpp/src/qpid/framing/AMQBody.h +++ b/cpp/src/qpid/framing/AMQBody.h @@ -15,7 +15,7 @@ * limitations under the License. * */ -#include "./memory.h" +#include "memory.h" #include "qpid/framing/amqp_types.h" #include "qpid/framing/Buffer.h" diff --git a/cpp/src/qpid/framing/BodyHandler.cpp b/cpp/src/qpid/framing/BodyHandler.cpp index f9079c27ea..ddf80b276d 100644 --- a/cpp/src/qpid/framing/BodyHandler.cpp +++ b/cpp/src/qpid/framing/BodyHandler.cpp @@ -15,7 +15,7 @@ * limitations under the License. * */ -#include "./memory.h" +#include "memory.h" #include "qpid/framing/BodyHandler.h" using namespace qpid::framing; diff --git a/cpp/test/unit/qpid/broker/ChannelTest.cpp b/cpp/test/unit/qpid/broker/ChannelTest.cpp index 8d54208f77..2197c1724a 100644 --- a/cpp/test/unit/qpid/broker/ChannelTest.cpp +++ b/cpp/test/unit/qpid/broker/ChannelTest.cpp @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "../../src/qpid/broker/Channel.h" -#include "../../src/qpid/broker/Message.h" +#include "qpid/broker/Channel.h" +#include "qpid/broker/Message.h" #include <qpid_test_plugin.h> #include <iostream> #include <memory> diff --git a/cpp/test/unit/qpid/broker/ExchangeTest.cpp b/cpp/test/unit/qpid/broker/ExchangeTest.cpp index 3d21cb66f0..adebc87422 100644 --- a/cpp/test/unit/qpid/broker/ExchangeTest.cpp +++ b/cpp/test/unit/qpid/broker/ExchangeTest.cpp @@ -16,10 +16,10 @@ * */ -#include "../../src/qpid/broker/DirectExchange.h" -#include "../../src/qpid/broker/Exchange.h" -#include "../../src/qpid/broker/Queue.h" -#include "../../src/qpid/broker/TopicExchange.h" +#include "qpid/broker/DirectExchange.h" +#include "qpid/broker/Exchange.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/TopicExchange.h" #include <qpid_test_plugin.h> #include <iostream> diff --git a/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp b/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp index d8fe71350e..a57c1d8800 100644 --- a/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp +++ b/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp @@ -16,9 +16,9 @@ * */ -#include "../../src/qpid/broker/HeadersExchange.h" -#include "../../src/qpid/framing/FieldTable.h" -#include "../../src/qpid/framing/Value.h" +#include "qpid/broker/HeadersExchange.h" +#include "qpid/framing/FieldTable.h" +#include "qpid/framing/Value.h" #include <qpid_test_plugin.h> using namespace qpid::broker; diff --git a/cpp/test/unit/qpid/broker/MessageTest.cpp b/cpp/test/unit/qpid/broker/MessageTest.cpp index f6586f721a..210cd63934 100644 --- a/cpp/test/unit/qpid/broker/MessageTest.cpp +++ b/cpp/test/unit/qpid/broker/MessageTest.cpp @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "../../src/qpid/concurrent/APRBase.h" -#include "../../src/qpid/broker/Message.h" +#include "qpid/concurrent/APRBase.h" +#include "qpid/broker/Message.h" #include <qpid_test_plugin.h> #include <iostream> diff --git a/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp b/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp index 96fbc88069..59034fb7c8 100644 --- a/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp +++ b/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp @@ -1,4 +1,4 @@ -#include "../../src/qpid/broker/QueueRegistry.h" +#include "qpid/broker/QueueRegistry.h" #include <qpid_test_plugin.h> #include <string> diff --git a/cpp/test/unit/qpid/broker/QueueTest.cpp b/cpp/test/unit/qpid/broker/QueueTest.cpp index fa6344c265..5b06cb93ca 100644 --- a/cpp/test/unit/qpid/broker/QueueTest.cpp +++ b/cpp/test/unit/qpid/broker/QueueTest.cpp @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "../../src/qpid/broker/Queue.h" -#include "../../src/qpid/broker/QueueRegistry.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/QueueRegistry.h" #include <qpid_test_plugin.h> #include <iostream> diff --git a/cpp/test/unit/qpid/broker/RouterTest.cpp b/cpp/test/unit/qpid/broker/RouterTest.cpp index 7b77162905..f2c9f27abd 100644 --- a/cpp/test/unit/qpid/broker/RouterTest.cpp +++ b/cpp/test/unit/qpid/broker/RouterTest.cpp @@ -15,11 +15,11 @@ * limitations under the License. * */ -#include "../../src/qpid/broker/Channel.h" -#include "../../src/qpid/broker/Exchange.h" -#include "../../src/qpid/broker/ExchangeRegistry.h" -#include "../../src/qpid/broker/Message.h" -#include "../../src/qpid/broker/Router.h" +#include "qpid/broker/Channel.h" +#include "qpid/broker/Exchange.h" +#include "qpid/broker/ExchangeRegistry.h" +#include "qpid/broker/Message.h" +#include "qpid/broker/Router.h" #include <qpid_test_plugin.h> #include <iostream> #include <memory> diff --git a/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp b/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp index 4066a4709f..8d7903c4ac 100644 --- a/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp +++ b/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp @@ -1,4 +1,4 @@ -#include "../../src/qpid/broker/TopicExchange.h" +#include "qpid/broker/TopicExchange.h" #include <qpid_test_plugin.h> using namespace qpid::broker; diff --git a/cpp/test/unit/qpid/broker/ValueTest.cpp b/cpp/test/unit/qpid/broker/ValueTest.cpp index 89444c38cf..2cb2563b46 100644 --- a/cpp/test/unit/qpid/broker/ValueTest.cpp +++ b/cpp/test/unit/qpid/broker/ValueTest.cpp @@ -1,4 +1,4 @@ -#include "../../src/qpid/framing/Value.h" +#include "qpid/framing/Value.h" #include <qpid_test_plugin.h> using namespace qpid::framing; diff --git a/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp b/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp index 6b011743c0..d6edf37d51 100644 --- a/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp +++ b/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp @@ -16,7 +16,7 @@ * */ #include <iostream> -#include "../../src/qpid/framing/amqp_framing.h" +#include "qpid/framing/amqp_framing.h" #include "qpid_test_plugin.h" using namespace qpid::framing; diff --git a/cpp/test/unit/qpid/framing/field_table_test.cpp b/cpp/test/unit/qpid/framing/FieldTableTest.cpp index 8f2fe61611..b11addfd0e 100644 --- a/cpp/test/unit/qpid/framing/field_table_test.cpp +++ b/cpp/test/unit/qpid/framing/FieldTableTest.cpp @@ -16,7 +16,7 @@ * */ #include <iostream> -#include "../../src/qpid/framing/amqp_framing.h" +#include "qpid/framing/amqp_framing.h" #include <qpid_test_plugin.h> using namespace qpid::framing; diff --git a/cpp/test/unit/qpid/framing/framing_test.cpp b/cpp/test/unit/qpid/framing/FramingTest.cpp index 40ce3d97ed..950d1e045a 100644 --- a/cpp/test/unit/qpid/framing/framing_test.cpp +++ b/cpp/test/unit/qpid/framing/FramingTest.cpp @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "../../src/qpid/framing/amqp_framing.h" -#include "ConnectionRedirectBody.h" +#include "qpid/framing/amqp_framing.h" +#include "qpid/framing/ConnectionRedirectBody.h" #include <iostream> #include <sstream> #include <qpid_test_plugin.h> diff --git a/cpp/test/unit/qpid/framing/header_test.cpp b/cpp/test/unit/qpid/framing/HeaderTest.cpp index 9268c54272..cf0d9fe5bd 100644 --- a/cpp/test/unit/qpid/framing/header_test.cpp +++ b/cpp/test/unit/qpid/framing/HeaderTest.cpp @@ -16,7 +16,7 @@ * */ #include <iostream> -#include "../../src/qpid/framing/amqp_framing.h" +#include "qpid/framing/amqp_framing.h" #include <qpid_test_plugin.h> using namespace qpid::framing; |