Utils: Much better TypeIdValue implementation

[senf.git] / senf / Utils / TypeIdValue.hh

diff --git a/senf/Utils/TypeIdValue.hh b/senf/Utils/TypeIdValue.hh
index 85eebf0..f1b8018 100644 (file)
--- a/senf/Utils/TypeIdValue.hh
+++ b/senf/Utils/TypeIdValue.hh
@@ -54,8 +54,7 @@ namespace senf {
         // no conversion constructors
 
         TypeIdValue();
-        TypeIdValue(TypeIdValue const & other);
-        TypeIdValue const & operator=(TypeIdValue const & other);
+        TypeIdValue(std::type_info const & v);
 
         ///@}
         ///////////////////////////////////////////////////////////////////////////
@@ -64,28 +63,14 @@ namespace senf {
         bool operator<(TypeIdValue const & other) const;
 
         std::string name() const;
+        std::string prettyName() const;
+
         std::type_info const & id() const;
 
     protected:
 
     private:
-        template <class Type> TypeIdValue(Type *);
-
-        struct Value {
-            virtual ~Value();
-            virtual std::type_info const & id() = 0;
-            virtual Value * clone() = 0;
-        };
-
-        template <class Type>
-        struct ValueImpl : public Value {
-            virtual std::type_info const & id();
-            virtual Value * clone();
-        };
-
-        boost::scoped_ptr<Value> value_;
-
-        template <class Type> friend TypeIdValue const typeIdValue();
+        std::type_info const * p_;
     };
 
     TypeIdValue const typeIdValue();
@@ -93,6 +78,9 @@ namespace senf {
     template <class Type>
     TypeIdValue const typeIdValue();
 
+    template <class Type>
+    TypeIdValue const typeidValue(Type const & ob);
+
     std::ostream & operator<<(std::ostream & os, TypeIdValue const & v);
 }