From de0befb6d7ba3d1e6bbc67ca9c86d04412f2fb08 Mon Sep 17 00:00:00 2001
From: "Steve M. Robbins" <smr@sumost.ca>
Date: Tue, 7 Aug 2001 14:48:10 +0000
Subject: Fixes to allow building with SGI MIPSpro 7.30 compiler. The testsuite
 file examples/cppunittest/SubclassedTestCase.cpp causes the compiler to dump
 core, so that and HelperMacrosTest were not tested.  The rest of the test
 suite passes.

---
 src/cppunit/Exception.cpp      | 4 ++--
 src/cppunit/TestAssert.cpp     | 6 +++++-
 src/cppunit/TestCase.cpp       | 1 -
 src/cppunit/TextTestResult.cpp | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/cppunit')

diff --git a/src/cppunit/Exception.cpp b/src/cppunit/Exception.cpp
index a1269ae..466e75a 100644
--- a/src/cppunit/Exception.cpp
+++ b/src/cppunit/Exception.cpp
@@ -10,7 +10,7 @@ const long Exception::UNKNOWNLINENUMBER = -1;
 
 
 /// Construct the exception
-Exception::Exception (const Exception& other) : exception (other)
+Exception::Exception (const Exception& other) : std::exception (other)
 { 
   m_message       = other.m_message; 
   m_lineNumber    = other.m_lineNumber;
@@ -38,7 +38,7 @@ Exception::~Exception () throw()
 Exception& 
 Exception::operator=( const Exception& other )
 { 
-  exception::operator= (other);
+  std::exception::operator= (other);
 
   if (&other != this) 
   {
diff --git a/src/cppunit/TestAssert.cpp b/src/cppunit/TestAssert.cpp
index 9d8a408..72d48d9 100644
--- a/src/cppunit/TestAssert.cpp
+++ b/src/cppunit/TestAssert.cpp
@@ -1,4 +1,8 @@
-#include <cmath>
+#if HAVE_CMATH
+#   include <cmath>
+#else
+#   include <math.h>
+#endif
 
 #include <cppunit/TestAssert.h>
 #include <cppunit/NotEqualException.h>
diff --git a/src/cppunit/TestCase.cpp b/src/cppunit/TestCase.cpp
index 9632e34..fc9269d 100644
--- a/src/cppunit/TestCase.cpp
+++ b/src/cppunit/TestCase.cpp
@@ -1,7 +1,6 @@
 #include <cppunit/Portability.h>
 #include <typeinfo>
 #include <stdexcept>
-#include <cmath>
 
 #include "cppunit/TestCase.h"
 #include "cppunit/Exception.h"
diff --git a/src/cppunit/TextTestResult.cpp b/src/cppunit/TextTestResult.cpp
index 0ef25e6..d04ce92 100644
--- a/src/cppunit/TextTestResult.cpp
+++ b/src/cppunit/TextTestResult.cpp
@@ -7,7 +7,7 @@
 namespace CppUnit {
 
 std::ostream& 
-CppUnit::operator<< (std::ostream& stream, TextTestResult& result)
+operator<< (std::ostream& stream, TextTestResult& result)
 { 
   result.print (stream); return stream; 
 }
-- 
cgit v1.2.1