Add missing files from previous commit.

[ardour.git] / libs / pbd / pbd / enumwriter.h

diff --git a/libs/pbd/pbd/enumwriter.h b/libs/pbd/pbd/enumwriter.h
index f53388f3cc1e0d4a5bf5f2b0b38e8de1ba5a201d..461665d739f0a7b9ad1116bf0677d5354f3bfcd4 100644 (file)
--- a/libs/pbd/pbd/enumwriter.h
+++ b/libs/pbd/pbd/enumwriter.h
@@ -18,6 +18,9 @@
     $Id$
 */
 
+#ifndef __pbd_enumwriter_h__
+#define __pbd_enumwriter_h__
+
 #include <map>
 #include <string>
 #include <vector>
@@ -33,10 +36,7 @@ class unknown_enumeration : public std::exception {
 
 class EnumWriter {
   public:
-       EnumWriter ();
-       ~EnumWriter ();
-
-       static EnumWriter& instance() { return *_instance; }
+       static EnumWriter& instance();
 
        void register_distinct (std::string type, std::vector<int>, std::vector<std::string>);
        void register_bits     (std::string type, std::vector<int>, std::vector<std::string>);
@@ -47,6 +47,9 @@ class EnumWriter {
        void add_to_hack_table (std::string str, std::string hacked_str);
 
   private:
+       EnumWriter ();
+       ~EnumWriter ();
+
        struct EnumRegistration {
            std::vector<int> values;
            std::vector<std::string> names;
@@ -75,3 +78,4 @@ class EnumWriter {
 #define enum_2_string(e) (PBD::EnumWriter::instance().write (typeid(e).name(), e))
 #define string_2_enum(str,e) (PBD::EnumWriter::instance().read (typeid(e).name(), (str)))
 
+#endif /*  __pbd_enumwriter_h__ */