Author: kpvdr
Date: Fri Jun 5 15:38:09 2009
New Revision: 782051
URL: http://svn.apache.org/viewvc?rev=782051&view=rev
Log:
Patch from Michael Goulish - QPID-1891 "fix declaration problems with boost
1_33_1", but with minor additional fixes.
Modified:
qpid/trunk/qpid/cpp/src/tests/ForkedBroker.cpp
qpid/trunk/qpid/cpp/src/tests/test_store.cpp
Modified: qpid/trunk/qpid/cpp/src/tests/ForkedBroker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ForkedBroker.cpp?rev=782051&r1=782050&r2=782051&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ForkedBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ForkedBroker.cpp Fri Jun 5 15:38:09 2009
@@ -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 @@
}
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)))
+ );
}
}
Modified: qpid/trunk/qpid/cpp/src/tests/test_store.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/test_store.cpp?rev=782051&r1=782050&r2=782051&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/test_store.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/test_store.cpp Fri Jun 5 15:38:09 2009
@@ -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 @@
// 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 @@
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)));
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
