summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2014-09-03 21:59:32 +0000
committerAndrew Stitcher <astitcher@apache.org>2014-09-03 21:59:32 +0000
commit38396e36d7ac707f2c5e1eca4cea288be97d6482 (patch)
tree6f5fe62653e4efa374c0860f611053f6953be30f
parent2a86248aa15ce17c3d5b1b5746c94ea3729a1e59 (diff)
downloadqpid-python-38396e36d7ac707f2c5e1eca4cea288be97d6482.tar.gz
QPID-6069: FreeBSD compilation problems
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1622369 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--cpp/src/qpid/broker/Message.h2
-rw-r--r--cpp/src/tests/BrokerFixture.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/Message.h b/cpp/src/qpid/broker/Message.h
index fe0427abd3..9843bc6220 100644
--- a/cpp/src/qpid/broker/Message.h
+++ b/cpp/src/qpid/broker/Message.h
@@ -202,7 +202,7 @@ public:
}
operator bool() const
{
- return value;
+ return !!value;
}
};
diff --git a/cpp/src/tests/BrokerFixture.h b/cpp/src/tests/BrokerFixture.h
index 9cf325587a..7ea94cdf6b 100644
--- a/cpp/src/tests/BrokerFixture.h
+++ b/cpp/src/tests/BrokerFixture.h
@@ -102,8 +102,8 @@ struct BrokerFixture : private boost::noncopyable {
// Argument parsing
std::vector<const char*> argv(args.size());
- std::transform(args.begin(), args.end(), argv.begin(),
- boost::bind(&std::string::c_str, _1));
+ for (size_t i = 0; i<args.size(); ++i)
+ argv.push_back(args[i].c_str());
Plugin::addOptions(opts);
opts.parse(argv.size(), &argv[0]);
broker = Broker::create(opts);