diff options
| author | Alan Conway <aconway@apache.org> | 2006-11-03 21:06:51 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-11-03 21:06:51 +0000 |
| commit | d817d3a1228da29ef39d177235c2878c282e0d27 (patch) | |
| tree | 55a433c1e5e5091b6aafa6d1834d526f6fe59a8b | |
| parent | bb808591a6a7c2993949f2ed6e153d0ac08c5b88 (diff) | |
| download | qpid-python-d817d3a1228da29ef39d177235c2878c282e0d27.tar.gz | |
2006-11-03 Jim Meyering <meyering@redhat.com>
* qpid/cpp/Makefile ($(TESTDIR)/%Test.so): Depend on
$(LIB_common) and $(LIB_client), just as is done for the
$(TESTDIR)/% rule.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@470994 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src_apr/qpid/io/APRPool.cpp | 2 | ||||
| -rw-r--r-- | cpp/src_apr/qpid/io/Acceptor.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/cpp/Makefile b/cpp/Makefile index b3cd65f6d7..95d9af73f4 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -100,7 +100,7 @@ endef $(foreach dir,$(SRCDIRS),$(eval $(call CPPRULE,$(dir)))) # Unit test plugin libraries. -$(TESTDIR)/%Test.so: test/unit/%Test.cpp +$(TESTDIR)/%Test.so: test/unit/%Test.cpp $(LIB_common) $(LIB_client) mkdir -p $(dir $@) $(CXX) -shared -o $@ $< $(CXXFLAGS) -Itest/include $(LDFLAGS) -lcppunit $(LIB_common) $(LIB_broker) diff --git a/cpp/src_apr/qpid/io/APRPool.cpp b/cpp/src_apr/qpid/io/APRPool.cpp index edd434f16c..7105f77dd3 100644 --- a/cpp/src_apr/qpid/io/APRPool.cpp +++ b/cpp/src_apr/qpid/io/APRPool.cpp @@ -18,7 +18,7 @@ #include "APRPool.h" #include "qpid/concurrent/APRBase.h" -#include <boost/pool/singleton_pool.hpp> +#include <boost/pool/detail/singleton.hpp> using namespace qpid::io; using namespace qpid::concurrent; diff --git a/cpp/src_apr/qpid/io/Acceptor.h b/cpp/src_apr/qpid/io/Acceptor.h index 384fb9beaf..3c980f7f7f 100644 --- a/cpp/src_apr/qpid/io/Acceptor.h +++ b/cpp/src_apr/qpid/io/Acceptor.h @@ -24,7 +24,6 @@ #include "qpid/io/Acceptor.h" #include "qpid/concurrent/Monitor.h" -#include "qpid/concurrent/ThreadFactory.h" #include "qpid/io/LFProcessor.h" #include "qpid/io/LFSessionContext.h" #include "qpid/concurrent/Runnable.h" |