Patch from Michael Goulish - QPID-1891 "fix declaration problems with boost 1_33_1", but with minor additional fixes.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@782051 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 7 insertions, 5 deletions

diff --git a/cpp/src/tests/ForkedBroker.cpp b/cpp/src/tests/ForkedBroker.cpp
index 12175d3287..27480bad6f 100644
--- a/cpp/src/tests/ForkedBroker.cpp
+++ b/cpp/src/tests/ForkedBroker.cpp
@@ -22,7 +22,6 @@
 #include "ForkedBroker.h"
 #include "qpid/log/Statement.h"
 #include <boost/bind.hpp>
-#include <boost/algorithm/string.hpp>
 #include <algorithm>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -76,7 +75,11 @@ static ostream& operator<<(ostream& o, const ForkedBroker::Args& a) {
 }
 
 bool isLogOption(const std::string& s) {
-    return boost::starts_with(s, "--log-enable") || boost::starts_with(s, "--trace");
+    const char * log_enable = "--log-enable",
+               * trace      = "--trace";
+    return( (! strncmp(s.c_str(), log_enable, strlen(log_enable))) ||
+            (! strncmp(s.c_str(), trace,      strlen(trace)))
+          );
 }
 
 }
diff --git a/cpp/src/tests/test_store.cpp b/cpp/src/tests/test_store.cpp
index e5c3522852..90503818ed 100644
--- a/cpp/src/tests/test_store.cpp
+++ b/cpp/src/tests/test_store.cpp
@@ -37,7 +37,6 @@
 #include "qpid/log/Statement.h"
 #include "qpid/Plugin.h"
 #include "qpid/Options.h"
-#include <boost/algorithm/string.hpp>
 #include <boost/cast.hpp>
 #include <boost/lexical_cast.hpp>
 
@@ -85,7 +84,7 @@ class TestStore : public NullMessageStore {
         // Check the message for special instructions.
         size_t i = string::npos;
         size_t j = string::npos; 
-        if (starts_with(data, TEST_STORE_DO)
+        if (strncmp(data.c_str(), TEST_STORE_DO.c_str(), strlen(TEST_STORE_DO.c_str())) == 0
             && (i = data.find(name+"[")) != string::npos
             && (j = data.find("]", i)) != string::npos)
         {
@@ -102,7 +101,7 @@ class TestStore : public NullMessageStore {
                 QPID_LOG(critical, "TestStore " << name << " forcing process exit for: " << data);
                 exit(0);
             }
-            else if (starts_with(action, ASYNC)) {
+            else if (strncmp(action.c_str(), ASYNC.c_str(), strlen(ASYNC.c_str())) == 0) {
                 std::string delayStr(action.substr(ASYNC.size()));
                 int delay = lexical_cast<int>(delayStr);
                 threads.push_back(Thread(*new Completer(msg, delay)));