You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2014/09/04 22:16:29 UTC

svn commit: r1622553 - in /qpid/branches/0.30/qpid/cpp/src: qpid/broker/Message.h tests/BrokerFixture.h

Author: astitcher
Date: Thu Sep  4 20:16:29 2014
New Revision: 1622553

URL: http://svn.apache.org/r1622553
Log:
QPID-6069: FreeBSD compilation problems
[merged from trunk r1622369, r1622397]

Modified:
    qpid/branches/0.30/qpid/cpp/src/qpid/broker/Message.h
    qpid/branches/0.30/qpid/cpp/src/tests/BrokerFixture.h

Modified: qpid/branches/0.30/qpid/cpp/src/qpid/broker/Message.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/cpp/src/qpid/broker/Message.h?rev=1622553&r1=1622552&r2=1622553&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/cpp/src/qpid/broker/Message.h (original)
+++ qpid/branches/0.30/qpid/cpp/src/qpid/broker/Message.h Thu Sep  4 20:16:29 2014
@@ -201,7 +201,7 @@ public:
         }
         operator bool() const
         {
-            return value;
+            return !!value;
         }
     };
 

Modified: qpid/branches/0.30/qpid/cpp/src/tests/BrokerFixture.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/cpp/src/tests/BrokerFixture.h?rev=1622553&r1=1622552&r2=1622553&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/cpp/src/tests/BrokerFixture.h (original)
+++ qpid/branches/0.30/qpid/cpp/src/tests/BrokerFixture.h Thu Sep  4 20:16:29 2014
@@ -102,8 +102,8 @@ struct  BrokerFixture : private boost::n
 
         // 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);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org