summaryrefslogtreecommitdiff
path: root/gr-uhd/swig
diff options
context:
space:
mode:
authorTom Rondeau2012-04-04 22:08:10 -0400
committerTom Rondeau2012-04-04 22:08:10 -0400
commita66a650a1f39118500434bc9c91b2ade24887149 (patch)
treeb90b341e42a776432053a54740ca7ce9e7e945e6 /gr-uhd/swig
parentfd52df0f706195d937e287189024f8aa6fbeaf60 (diff)
parentb711a8683c8c4578c7a4ff0f3664f1321da1dcad (diff)
downloadgnuradio-a66a650a1f39118500434bc9c91b2ade24887149.tar.gz
gnuradio-a66a650a1f39118500434bc9c91b2ade24887149.tar.bz2
gnuradio-a66a650a1f39118500434bc9c91b2ade24887149.zip
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'gr-uhd/swig')
-rw-r--r--gr-uhd/swig/__init__.py2
-rw-r--r--gr-uhd/swig/uhd_swig.i10
2 files changed, 10 insertions, 2 deletions
diff --git a/gr-uhd/swig/__init__.py b/gr-uhd/swig/__init__.py
index 82dbdd9e7..b4045e77f 100644
--- a/gr-uhd/swig/__init__.py
+++ b/gr-uhd/swig/__init__.py
@@ -1,5 +1,5 @@
#
-# Copyright 2010-2011 Free Software Foundation, Inc.
+# Copyright 2010-2012 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i
index 0b2f9febc..729719dcb 100644
--- a/gr-uhd/swig/uhd_swig.i
+++ b/gr-uhd/swig/uhd_swig.i
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2010-2011 Free Software Foundation, Inc.
+ * Copyright 2010-2012 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -125,6 +125,14 @@ static const size_t ALL_MBOARDS = uhd::usrp::multi_usrp::ALL_MBOARDS;
%}
static const size_t ALL_MBOARDS;
+%{
+#include <uhd/version.hpp>
+std::string get_version_string(void){
+ return uhd::get_version_string();
+}
+%}
+std::string get_version_string(void);
+
#if SWIGGUILE
%scheme %{
(load-extension-global "libguile-gnuradio-uhd_swig" "scm_init_gnuradio_uhd_swig_module")