Text archives Help

---

Author: sparker
Date: Tue Nov 27 07:30:54 2007
New Revision: 1871

Modified:
   trunk/Core/Thread/Thread_none.cc
   trunk/Core/Util/FancyAssert.h
Log:
Removed extra includes


Modified: trunk/Core/Thread/Thread_none.cc
==============================================================================
--- trunk/Core/Thread/Thread_none.cc    (original)
+++ trunk/Core/Thread/Thread_none.cc    Tue Nov 27 07:30:54 2007
@@ -48,8 +48,6 @@
 // This is brutal, but effective.  We want this file to have access
 // to the private members of Thread, without having to explicitly
 // declare friendships in the class.
-#include <sci_defs/bits_defs.h>
-
 #define private public
 #define protected public
 #include <Core/Thread/Thread.h>

Modified: trunk/Core/Util/FancyAssert.h
==============================================================================
--- trunk/Core/Util/FancyAssert.h       (original)
+++ trunk/Core/Util/FancyAssert.h       Tue Nov 27 07:30:54 2007
@@ -43,8 +43,6 @@
 #ifndef SCI_Containers_FancyAssert_h
 #define SCI_Containers_FancyAssert_h
 
-#include <sci_defs/error_defs.h>
-
 #include <Core/Exceptions/AssertionFailed.h>
 #include <sstream>
 
@@ -58,21 +56,21 @@
    if(c1 != c2){ \
       std::ostringstream msg; \
       msg << #c1 << "(value=" << c1 << ") == " << #c2 << "(value=" << c2 << 
")"; \
-      SCI_THROW(SCIRun::AssertionFailed(msg.str().c_str(), __FILE__, 
__LINE__)); \
+      SCI_THROW(AssertionFailed(msg.str().c_str(), __FILE__, __LINE__)); \
    }
 
 #define ASSERTNE(c1, c2) \
    if(c1 != c2){ \
       std::ostringstream msg; \
       msg << #c1 << "(value=" << c1 << ") != " << #c2 << "(value=" << c2 << 
")"; \
-      SCI_THROW(SCIRun::AssertionFailed(msg.str().c_str(), __FILE__, 
__LINE__)); \
+      SCI_THROW(AssertionFailed(msg.str().c_str(), __FILE__, __LINE__)); \
    }
 
 #define ASSERTRANGE(c, l, h) \
    if(c < l || c >= h){ \
       std::ostringstream msg; \
       msg << #l "(value=" << l << ") <= " #c << "(value=" << c << ") < " << 
#h << "(value=" << h << ")"; \
-      SCI_THROW(SCIRun::AssertionFailed(msg.str().c_str(), __FILE__, 
__LINE__)); \
+      SCI_THROW(AssertionFailed(msg.str().c_str(), __FILE__, __LINE__)); \
    }
 #else
 #define ASSERTEQ(c1, c2)

---

• [Manta] r1871 - in trunk/Core: Thread Util, sparker, 11/27/2007

---

Archive powered by MHonArc 2.6.16.