Packets: Fix VariantParser invalid parser access bug

[senf.git] / Utils / TypeIdValue.hh

diff --git a/Utils/TypeIdValue.hh b/Utils/TypeIdValue.hh
index 4e6c853..85eebf0 100644 (file)
--- a/Utils/TypeIdValue.hh
+++ b/Utils/TypeIdValue.hh
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@
 /** \file
     \brief TypeIdValue public header */
 
-#ifndef HH_TypeIdValue_
-#define HH_TypeIdValue_ 1
+#ifndef HH_SENF_Utils_TypeIdValue_
+#define HH_SENF_Utils_TypeIdValue_ 1
 
 // Custom includes
 #include <typeinfo>
@@ -64,6 +64,7 @@ namespace senf {
         bool operator<(TypeIdValue const & other) const;
 
         std::string name() const;
+        std::type_info const & id() const;
 
     protected:
 
@@ -71,7 +72,7 @@ namespace senf {
         template <class Type> TypeIdValue(Type *);
 
         struct Value {
-            virtual ~Value() {}
+            virtual ~Value();
             virtual std::type_info const & id() = 0;
             virtual Value * clone() = 0;
         };
@@ -92,9 +93,7 @@ namespace senf {
     template <class Type>
     TypeIdValue const typeIdValue();
 
-    inline std::ostream & operator<<(std::ostream & os, TypeIdValue const & v)
-    { return os << v.name(); }
-    
+    std::ostream & operator<<(std::ostream & os, TypeIdValue const & v);
 }
 
 ///////////////////////////////hh.e////////////////////////////////////////