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

1 files changed, 5 insertions, 2 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)))
+          );
 }
 
 }