diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2014-09-04 20:16:29 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2014-09-04 20:16:29 +0000 |
| commit | aa9a8e6e242054d4a835bde7f6e2a286397ec390 (patch) | |
| tree | fcd9a3d29763fa561d92a3c7add06a5fe21d6574 | |
| parent | e514c426b243b53ede124fbe0ee8077be26f3b5b (diff) | |
| download | qpid-python-aa9a8e6e242054d4a835bde7f6e2a286397ec390.tar.gz | |
QPID-6069: FreeBSD compilation problems
[merged from trunk r1622369, r1622397]
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1622553 13f79535-47bb-0310-9956-ffa450edef68
| -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 4d42b173c0..bd4bb6784b 100644 --- a/qpid/cpp/src/qpid/broker/Message.h +++ b/qpid/cpp/src/qpid/broker/Message.h @@ -201,7 +201,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..c455dd10fc 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[i] = args[i].c_str(); Plugin::addOptions(opts); opts.parse(argv.size(), &argv[0]); broker = Broker::create(opts); |