[asycxx-devel] SF.net SVN: asycxx:[37] trunk

[<joe...@us...>]

Revision: 37
          http://asycxx.svn.sourceforge.net/asycxx/?rev=37&view=rev
Author:   joe_steeve
Date:     2009-04-08 07:39:05 +0000 (Wed, 08 Apr 2009)

Log Message:
-----------
moved Error* to 'asycxx' namespace

From: Joe Steeve <js...@hi...>

Modified Paths:
--------------
    trunk/include/asycxx/Error.h
    trunk/src/Error.cxx

Modified: trunk/include/asycxx/Error.h
===================================================================
--- trunk/include/asycxx/Error.h	2009-04-08 07:38:15 UTC (rev 36)
+++ trunk/include/asycxx/Error.h	2009-04-08 07:39:05 UTC (rev 37)
@@ -21,48 +21,58 @@
 
 #define ExpMSG_LEN 1024
 
-class Error
+namespace asycxx
 {
-public:
-  Error () {}
-  Error (const char *fmt, ...) 
-  { 
-    va_list args;
-    va_start (args, fmt);
-    doError (fmt, args);
-    va_end (args);
-  }
-  virtual ~Error () {}
+  enum ErrorCode
+    {
+      Err_Unknown = 1,
+      Err_Timeout,
+      Err_BadFD,
+    };
 
-protected:
-  void doError (const char *fmt, va_list vargs);
-  virtual const char *GetErrorName (void) {  return "Unknown error"; }
-};
+  class Error
+  {
+  public:
+    Error () {}
+    Error (const char *fmt, ...) 
+    { 
+      va_list args;
+      va_start (args, fmt);
+      doError (fmt, args);
+      va_end (args);
+    }
+    virtual ~Error () {}
 
-#define CREATE_ERROR(err, berr, name)                       \
-  class err : public berr                                   \
-  {                                                         \
-public:                                                     \
- err () {}                                                  \
- err (const char *fmt, ...)                                 \
- {                                                          \
-   va_list args;                                            \
-   va_start (args, fmt);                                    \
-   doError (fmt, args);                                     \
-   va_end (args);                                           \
- }                                                          \
-protected:                                                  \
- virtual const char *GetErrorName (void) { return name; }   \
+  protected:
+    void doError (const char *fmt, va_list vargs);
+    virtual const char *GetErrorName (void) {  return "Unknown error"; }
+  };
+
+#define CREATE_ERROR(err, berr, name)                           \
+  class err : public berr                                       \
+  {                                                             \
+  public:                                                       \
+    err () {}                                                   \
+    err (const char *fmt, ...)                                  \
+      {                                                         \
+        va_list args;                                           \
+        va_start (args, fmt);                                   \
+        doError (fmt, args);                                    \
+        va_end (args);                                          \
+      }                                                         \
+  protected:                                                    \
+    virtual const char *GetErrorName (void) { return name; }    \
   }                                                         
 
-CREATE_ERROR (FatalError, Error, "unknown FatalError");
-CREATE_ERROR (OutOfMemoryError, FatalError, "OutOfMemoryError");
-CREATE_ERROR (DevError, FatalError, "DevError");
-CREATE_ERROR (RunTimeError, FatalError, "RunTimeError");
+  CREATE_ERROR (FatalError, Error, "unknown FatalError");
+  CREATE_ERROR (OutOfMemoryError, FatalError, "OutOfMemoryError");
+  CREATE_ERROR (DevError, FatalError, "DevError");
+  CREATE_ERROR (RunTimeError, FatalError, "RunTimeError");
 
-CREATE_ERROR (RecoverableError, Error, "unknown RecoverableError");
-CREATE_ERROR (BadFDError, RecoverableError, "BadFDError");
+  CREATE_ERROR (RecoverableError, Error, "unknown RecoverableError");
+  CREATE_ERROR (BadFDError, RecoverableError, "BadFDError");
 
+}
 #endif /* __HIPRO_ASYCXX__ERROR_H__ */
 
 /*

Modified: trunk/src/Error.cxx
===================================================================
--- trunk/src/Error.cxx	2009-04-08 07:38:15 UTC (rev 36)
+++ trunk/src/Error.cxx	2009-04-08 07:39:05 UTC (rev 37)
@@ -22,6 +22,8 @@
 #include "asycxx-common.h"
 #include <asycxx/Error.h>
 
+using namespace asycxx;
+
 void
 Error::doError (const char *fmt, va_list vargs)
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.