1 files changed, 25 insertions, 25 deletions
diff --git a/ext/dsent/libutil/Config.h b/ext/dsent/libutil/Config.h
index a60c4b8fd..d88a800a2 100644
--- a/ext/dsent/libutil/Config.h
+++ b/ext/dsent/libutil/Config.h
@@ -1,36 +1,36 @@
+/* Copyright (c) 2012 Massachusetts Institute of Technology
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #ifndef __LIBUTIL_CONFIG_H__
 #define __LIBUTIL_CONFIG_H__
 
 #include <iostream>
+#include <map>
 
-#include "Map.h"
+#include "libutil/String.h"
 
 namespace LibUtil
 {
-    class Config : public StringMap
-    {
-        public:
-            Config(const String& delimiter_ = "=", const String& comment_ = "#", const String& sentry_ = "End");
-            Config(const Config& config_);
-            virtual ~Config();
-
-        public:
-            // Make a copy of this instance
-            virtual Config* clone() const;
-            // Load the config from file
-            virtual void readFile(const String& filename_);
-            // Parse string and overwrite the Config instance if keys exist
-            virtual void readString(const String& str_);
-
-            // Write or read map using standard IO
-            friend std::ostream& operator<<(std::ostream& ost_, const Config& config_);
-            friend std::istream& operator>>(std::istream& ist_, Config& config_);
-
-        protected:
-            String mDelimiter;
-            String mComment;
-            String mSentry;
-    };
+    // Load the config from file
+    void readFile(const char *filename_, std::map<String, String> &config);
 }
 
 #endif // __LIBUTIL_CONFIG_H__