created gras.hpp header for common defs

12 files changed, 50 insertions, 23 deletions

diff --git a/include/gnuradio/block.hpp b/include/gnuradio/block.hpp
index 490482e..ff4ede7 100644
--- a/include/gnuradio/block.hpp
+++ b/include/gnuradio/block.hpp
@@ -51,7 +51,7 @@ template <typename PtrType> struct Buffer
     size_t _len;
 };
 
-struct GR_RUNTIME_API Block : Element
+struct GRAS_API Block : Element
 {
     enum
     {
diff --git a/include/gnuradio/element.hpp b/include/gnuradio/element.hpp
index 4cad346..510a383 100644
--- a/include/gnuradio/element.hpp
+++ b/include/gnuradio/element.hpp
@@ -17,22 +17,15 @@
 #ifndef INCLUDED_GNURADIO_ELEMENT_HPP
 #define INCLUDED_GNURADIO_ELEMENT_HPP
 
-#include <gruel/pmt.h>
+#include <gnuradio/gras.hpp>
 #include <gnuradio/io_signature.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-
-//this is part of core for now, treat it as such
-#include <gr_core_api.h>
-#define GR_RUNTIME_API GR_CORE_API
+#include <gruel/pmt.h>
 
 namespace gnuradio
 {
 
-struct ElementImpl;
-
-struct GR_RUNTIME_API Element : boost::shared_ptr<ElementImpl>, boost::enable_shared_from_this<Element>
+struct GRAS_API Element : boost::shared_ptr<ElementImpl>, boost::enable_shared_from_this<Element>
 {
 
     //! Create an empty element
diff --git a/include/gnuradio/gr_block.h b/include/gnuradio/gr_block.h
index b141f31..5b3e9f2 100644
--- a/include/gnuradio/gr_block.h
+++ b/include/gnuradio/gr_block.h
@@ -24,7 +24,7 @@
 #include <gr_tags.h>
 #include <string>
 
-struct GR_RUNTIME_API gr_block : gnuradio::Block
+struct GRAS_API gr_block : gnuradio::Block
 {
 
     gr_block(void);
diff --git a/include/gnuradio/gr_hier_block2.h b/include/gnuradio/gr_hier_block2.h
index 2829f36..4bd52ac 100644
--- a/include/gnuradio/gr_hier_block2.h
+++ b/include/gnuradio/gr_hier_block2.h
@@ -20,7 +20,7 @@
 #include <gnuradio/hier_block.hpp>
 #include <gr_io_signature.h>
 
-struct GR_RUNTIME_API gr_hier_block2 : gnuradio::HierBlock
+struct GRAS_API gr_hier_block2 : gnuradio::HierBlock
 {
 
     gr_hier_block2(void);
@@ -40,7 +40,7 @@ struct GR_RUNTIME_API gr_hier_block2 : gnuradio::HierBlock
 
 typedef boost::shared_ptr<gr_hier_block2> gr_hier_block2_sptr;
 
-GR_RUNTIME_API gr_hier_block2_sptr gr_make_hier_block2(
+GRAS_API gr_hier_block2_sptr gr_make_hier_block2(
     const std::string &name,
     gr_io_signature_sptr input_signature,
     gr_io_signature_sptr output_signature
diff --git a/include/gnuradio/gr_sync_block.h b/include/gnuradio/gr_sync_block.h
index fe512a6..e7cc06c 100644
--- a/include/gnuradio/gr_sync_block.h
+++ b/include/gnuradio/gr_sync_block.h
@@ -19,7 +19,7 @@
 
 #include <gr_block.h>
 
-struct GR_RUNTIME_API gr_sync_block : public gr_block
+struct GRAS_API gr_sync_block : public gr_block
 {
     gr_sync_block(void);
 
diff --git a/include/gnuradio/gr_sync_decimator.h b/include/gnuradio/gr_sync_decimator.h
index ca69a6b..526594f 100644
--- a/include/gnuradio/gr_sync_decimator.h
+++ b/include/gnuradio/gr_sync_decimator.h
@@ -19,7 +19,7 @@
 
 #include <gr_sync_block.h>
 
-struct GR_RUNTIME_API gr_sync_decimator : gr_sync_block
+struct GRAS_API gr_sync_decimator : gr_sync_block
 {
 
     gr_sync_decimator(void);
diff --git a/include/gnuradio/gr_sync_interpolator.h b/include/gnuradio/gr_sync_interpolator.h
index f3d7dfd..ff3c425 100644
--- a/include/gnuradio/gr_sync_interpolator.h
+++ b/include/gnuradio/gr_sync_interpolator.h
@@ -19,7 +19,7 @@
 
 #include <gr_sync_block.h>
 
-struct GR_RUNTIME_API gr_sync_interpolator : gr_sync_block
+struct GRAS_API gr_sync_interpolator : gr_sync_block
 {
 
     gr_sync_interpolator(void);
diff --git a/include/gnuradio/gr_top_block.h b/include/gnuradio/gr_top_block.h
index 23e79ef..98558e5 100644
--- a/include/gnuradio/gr_top_block.h
+++ b/include/gnuradio/gr_top_block.h
@@ -20,7 +20,7 @@
 #include <gnuradio/top_block.hpp>
 #include <gr_hier_block2.h>
 
-struct GR_RUNTIME_API gr_top_block : gnuradio::TopBlock
+struct GRAS_API gr_top_block : gnuradio::TopBlock
 {
 
     gr_top_block(void);
@@ -41,6 +41,6 @@ struct GR_RUNTIME_API gr_top_block : gnuradio::TopBlock
 
 typedef boost::shared_ptr<gr_top_block> gr_top_block_sptr;
 
-GR_RUNTIME_API gr_top_block_sptr gr_make_top_block(const std::string &name);
+GRAS_API gr_top_block_sptr gr_make_top_block(const std::string &name);
 
 #endif /*INCLUDED_GNURADIO_GR_TOP_BLOCK_H*/
diff --git a/include/gnuradio/gras.hpp b/include/gnuradio/gras.hpp
new file mode 100644
index 0000000..c8b217c
--- /dev/null
+++ b/include/gnuradio/gras.hpp
@@ -0,0 +1,34 @@
+//
+// Copyright 2012 Josh Blum
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with io_sig program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef INCLUDED_GNURADIO_GRAS_HPP
+#define INCLUDED_GNURADIO_GRAS_HPP
+
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
+
+//this is part of core for now, treat it as such
+#include <gr_core_api.h>
+#define GRAS_API GR_CORE_API
+
+namespace gnuradio
+{
+
+struct ElementImpl;
+
+} //namespace gnuradio
+
+#endif /*INCLUDED_GNURADIO_GRAS_HPP*/
diff --git a/include/gnuradio/hier_block.hpp b/include/gnuradio/hier_block.hpp
index 91c6cc0..f390225 100644
--- a/include/gnuradio/hier_block.hpp
+++ b/include/gnuradio/hier_block.hpp
@@ -22,7 +22,7 @@
 namespace gnuradio
 {
 
-struct GR_RUNTIME_API HierBlock : Element
+struct GRAS_API HierBlock : Element
 {
     HierBlock(void);
 
diff --git a/include/gnuradio/tags.hpp b/include/gnuradio/tags.hpp
index 2321fa7..e730178 100644
--- a/include/gnuradio/tags.hpp
+++ b/include/gnuradio/tags.hpp
@@ -17,13 +17,13 @@
 #ifndef INCLUDED_GNURADIO_TAGS_HPP
 #define INCLUDED_GNURADIO_TAGS_HPP
 
-#include <gnuradio/element.hpp>
+#include <gnuradio/gras.hpp>
 #include <gruel/pmt.h>
 
 namespace gnuradio
 {
 
-struct GR_RUNTIME_API Tag
+struct GRAS_API Tag
 {
 
     //! the item \p tag occurred at (as a uint64_t)
diff --git a/include/gnuradio/top_block.hpp b/include/gnuradio/top_block.hpp
index 5b3e9a2..1a4b4b2 100644
--- a/include/gnuradio/top_block.hpp
+++ b/include/gnuradio/top_block.hpp
@@ -22,7 +22,7 @@
 namespace gnuradio
 {
 
-struct GR_RUNTIME_API TopBlock : HierBlock
+struct GRAS_API TopBlock : HierBlock
 {
     TopBlock(void);