1 files changed, 35 insertions, 39 deletions
diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h
index 02d2adba199..c834907c00f 100644
--- a/cpp/test/include/TestCommon.h
+++ b/cpp/test/include/TestCommon.h
@@ -19,10 +19,6 @@
 
 #include <cstdlib>
 
-#ifdef __BCPLUSPLUS__
-#include <stdlib.h>
-#endif
-
 void 
 inline print(const std::string& msg)
 {
@@ -168,41 +164,41 @@ int mainEntryPoint(int, char**);
 
 }
 
-class TestFailedException : public ::Ice::LocalException
-{
-public:
-
-    TestFailedException(const char* file, int line) : 
-        LocalException(file, line)
-    {
-    }
-
-    TestFailedException(const char* file, int line, const ::std::string& r) :
-        LocalException(file, line),
-        reason(r)
-    {
-    }
-
-    virtual ~TestFailedException() throw()
-    {
-    }
-
-    virtual ::std::string ice_name() const
-    {
-        return "::TestFailedException";
-    }
-
-    virtual ::Ice::Exception* ice_clone() const
-    {
-        return new TestFailedException(*this);
-    }
-
-    virtual void ice_throw() const
-    {
-        throw *this;
-    }
-
-    ::std::string reason;
+class TestFailedException : public ::Ice::LocalException
+{
+public:
+
+    TestFailedException(const char* file, int line) : 
+        LocalException(file, line)
+    {
+    }
+
+    TestFailedException(const char* file, int line, const ::std::string& r) :
+        LocalException(file, line),
+        reason(r)
+    {
+    }
+
+    virtual ~TestFailedException() throw()
+    {
+    }
+
+    virtual ::std::string ice_name() const
+    {
+        return "::TestFailedException";
+    }
+
+    virtual ::Ice::Exception* ice_clone() const
+    {
+        return new TestFailedException(*this);
+    }
+
+    virtual void ice_throw() const
+    {
+        throw *this;
+    }
+
+    ::std::string reason;
 };
 
 void