From b449826a61eaa0a754e55ca8143882216a07d7e0 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 25 Mar 2008 13:34:44 +0000 Subject: =?UTF-8?q?Fix=20compile=20errors/warnings=20with=20gcc=204.3=20?= =?UTF-8?q?=20-=20added=20missing=20#includes=20that=20were=20implicitly?= =?UTF-8?q?=20included=20via=20old=20headers.=20=20-=20add=20namespace-qua?= =?UTF-8?q?lifiers=20to=20fix=20"changes=20meaning=20of=20name"=20warnings?= =?UTF-8?q?.=20=20-=20./qpid/ptr=5Fmap.h:51:=20fixed=20"qualified=20return?= =?UTF-8?q?=20value"=20warning.=20=20-=20use=20const=20char*=20for=20"conv?= =?UTF-8?q?ersion=20from=20string=20constant=20to=20=E2=80=98char*?= =?UTF-8?q?=E2=80=99"=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Applied patch from https://issues.apache.org/jira/browse/QPID-869 remove depenency on boost/date_time, causes warnings with gcc 4.3. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@640806 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/TopicExchangeTest.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'cpp/src/tests/TopicExchangeTest.cpp') diff --git a/cpp/src/tests/TopicExchangeTest.cpp b/cpp/src/tests/TopicExchangeTest.cpp index 9e320b76f9..adb937179f 100644 --- a/cpp/src/tests/TopicExchangeTest.cpp +++ b/cpp/src/tests/TopicExchangeTest.cpp @@ -21,7 +21,7 @@ using namespace qpid::broker; -Tokens makeTokens(char** begin, char** end) +Tokens makeTokens(const char** begin, const char** end) { Tokens t; t.insert(t.end(), begin, end); @@ -57,34 +57,34 @@ class TokensTest : public CppUnit::TestCase void testTokens() { Tokens tokens("hello.world"); - char* expect[] = {"hello", "world"}; + const char* expect[] = {"hello", "world"}; CPPUNIT_ASSERT_EQUAL(TOKENS(expect), tokens); tokens = "a.b.c"; - char* expect2[] = { "a", "b", "c" }; + const char* expect2[] = { "a", "b", "c" }; CPPUNIT_ASSERT_EQUAL(TOKENS(expect2), tokens); tokens = ""; CPPUNIT_ASSERT(tokens.empty()); tokens = "x"; - char* expect3[] = { "x" }; + const char* expect3[] = { "x" }; CPPUNIT_ASSERT_EQUAL(TOKENS(expect3), tokens); tokens = (".x"); - char* expect4[] = { "", "x" }; + const char* expect4[] = { "", "x" }; CPPUNIT_ASSERT_EQUAL(TOKENS(expect4), tokens); tokens = ("x."); - char* expect5[] = { "x", "" }; + const char* expect5[] = { "x", "" }; CPPUNIT_ASSERT_EQUAL(TOKENS(expect5), tokens); tokens = ("."); - char* expect6[] = { "", "" }; + const char* expect6[] = { "", "" }; CPPUNIT_ASSERT_EQUAL(TOKENS(expect6), tokens); tokens = (".."); - char* expect7[] = { "", "", "" }; + const char* expect7[] = { "", "", "" }; CPPUNIT_ASSERT_EQUAL(TOKENS(expect7), tokens); } -- cgit v1.2.1