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);