Move PBD::canonical_path to pbd/file_utils.h/cc and reimplement for Windows

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

diff --git a/libs/pbd/pbd/enumwriter.h b/libs/pbd/pbd/enumwriter.h
index 634767e7f263b2b4219213d2abce18a3ad761ff3..6f2333277de93f4dcc85aa7b54cde42be1987817 100644 (file)
--- a/libs/pbd/pbd/enumwriter.h
+++ b/libs/pbd/pbd/enumwriter.h
@@ -1,4 +1,4 @@
-/* 
+/*
     Copyright (C) 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@ class LIBPBD_API unknown_enumeration : public std::exception {
        }
 
        ~unknown_enumeration () throw() {}
-       
+
        virtual const char *what() const throw() {
                return _message.c_str();
        }
@@ -72,7 +72,7 @@ class LIBPBD_API EnumWriter {
            bool bitwise;
 
            EnumRegistration() {}
-           EnumRegistration (std::vector<int>& v, std::vector<std::string>& s, bool b) 
+           EnumRegistration (std::vector<int>& v, std::vector<std::string>& s, bool b)
                    : values (v), names (s), bitwise (b) {}
        };
 
@@ -88,8 +88,8 @@ class LIBPBD_API EnumWriter {
        static EnumWriter* _instance;
        static std::map<std::string,std::string> hack_table;
 
-
-        int validate (EnumRegistration& er, int value);
+        int validate (EnumRegistration& er, int value) const;
+        int validate_bitwise (EnumRegistration& er, int value) const;
 };
 
 }