Hello community, here is the log from the commit of package qpid-cpp for openSUSE:Factory checked in at 2016-07-14 09:48:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qpid-cpp (Old) and /work/SRC/openSUSE:Factory/.qpid-cpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qpid-cpp" Changes: -------- --- /work/SRC/openSUSE:Factory/qpid-cpp/qpid-cpp.changes 2016-06-19 10:50:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qpid-cpp.new/qpid-cpp.changes 2016-07-14 09:48:59.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Jul 11 12:26:56 UTC 2016 - i...@marguerite.su + +- refreshed patch: qpid-cpp-0.34-gcc6.patch + * use upstream fix: https://issues.apache.org/jira/browse/QPID-7146 + because removal of -Werror may have side effects. + * this patch contains several upstream commits including: + + Fix function binding error + + Remove (via preprocessor) unused code + + Fix indentation error picked up by compiler + + Renamed bind to avoid clash with (new for C++11/14) std::bind - + The compiler was finding std::bind in preference due to argument + dependent lookup + + Don't warn for using deprecated declarations (auto_ptr is now + deprecated) + * should be dropped next release + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ qpid-cpp.spec: same change ++++++ qpid-cpp-0.34-gcc6.patch ++++++ --- /var/tmp/diff_new_pack.snRejM/_old 2016-07-14 09:49:00.000000000 +0200 +++ /var/tmp/diff_new_pack.snRejM/_new 2016-07-14 09:49:00.000000000 +0200 @@ -1,11 +1,208 @@ ---- qpid-cpp-0.34/CMakeLists.txt 2015-02-27 00:06:31.000000000 +0100 -+++ qpid-cpp-0.34/CMakeLists.txt 2016-06-17 17:38:34.756625133 +0200 -@@ -144,7 +144,7 @@ +Index: b/CMakeLists.txt +=================================================================== +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -144,7 +144,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU) # -Wunreachable-code -Wpadded -Winline # -Wshadow - warns about boost headers. set (WARNING_FLAGS - "-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual") -+ "-pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual") ++ "-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual -Wno-error=deprecated-declarations") set (CATCH_UNDEFINED "-Wl,--no-undefined") # gcc on SunOS uses native linker whose "-z defs" is too fussy +Index: b/src/qpid/broker/DtxManager.cpp +=================================================================== +--- a/src/qpid/broker/DtxManager.cpp ++++ b/src/qpid/broker/DtxManager.cpp +@@ -38,6 +38,7 @@ using qpid::ptr_map_ptr; + using namespace qpid::broker; + using namespace qpid::framing; + ++#if DEFINE_UNUSED + namespace { + typedef boost::function0<void> FireFunction; + struct DtxCleanup : public qpid::sys::TimerTask +@@ -61,7 +62,7 @@ namespace { + } + + } +- ++#endif + DtxManager::DtxManager(qpid::sys::Timer& t, uint32_t _dtxDefaultTimeout) : + store(0), + timer(&t), +Index: b/src/qpid/broker/SessionManager.cpp +=================================================================== +--- a/src/qpid/broker/SessionManager.cpp ++++ b/src/qpid/broker/SessionManager.cpp +@@ -69,12 +69,13 @@ void SessionManager::detach(std::auto_p + attached.erase(session->getId()); + session->detach(); + if (session->getTimeout() > 0) { +- session->expiry = AbsTime(now(), session->getTimeout()*TIME_SEC); +- if (session->mgmtObject != 0) +- session->mgmtObject->set_expireTime (Duration::FromEpoch()+session->getTimeout()*TIME_SEC); ++ session->expiry = AbsTime(now(), session->getTimeout()*TIME_SEC); ++ if (session->mgmtObject != 0) { ++ session->mgmtObject->set_expireTime (Duration::FromEpoch()+session->getTimeout()*TIME_SEC); ++ } + detached.push_back(session.release()); // In expiry order +- eraseExpired(); +-} ++ eraseExpired(); ++ } + } + + void SessionManager::forget(const SessionId& id) { +Index: b/src/qpid/messaging/amqp/AddressHelper.cpp +=================================================================== +--- a/src/qpid/messaging/amqp/AddressHelper.cpp ++++ b/src/qpid/messaging/amqp/AddressHelper.cpp +@@ -159,7 +159,7 @@ template <typename T> T get(const Varian + } + } + +-bool bind(const Variant::Map& options, const std::string& name, std::string& variable) ++bool getOption(const Variant::Map& options, const std::string& name, std::string& variable) + { + Variant::Map::const_iterator j = options.find(name); + if (j == options.end()) { +@@ -170,7 +170,7 @@ bool bind(const Variant::Map& options, c + } + } + +-bool bind(const Variant::Map& options, const std::string& name, Variant::Map& variable) ++bool getOption(const Variant::Map& options, const std::string& name, Variant::Map& variable) + { + Variant::Map::const_iterator j = options.find(name); + if (j == options.end()) { +@@ -181,7 +181,7 @@ bool bind(const Variant::Map& options, c + } + } + +-bool bind(const Variant::Map& options, const std::string& name, Variant::List& variable) ++bool getOption(const Variant::Map& options, const std::string& name, Variant::List& variable) + { + Variant::Map::const_iterator j = options.find(name); + if (j == options.end()) { +@@ -192,12 +192,12 @@ bool bind(const Variant::Map& options, c + } + } + +-bool bind(const Address& address, const std::string& name, std::string& variable) ++bool getAddressOption(const Address& address, const std::string& name, std::string& variable) + { + return bind(address.getOptions(), name, variable); + } + +-bool bind(const Address& address, const std::string& name, Variant::Map& variable) ++bool getAddressOption(const Address& address, const std::string& name, Variant::Map& variable) + { + return bind(address.getOptions(), name, variable); + } +@@ -249,20 +249,20 @@ AddressHelper::AddressHelper(const Addre + browse(false) + { + verifier.verify(address); +- bind(address, CREATE, createPolicy); +- bind(address, DELETE, deletePolicy); +- bind(address, ASSERT, assertPolicy); +- +- bind(address, NODE, node); +- bind(address, LINK, link); +- bind(node, PROPERTIES, properties); +- bind(node, CAPABILITIES, capabilities); +- bind(link, RELIABILITY, reliability); ++ getAddressOption(address, CREATE, createPolicy); ++ getAddressOption(address, DELETE, deletePolicy); ++ getAddressOption(address, ASSERT, assertPolicy); ++ ++ getAddressOption(address, NODE, node); ++ getAddressOption(address, LINK, link); ++ getOption(node, PROPERTIES, properties); ++ getOption(node, CAPABILITIES, capabilities); ++ getOption(link, RELIABILITY, reliability); + durableNode = test(node, DURABLE); + durableLink = test(link, DURABLE); + timeout = get(link, TIMEOUT, durableLink && reliability != AT_LEAST_ONCE ? DEFAULT_DURABLE_TIMEOUT : DEFAULT_TIMEOUT); + std::string mode; +- if (bind(address, MODE, mode)) { ++ if (getAddressOption(address, MODE, mode)) { + if (mode == BROWSE) { + browse = true; + } else if (mode != CONSUME) { +Index: b/src/qpid/sys/rdma/RdmaClient.cpp +=================================================================== +--- a/src/qpid/sys/rdma/RdmaClient.cpp ++++ b/src/qpid/sys/rdma/RdmaClient.cpp +@@ -160,7 +160,7 @@ void drained(Rdma::AsynchIO&) { + cout << "Drained:\n"; + } + +-void connected(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr& ci, const Rdma::ConnectionParams& cp) { ++void connected(Poller::shared_ptr poller, const Rdma::Connection::intrusive_ptr& ci, const Rdma::ConnectionParams& cp) { + cout << "Connected\n"; + Rdma::QueuePair::intrusive_ptr q = ci->getQueuePair(); + +@@ -178,17 +178,17 @@ void connected(Poller::shared_ptr poller + aio->start(poller); + } + +-void disconnected(boost::shared_ptr<Poller> p, Rdma::Connection::intrusive_ptr&) { ++void disconnected(boost::shared_ptr<Poller> p, const Rdma::Connection::intrusive_ptr&) { + cout << "Disconnected\n"; + p->shutdown(); + } + +-void connectionError(boost::shared_ptr<Poller> p, Rdma::Connection::intrusive_ptr&, const Rdma::ErrorType) { ++void connectionError(boost::shared_ptr<Poller> p, const Rdma::Connection::intrusive_ptr&, const Rdma::ErrorType) { + cout << "Connection error\n"; + p->shutdown(); + } + +-void rejected(boost::shared_ptr<Poller> p, Rdma::Connection::intrusive_ptr&, const Rdma::ConnectionParams&) { ++void rejected(boost::shared_ptr<Poller> p, const Rdma::Connection::intrusive_ptr&, const Rdma::ConnectionParams&) { + cout << "Connection rejected\n"; + p->shutdown(); + } +Index: b/src/qpid/sys/rdma/RdmaServer.cpp +=================================================================== +--- a/src/qpid/sys/rdma/RdmaServer.cpp ++++ b/src/qpid/sys/rdma/RdmaServer.cpp +@@ -119,7 +119,7 @@ void drained(Rdma::AsynchIO&) { + cout << "Drained:\n"; + } + +-void disconnected(Rdma::Connection::intrusive_ptr& ci) { ++void disconnected(const Rdma::Connection::intrusive_ptr& ci) { + ConRec* cr = ci->getContext<ConRec>(); + cr->connection->disconnect(); + cr->data->drainWriteQueue(drained); +@@ -127,7 +127,7 @@ void disconnected(Rdma::Connection::intr + cout << "Disconnected: " << cr << "\n"; + } + +-void connectionError(Rdma::Connection::intrusive_ptr& ci, Rdma::ErrorType) { ++void connectionError(const Rdma::Connection::intrusive_ptr& ci, Rdma::ErrorType) { + ConRec* cr = ci->getContext<ConRec>(); + cr->connection->disconnect(); + if (cr) { +@@ -137,7 +137,7 @@ void connectionError(Rdma::Connection::i + cout << "Connection error: " << cr << "\n"; + } + +-bool connectionRequest(Rdma::Connection::intrusive_ptr& ci, const Rdma::ConnectionParams& cp) { ++bool connectionRequest(const Rdma::Connection::intrusive_ptr& ci, const Rdma::ConnectionParams& cp) { + cout << "Incoming connection: "; + + // For fun reject alternate connection attempts +@@ -165,7 +165,7 @@ bool connectionRequest(Rdma::Connection: + return x; + } + +-void connected(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr& ci) { ++void connected(Poller::shared_ptr poller, const Rdma::Connection::intrusive_ptr& ci) { + static int cnt = 0; + ConRec* cr = ci->getContext<ConRec>(); + cout << "Connected: " << cr << "(" << ++cnt << ")\n";
