Put everything into a namespace.

Include <fstream> once more, maybe it helps.

Correct a few errors that gcc pointed out.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@26 83718e91-0e4f-0410-abf4-91180603181f

1 files changed, 40 insertions, 31 deletions

diff --git a/src/multistorage.hh b/src/multistorage.hh
index 50ad470..4614864 100644
--- a/src/multistorage.hh
+++ b/src/multistorage.hh
@@ -1,55 +1,64 @@
 // $Header$
 
-#ifndef MULTISTORAGE_HH
-#define MULTISTORAGE_HH
+#ifndef FORMALINE_MULTISTORAGE_HH
+#define FORMALINE_MULTISTORAGE_HH
 
 #include <list>
 
 #include "storage.hh"
 
-using namespace std;
 
 
-
-class multistorage
+namespace Formaline
 {
-  list<storage *> stores;
+
+  using namespace std;
+
+
+
+  class multistorage
+  {
+    list<storage *> stores;
   
-  multistorage (multistorage const &);
+    multistorage (multistorage const &);
   
-  multistorage
-  operator= (multistorage const &);
+    multistorage
+    operator= (multistorage const &);
   
-public:
+  public:
   
-  multistorage ();
+    multistorage ();
   
-  ~ multistorage ();
+    ~ multistorage ();
   
-  void
-  add_storage (storage *);
+    void
+    add_storage (storage *);
   
-  int
-  num_storages ()
-    const;
+    int
+    num_storages ()
+      const;
   
-  void
-  store (char const * key, bool value)
-    const;
+    void
+    store (char const * key, bool value)
+      const;
   
-  void
-  store (char const * key, int value)
-    const;
+    void
+    store (char const * key, int value)
+      const;
   
-  void
-  store (char const * key, double value)
-    const;
+    void
+    store (char const * key, double value)
+      const;
   
-  void
-  store (char const * key, char const * value)
-    const;
-};
+    void
+    store (char const * key, char const * value)
+      const;
+  };
+
+
+
+} // namespace Formaline
 
 
 
-#endif // ifndef MULTISTORAGE_HH
+#endif // ifndef FORMALINE_MULTISTORAGE_HH