Changeset 2260

Timestamp:

09/14/05 18:06:41 (5 years ago)

Author:

plasmahh

Message:

no boost errors

Location:

trunk/core

Files:

• include/conditional.h (modified) (2 diffs, 1 prop)
• include/exceptions.h (modified) (2 diffs, 1 prop)
• include/socketset.h (modified) (2 diffs, 1 prop)
• include/utility.h (modified) (2 diffs, 1 prop)
• src/exceptions.cpp (modified) (1 diff, 1 prop)
• src/socketset.cpp (modified) (2 diffs, 1 prop)

trunk/core/include/conditional.h

@@ -30 +30 @@
 #endif
 
+extern "C" {
 #ifndef HAVE_CLOCK_GETTIME
-extern "C" {
 #include <iwear/clock_gettime.h>
+#endif
+#include <unistd.h>
+#include <errno.h>
 }
-#endif
 
 #include <cmath>
@@ -122 +124 @@
 /**
  * $Log$
+ * Revision 1.5  2005/09/14 16:06:41  plasmahh
+ * no boost errors
+ *
  * Revision 1.4  2005/08/10 21:57:23  plasmahh
  * changed all include guards to include directory to not clash with other libraries... work to do :)

trunk/core/include/exceptions.h

@@ -517 +517 @@
         : chained_error(wht,ce), chan(ch),err(er) { }
     virtual ~protocol_error() throw () { }
+
+    virtual void output_additional( ostream& o ) const
+    {
+        o << ANSI_BLUE << "Occured on Channel: " << ANSI_GREEN << chan << endl;
+        o << ANSI_BLUE << "Error Code: " << ANSI_CYAN << err << endl;
+    }
+};
+
+class remote_error: public iwruntime_error
+{
+public:
+    explicit remote_error( const string& wht ) : iwruntime_error(wht) { }
+    virtual ~remote_error() throw() { }
 };
 
@@ -631 +644 @@
 /**
  * $Log$
+ * Revision 1.47  2005/09/14 16:06:41  plasmahh
+ * no boost errors
+ *
  * Revision 1.46  2005/09/13 16:17:01  plasmahh
  * added mutex timeouts

trunk/core/include/socketset.h

@@ -59 +59 @@
     void remove( const SocketConnection& );
 
+    map<int,SocketConnection*>::size_type size( void ) { return fdmap.size(); }
+
     /**
      * This returns a vector consisting of all the SocketConnections that are
@@ -73 +75 @@
 /**
  * $Log$
+ * Revision 1.5  2005/09/14 16:06:41  plasmahh
+ * no boost errors
+ *
  * Revision 1.4  2005/08/10 21:57:23  plasmahh
  * changed all include guards to include directory to not clash with other libraries... work to do :)

trunk/core/include/utility.h

@@ -186 +186 @@
                      : 8) : 7) : 6) : 5) : 4) : 3) : 2) : 1) : 0)
 
-#define P1 /** This has passed Phase 1 check */ 
-#define P2 /** This has passed Phase 2 check */ 
-#define P3 /** This has passed Phase 3 check */ 
-#define P4 /** This has passed Phase 4 check */ 
-#define P5 /** This has passed Phase 5 check */ 
-#define P6 /** This has passed Phase 6 check */ 
+#define PH1 /** This has passed Phase 1 check */ 
+#define PH2 /** This has passed Phase 2 check */ 
+#define PH3 /** This has passed Phase 3 check */ 
+#define PH4 /** This has passed Phase 4 check */ 
+#define PH5 /** This has passed Phase 5 check */ 
+#define PH6 /** This has passed Phase 6 check */ 
 
 #define P1CLEAR BuildPhase::check(1);
@@ -520 +520 @@
 /**
  * $Log$
+ * Revision 1.56  2005/09/14 16:06:41  plasmahh
+ * no boost errors
+ *
  * Revision 1.55  2005/09/08 19:55:13  plasmahh
  * buildphase debug stuff adde

trunk/core/src/exceptions.cpp

@@ -77 +77 @@
     backt = bs.str();
 
-    backt += iwexception::backtrace();
+//    backt += iwexception::backtrace();
 }
 

trunk/core/src/socketset.cpp

@@ -126 +126 @@
             }
         case 0:
-            d_dbg << "ret contains " << ret.size()  << " entries " << endl;
+//          d_dbg << "ret contains " << ret.size()  << " entries " << endl;
             return ret;
     }
@@ -135 +135 @@
 /**
  * $Log$
+ * Revision 1.6  2005/09/14 16:06:41  plasmahh
+ * no boost errors
+ *
  * Revision 1.5  2005/09/13 16:17:01  plasmahh
  * added mutex timeouts