can remove gr_sptr_magic.h, not needed

2 files changed, 10 insertions, 41 deletions

diff --git a/include/gnuradio/gr_block.h b/include/gnuradio/gr_block.h
index 1abeab6..f47f4bb 100644
--- a/include/gnuradio/gr_block.h
+++ b/include/gnuradio/gr_block.h
@@ -28,6 +28,16 @@ typedef std::vector<int> gr_vector_int;
 typedef std::vector<void *> gr_vector_void_star;
 typedef std::vector<const void *> gr_vector_const_void_star;
 
+namespace gnuradio
+{
+//! dummy entry, just here for legacy purposes
+template <typename T>
+boost::shared_ptr<T> get_initial_sptr(T *p)
+{
+    return boost::shared_ptr<T>(p);
+}
+}
+
 struct GRAS_API gr_block : gnuradio::Block
 {
 
diff --git a/include/gnuradio/gr_sptr_magic.h b/include/gnuradio/gr_sptr_magic.h
deleted file mode 100644
index 920cc7b..0000000
--- a/include/gnuradio/gr_sptr_magic.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright josh blum is awesome 2012
- * 
- * Copyright 2008 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 3, 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GR_SPTR_MAGIC_H
-#define INCLUDED_GR_SPTR_MAGIC_H
-
-#include <boost/shared_ptr.hpp>
-
-namespace gnuradio {
-
-  /*
-   * \brief New!  Improved!  Standard method to get/create the boost::shared_ptr for a block.
-   */
-  template<class T>
-  boost::shared_ptr<T>
-  get_initial_sptr(T *p)
-  {
-    return boost::shared_ptr<T>(p);
-  }
-};
-
-#endif /* INCLUDED_GR_SPTR_MAGIC_H */