[Commit-gnuradio] r4068 - gnuradio/trunk/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2006-12-12 11:11:13 -0700 (Tue, 12 Dec 2006)
New Revision: 4068

Added:
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_runtime_types.h
Removed:
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_runtime.h
Modified:
   gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block.h
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block_detail.h
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_buffer.h
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_io_signature.h
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.h
   gnuradio/trunk/gnuradio-core/src/lib/runtime/qa_gr_block.cc
   gnuradio/trunk/gnuradio-core/src/lib/runtime/runtime.i
Log:
Move gr_runtime.h out of the way in preparation for merge of hier developer 
branch.  No changes in functionality.  Passes make distcheck.

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am    2006-12-12 
07:15:56 UTC (rev 4067)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am    2006-12-12 
18:11:13 UTC (rev 4068)
@@ -74,7 +74,7 @@
        gr_pagesize.h                           \
        gr_preferences.h                        \
        gr_realtime.h                           \
-       gr_runtime.h                            \
+       gr_runtime_types.h                      \
        gr_select_handler.h                     \
        gr_single_threaded_scheduler.h          \
        gr_timer.h                              \

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block.h     2006-12-12 
07:15:56 UTC (rev 4067)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block.h     2006-12-12 
18:11:13 UTC (rev 4068)
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_BLOCK_H
 #define INCLUDED_GR_BLOCK_H
 
-#include <gr_runtime.h>
+#include <gr_runtime_types.h>
 #include <string>
 
 /*!

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block_detail.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block_detail.h      
2006-12-12 07:15:56 UTC (rev 4067)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block_detail.h      
2006-12-12 18:11:13 UTC (rev 4068)
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_BLOCK_DETAIL_H
 #define INCLUDED_GR_BLOCK_DETAIL_H
 
-#include <gr_runtime.h>
+#include <gr_runtime_types.h>
 #include <stdexcept>
 
 /*!

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_buffer.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_buffer.h    2006-12-12 
07:15:56 UTC (rev 4067)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_buffer.h    2006-12-12 
18:11:13 UTC (rev 4068)
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_BUFFER_H
 #define INCLUDED_GR_BUFFER_H
 
-#include <gr_runtime.h>
+#include <gr_runtime_types.h>
 
 class gr_vmcircbuf;
 

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_io_signature.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_io_signature.h      
2006-12-12 07:15:56 UTC (rev 4067)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_io_signature.h      
2006-12-12 18:11:13 UTC (rev 4068)
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IO_SIGNATURE_H
 #define INCLUDED_IO_SIGNATURE_H
 
-#include <gr_runtime.h>
+#include <gr_runtime_types.h>
 
 /*!
  * \brief i/o signature for input and output ports.

Deleted: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_runtime.h

Copied: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_runtime_types.h (from 
rev 4067, gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_runtime.h)
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_runtime_types.h             
                (rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_runtime_types.h     
2006-12-12 18:11:13 UTC (rev 4068)
@@ -0,0 +1,44 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio 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 General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_RUNTIME_H
+#define INCLUDED_GR_RUNTIME_H
+
+#include <gr_types.h>
+
+/*
+ * typedefs for smart pointers we use throughout the runtime system
+ */
+
+class gr_block;
+class gr_block_detail;
+class gr_io_signature;
+class gr_buffer;
+class gr_buffer_reader;
+
+typedef boost::shared_ptr<gr_block>            gr_block_sptr;
+typedef boost::shared_ptr<gr_block_detail>     gr_block_detail_sptr;
+typedef boost::shared_ptr<gr_io_signature>     gr_io_signature_sptr;
+typedef boost::shared_ptr<gr_buffer>           gr_buffer_sptr;
+typedef boost::shared_ptr<gr_buffer_reader>    gr_buffer_reader_sptr;
+
+#endif /* INCLUDED_GR_RUNTIME_H */

Modified: 
gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.h 
2006-12-12 07:15:56 UTC (rev 4067)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.h 
2006-12-12 18:11:13 UTC (rev 4068)
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H
 #define INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H
 
-#include <gr_runtime.h>
+#include <gr_runtime_types.h>
 #include <fstream>
 
 class gr_single_threaded_scheduler;

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/qa_gr_block.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/qa_gr_block.cc 2006-12-12 
07:15:56 UTC (rev 4067)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/qa_gr_block.cc 2006-12-12 
18:11:13 UTC (rev 4068)
@@ -25,7 +25,7 @@
 #endif
 #include <qa_gr_block.h>
 #include <gr_block.h>
-#include <gr_runtime.h>
+#include <gr_runtime_types.h>
 #include <gr_io_signature.h>
 #include <gr_null_sink.h>
 #include <gr_null_source.h>

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/runtime.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/runtime.i      2006-12-12 
07:15:56 UTC (rev 4067)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/runtime.i      2006-12-12 
18:11:13 UTC (rev 4068)
@@ -21,7 +21,7 @@
  */
 
 %{
-#include <gr_runtime.h>
+#include <gr_runtime_types.h>
 #include <gr_io_signature.h>
 #include <gr_buffer.h>
 #include <gr_block.h>