diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2014-09-03 21:59:32 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2014-09-03 21:59:32 +0000 |
| commit | b484a1ffbfe68883c8a5ca232322b9616ecf151c (patch) | |
| tree | 04d33c45c4f078f1fe08974fdec28f8b6126da11 /qpid/cpp/src | |
| parent | 898e47ee24f362228807f4f2ab4fbb9dde888bca (diff) | |
| download | qpid-python-b484a1ffbfe68883c8a5ca232322b9616ecf151c.tar.gz | |
QPID-6069: FreeBSD compilation problems
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1622369 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Message.h | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/BrokerFixture.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/broker/Message.h b/qpid/cpp/src/qpid/broker/Message.h index fe0427abd3..9843bc6220 100644 --- a/qpid/cpp/src/qpid/broker/Message.h +++ b/qpid/cpp/src/qpid/broker/Message.h @@ -202,7 +202,7 @@ public: } operator bool() const { - return value; + return !!value; } }; diff --git a/qpid/cpp/src/tests/BrokerFixture.h b/qpid/cpp/src/tests/BrokerFixture.h index 9cf325587a..7ea94cdf6b 100644 --- a/qpid/cpp/src/tests/BrokerFixture.h +++ b/qpid/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); |