[Commit-gnuradio] [gnuradio] 01/01: controlport: Adding support for building Java clients.

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 3a7f237cfa8f17b5f39de13cb273aa7efdc5f652
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 24 17:25:57 2015 -0400

    controlport: Adding support for building Java clients.
    
    Java has a hard time with unions (or our way of doing things produces
    problems in Java). Using a struct instead does not change any
    server-side or client-side code, and only seems to increase the
    network packet size by 2 bytes.
---
 gnuradio-runtime/lib/controlport/thrift/gnuradio.thrift     | 3 ++-
 gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc | 1 -
 volk                                                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnuradio-runtime/lib/controlport/thrift/gnuradio.thrift 
b/gnuradio-runtime/lib/controlport/thrift/gnuradio.thrift
index ae7f839..023e9fd 100644
--- a/gnuradio-runtime/lib/controlport/thrift/gnuradio.thrift
+++ b/gnuradio-runtime/lib/controlport/thrift/gnuradio.thrift
@@ -21,6 +21,7 @@
 
 namespace cpp GNURadio
 namespace py GNURadio
+namespace java org.gnuradio.controlport
 
 struct complex {
   1: double re;
@@ -41,7 +42,7 @@ enum BaseTypes { BOOL, BYTE, SHORT, INT, LONG, DOUBLE, 
STRING, COMPLEX,
                  F32VECTOR, F64VECTOR, S64VECTOR, S32VECTOR, S16VECTOR,
                  S8VECTOR, C32VECTOR }
 
-union KnobBase {
+struct KnobBase {
   1: bool a_bool;
   2: byte a_byte;
   3: i16 a_short;
diff --git a/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc 
b/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc
index 3e6eabc..e33fea4 100644
--- a/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc
+++ b/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc
@@ -133,7 +133,6 @@ rpcserver_thrift::setKnobs(const GNURadio::KnobMap& knobs)
                 (d_setcallbackmap, cur_priv));
 }
 
-
 void
 rpcserver_thrift::getKnobs(GNURadio::KnobMap& _return,
                            const GNURadio::KnobIDList& knobs)
diff --git a/volk b/volk
index 4a25f2e..5582e55 160000
--- a/volk
+++ b/volk
@@ -1 +1 @@
-Subproject commit 4a25f2ea6db33e3269ab485341c65d653712835a
+Subproject commit 5582e551051e864f5e55a518fc17250324130d44