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/portal.hh b/src/portal.hh
index b763654..c6237a7 100644
--- a/src/portal.hh
+++ b/src/portal.hh
@@ -1,7 +1,7 @@
 // $Header$
 
-#ifndef PORTAL_HH
-#define PORTAL_HH
+#ifndef FORMALINE_PORTAL_HH
+#define FORMALINE_PORTAL_HH
 
 
 
@@ -54,49 +54,58 @@
 
 
 
-class portal : public storage
+namespace Formaline
 {
+
+
+
+  class portal : public storage
+  {
   
-  SOCKET sock;
+    SOCKET sock;
   
-  std::ostringstream msgbuf;
+    std::ostringstream msgbuf;
   
-  int errorcount;
+    int errorcount;
   
-public:
+  public:
   
-  portal (char const * id,
-          enum state st);
+    portal (char const * id,
+            enum state st);
   
-  virtual
-  ~ portal ();
+    virtual
+    ~ portal ();
   
-  virtual void
-  store (char const * key,
-         bool value);
+    virtual void
+    store (char const * key,
+           bool value);
   
-  virtual void
-  store (char const * key,
-         int value);
+    virtual void
+    store (char const * key,
+           int value);
   
-  virtual void
-  store (char const * key,
-         double value);
+    virtual void
+    store (char const * key,
+           double value);
   
-  virtual void
-  store (char const * key,
-         char const * value);
+    virtual void
+    store (char const * key,
+           char const * value);
   
-private:
+  private:
   
-  void
-  write (std::string const & msg);
+    void
+    write (std::string const & msg);
   
-  std::string
-  clean (std::string const & txt)
-    const;
-};
+    std::string
+    clean (std::string const & txt)
+      const;
+  };
+
+
+
+} // namespace Formaline
 
 
 
-#endif // ifndef PORTAL_HH
+#endif // ifndef FORMALINE_PORTAL_HH