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 2016/04/27 23:07:10 UTC
[1/2] qpid-proton git commit: NO-JIRA: Fix over-modern cmake usage in
perl binding/c++ examples.
Repository: qpid-proton
Updated Branches:
refs/heads/master 616fe02dd -> 75faa18e9
NO-JIRA: Fix over-modern cmake usage in perl binding/c++ examples.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/587f0d04
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/587f0d04
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/587f0d04
Branch: refs/heads/master
Commit: 587f0d04c95579d559c55eb95651f6216a33dae5
Parents: 616fe02
Author: Alan Conway <ac...@redhat.com>
Authored: Wed Apr 27 15:42:23 2016 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Wed Apr 27 16:15:26 2016 -0400
----------------------------------------------------------------------
examples/cpp/CMakeLists.txt | 2 +-
proton-c/bindings/perl/CMakeLists.txt | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/587f0d04/examples/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
index f79c8d2..5804573 100644
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@ -21,7 +21,7 @@ find_package(ProtonCpp REQUIRED)
include_directories(${ProtonCpp_INCLUDE_DIRS})
link_libraries(${ProtonCpp_LIBRARIES})
-add_compile_options(${CXX_WARNING_FLAGS})
+add_definitions(${CXX_WARNING_FLAGS})
# Single-threaded examples.
foreach(example
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/587f0d04/proton-c/bindings/perl/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/perl/CMakeLists.txt b/proton-c/bindings/perl/CMakeLists.txt
index 4930a43..33aa63a 100644
--- a/proton-c/bindings/perl/CMakeLists.txt
+++ b/proton-c/bindings/perl/CMakeLists.txt
@@ -17,24 +17,24 @@
# under the License.
#
+# Always need to treat SWIG files as C
+set_source_files_properties(cproton.i perl.i PROPERTIES CPLUSPLUS NO)
+
+# Need to pass in the same compiler flags used to build Perl itself
+execute_process(COMMAND perl -MConfig -e "print \$Config{ccflags}"
+ OUTPUT_VARIABLE PERLCFLAGS)
+
# Disable harmlesss warnings from the generted perlPERL_wrap.c
include(CheckCCompilerFlag)
foreach(flag -Wno-unused-but-set-variable -Wno-unused-function -Wno-unused-variable)
check_c_compiler_flag(${flag} allowed)
if (allowed)
- add_compile_options(${flag})
+ set(PERLCFLAGS "${PERLCFLAGS} ${flag}")
endif()
endforeach()
include_directories("${PERL_INCLUDE_PATH}")
-# Always need to treat SWIG files as C
-set_source_files_properties(cproton.i perl.i PROPERTIES CPLUSPLUS NO)
-
-# Need to pass in the same compiler flags used to build Perl itself
-execute_process(COMMAND perl -MConfig -e "print \$Config{ccflags}"
- OUTPUT_VARIABLE PERLCFLAGS)
-
if (CHECK_SYSINSTALL_PERL)
execute_process(COMMAND perl -V:installvendorarch
OUTPUT_VARIABLE PERL_VENDORARCH_OUTPUT_VARIABLE
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-proton git commit: NO-JIRA: ruby/python don't call
on_sendable if link is closed/closing
Posted by ac...@apache.org.
NO-JIRA: ruby/python don't call on_sendable if link is closed/closing
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/75faa18e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/75faa18e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/75faa18e
Branch: refs/heads/master
Commit: 75faa18e9e07d56edc52cd595aa25994f8986ec5
Parents: 587f0d0
Author: Alan Conway <ac...@redhat.com>
Authored: Wed Apr 27 16:14:33 2016 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Wed Apr 27 16:15:49 2016 -0400
----------------------------------------------------------------------
proton-c/bindings/python/proton/handlers.py | 4 +++-
proton-c/bindings/ruby/lib/handler/outgoing_message_handler.rb | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/75faa18e/proton-c/bindings/python/proton/handlers.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/handlers.py b/proton-c/bindings/python/proton/handlers.py
index 301f20c..a1cf836 100644
--- a/proton-c/bindings/python/proton/handlers.py
+++ b/proton-c/bindings/python/proton/handlers.py
@@ -34,7 +34,9 @@ class OutgoingMessageHandler(Handler):
self.delegate = delegate
def on_link_flow(self, event):
- if event.link.is_sender and event.link.credit:
+ if event.link.is_sender and event.link.credit \
+ and event.link.state & Endpoint.LOCAL_ACTIVE \
+ and event.link.state & Endpoint.REMOTE_ACTIVE :
self.on_sendable(event)
def on_delivery(self, event):
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/75faa18e/proton-c/bindings/ruby/lib/handler/outgoing_message_handler.rb
----------------------------------------------------------------------
diff --git a/proton-c/bindings/ruby/lib/handler/outgoing_message_handler.rb b/proton-c/bindings/ruby/lib/handler/outgoing_message_handler.rb
index 056a131..3f1f3f3 100644
--- a/proton-c/bindings/ruby/lib/handler/outgoing_message_handler.rb
+++ b/proton-c/bindings/ruby/lib/handler/outgoing_message_handler.rb
@@ -30,7 +30,9 @@ module Qpid::Proton::Handler
end
def on_link_flow(event)
- self.on_sendable(event) if event.link.sender? && event.link.credit > 0
+ self.on_sendable(event) if event.link.sender? && event.link.credit > 0 &&
+ (event.link.state & Qpid::Proton::Endpoint::LOCAL_ACTIVE) &&
+ (event.link.state & Qpid::Proton::Endpoint::REMOTE_ACTIVE)
end
def on_delivery(event)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org