You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/02/14 20:07:57 UTC
[1/2] qpid-cpp git commit: QPID-7674: Broker bulid problem with GCC 7
Repository: qpid-cpp
Updated Branches:
refs/heads/master 13f0fe591 -> fa27fd689
QPID-7674: Broker bulid problem with GCC 7
GCC 7 introduces a new warning for switch statement fall-through. The Qpid code triggers
the warning, but the fall through is deliberate. Disabled the warning.
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/2e08b7ca
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/2e08b7ca
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/2e08b7ca
Branch: refs/heads/master
Commit: 2e08b7cae09e7326240e75829da4676746905eee
Parents: 13f0fe5
Author: Alan Conway <ac...@redhat.com>
Authored: Tue Feb 14 13:51:33 2017 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Tue Feb 14 13:51:33 2017 -0500
----------------------------------------------------------------------
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/2e08b7ca/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80c633b..0270350 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,7 +147,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 -Wno-error=deprecated-declarations")
+ "-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 -Wno-implicit-fallthrough")
set (CATCH_UNDEFINED "-Wl,--no-undefined")
# gcc on SunOS uses native linker whose "-z defs" is too fussy
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-cpp git commit: QPID-7669: Unintended UI changes from
switch to swigged Python client for management tools
Posted by ac...@apache.org.
QPID-7669: Unintended UI changes from switch to swigged Python client for management tools
Reverted the qpid management scripts to use the native python client. The SWIG
client introduces incompatible changes (URL formats, SASL configuration) in
addition to support form AMQP 1.0, which breaks existing use.
The libqpidtools library still supports both native and SWIG client so 3rd-party
AMQP 1.0 tools built using the libqpidtools are not affected.
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/fa27fd68
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/fa27fd68
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/fa27fd68
Branch: refs/heads/master
Commit: fa27fd689d196219841771c6f9f1c30dd135dd57
Parents: 2e08b7c
Author: Alan Conway <ac...@redhat.com>
Authored: Tue Feb 14 13:53:12 2017 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Tue Feb 14 14:10:55 2017 -0500
----------------------------------------------------------------------
management/python/bin/qpid-config | 6 +-----
management/python/bin/qpid-ha | 5 +----
management/python/bin/qpid-printevents | 5 +----
management/python/bin/qpid-receive | 5 +----
management/python/bin/qpid-send | 8 +++-----
management/python/bin/qpid-stat | 6 +-----
6 files changed, 8 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/fa27fd68/management/python/bin/qpid-config
----------------------------------------------------------------------
diff --git a/management/python/bin/qpid-config b/management/python/bin/qpid-config
index 3055419..d19b039 100755
--- a/management/python/bin/qpid-config
+++ b/management/python/bin/qpid-config
@@ -28,11 +28,7 @@ import locale
home = os.environ.get("QPID_TOOLS_HOME", os.path.normpath("/usr/share/qpid-tools"))
sys.path.append(os.path.join(home, "python"))
-try:
- from qpid_messaging import Connection, ConnectionError
-except:
- from qpid.messaging import Connection, ConnectionError
-
+from qpid.messaging import Connection, ConnectionError
from qpidtoollibs import BrokerAgent, Display, Header
usage = """
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/fa27fd68/management/python/bin/qpid-ha
----------------------------------------------------------------------
diff --git a/management/python/bin/qpid-ha b/management/python/bin/qpid-ha
index 88116ca..d2377bb 100755
--- a/management/python/bin/qpid-ha
+++ b/management/python/bin/qpid-ha
@@ -20,10 +20,7 @@
#
import optparse, sys, time, os, re, math
-try:
- from qpid_messaging import Connection
-except:
- from qpid.messaging import Connection
+from qpid.messaging import Connection
from qpid.util import URL
from qpidtoollibs.broker import BrokerAgent
from qpidtoollibs.config import parse_qpidd_conf
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/fa27fd68/management/python/bin/qpid-printevents
----------------------------------------------------------------------
diff --git a/management/python/bin/qpid-printevents b/management/python/bin/qpid-printevents
index 7181fc9..b60cb3f 100755
--- a/management/python/bin/qpid-printevents
+++ b/management/python/bin/qpid-printevents
@@ -25,10 +25,7 @@ import sys
from optparse import IndentedHelpFormatter
from time import time, strftime, gmtime, sleep
from threading import Lock, Condition, Thread
-try:
- from qpid_messaging import Connection, exceptions
-except:
- from qpid.messaging import Connection, exceptions
+from qpid.messaging import Connection, exceptions
home = os.environ.get("QPID_TOOLS_HOME", os.path.normpath("/usr/share/qpid-tools"))
sys.path.append(os.path.join(home, "python"))
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/fa27fd68/management/python/bin/qpid-receive
----------------------------------------------------------------------
diff --git a/management/python/bin/qpid-receive b/management/python/bin/qpid-receive
index a055b4f..f14df27 100755
--- a/management/python/bin/qpid-receive
+++ b/management/python/bin/qpid-receive
@@ -20,10 +20,7 @@
import optparse, sys, time
import statistics
-try:
- from qpid_messaging import *
-except:
- from qpid.messaging import *
+from qpid.messaging import *
SECOND = 1000
TIME_SEC = 1000000000
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/fa27fd68/management/python/bin/qpid-send
----------------------------------------------------------------------
diff --git a/management/python/bin/qpid-send b/management/python/bin/qpid-send
index 2268541..b0105e4 100755
--- a/management/python/bin/qpid-send
+++ b/management/python/bin/qpid-send
@@ -18,11 +18,9 @@
# under the License.
#
-import optparse, random, os, time, uuid, statistics
-try:
- from qpid_messaging import *
-except:
- from qpid.messaging import *
+import optparse, random, os, time, uuid
+from qpid.messaging import *
+import statistics
EOS = "eos"
SN = "sn"
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/fa27fd68/management/python/bin/qpid-stat
----------------------------------------------------------------------
diff --git a/management/python/bin/qpid-stat b/management/python/bin/qpid-stat
index 1bff8ad..1780c4a 100755
--- a/management/python/bin/qpid-stat
+++ b/management/python/bin/qpid-stat
@@ -25,11 +25,7 @@ import sys
import locale
import socket
import re
-
-try:
- from qpid_messaging import Connection
-except:
- from qpid.messaging import Connection
+from qpid.messaging import Connection
home = os.environ.get("QPID_TOOLS_HOME", os.path.normpath("/usr/share/qpid-tools"))
sys.path.append(os.path.join(home, "python"))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org