Merge pull request #109 from bitshares/jmj_1548

Removal of smart_ref
bitshares · Feb 18, 2019 · 063be69 · 063be69
2 parents 1a411b8 + 19590fd
commit 063be69
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 182 deletions.
diff --git a/include/fc/io/raw.hpp b/include/fc/io/raw.hpp
@@ -5,7 +5,6 @@
 #include <fc/io/varint.hpp>
 #include <fc/optional.hpp>
 #include <fc/fwd.hpp>
-#include <fc/smart_ref_fwd.hpp>
 #include <fc/array.hpp>
 #include <fc/time.hpp>
 #include <fc/filesystem.hpp>
@@ -219,19 +218,6 @@ namespace fc {
        FC_ASSERT( _max_depth > 0 );
        fc::raw::unpack( *v, _max_depth - 1 ); // TODO not sure about this
     }
-    template<typename Stream, typename T>
-    void pack( Stream& s, const fc::smart_ref<T>& v, uint32_t _max_depth )
-    {
-       FC_ASSERT( _max_depth > 0 );
-       fc::raw::pack( s, *v, _max_depth - 1 );
-    }
-
-    template<typename Stream, typename T>
-    void unpack( Stream& s, fc::smart_ref<T>& v, uint32_t _max_depth )
-    {
-       FC_ASSERT( _max_depth > 0 );
-       fc::raw::unpack( s, *v, _max_depth - 1 );
-    }
 
     // optional
     template<typename Stream, typename T>

diff --git a/include/fc/reflect/typename.hpp b/include/fc/reflect/typename.hpp
@@ -7,7 +7,6 @@
 
 #include <fc/string.hpp>
 #include <fc/optional.hpp>
-#include <fc/smart_ref_fwd.hpp>
 
 #include <fc/container/flat_fwd.hpp>
 #include <fc/container/deque_fwd.hpp>
@@ -87,14 +86,6 @@ namespace fc {
          return n.c_str();
       }
   }; 
-  template<typename T> struct get_typename< fc::smart_ref<T> >
-  {
-     static const char* name()
-     {
-        static std::string n = std::string("fc::smart_ref<") + get_typename<T>::name() + std::string(">");
-        return n.c_str();
-     }
-  };
 
   struct unsigned_int;
   class variant_object;

diff --git a/include/fc/smart_ref_fwd.hpp b/include/fc/smart_ref_fwd.hpp
diff --git a/include/fc/smart_ref_impl.hpp b/include/fc/smart_ref_impl.hpp
diff --git a/include/fc/variant.hpp b/include/fc/variant.hpp
@@ -14,7 +14,6 @@
 #include <fc/string.hpp>
 #include <fc/container/deque_fwd.hpp>
 #include <fc/container/flat_fwd.hpp>
-#include <fc/smart_ref_fwd.hpp>
 #include <boost/multi_index_container_fwd.hpp>
 
 #ifdef FC_ASSERT
@@ -62,8 +61,6 @@ namespace fc
    template<typename T, typename... Args> void to_variant( const boost::multi_index_container<T,Args...>& s, variant& v, uint32_t max_depth );
    template<typename T, typename... Args> void from_variant( const variant& v, boost::multi_index_container<T,Args...>& s, uint32_t max_depth );
 
-   template<typename T> void to_variant( const smart_ref<T>& s, variant& v, uint32_t max_depth );
-   template<typename T> void from_variant( const variant& v, smart_ref<T>& s, uint32_t max_depth );
    template<typename T> void to_variant( const safe<T>& s, variant& v, uint32_t max_depth );
    template<typename T> void from_variant( const variant& v, safe<T>& s, uint32_t max_depth );
    template<typename T> void to_variant( const std::unique_ptr<T>& s, variant& v, uint32_t max_depth );
@@ -624,16 +621,6 @@ namespace fc
       s.value = v.as<T>( max_depth );
    }
 
-   template<typename T>
-   void to_variant( const smart_ref<T>& s, variant& v, uint32_t max_depth ) {
-      to_variant( *s, v, max_depth );
-   }
-
-   template<typename T>
-   void from_variant( const variant& v, smart_ref<T>& s, uint32_t max_depth ) {
-      from_variant( v, *s, max_depth );
-   }
-
    template<typename T, typename... Args>
    void to_variant( const boost::multi_index_container<T,Args...>& c, variant& v, uint32_t max_depth )
    {