fixed some non-explicit conversions, so that make distcheck runs on mac yosemite
This commit is contained in:
@@ -51,14 +51,14 @@ public:
|
||||
CPPUNIT_ASSERT_EQUAL(-1, (mrw::AutoFile::Type)a); // init as -1
|
||||
i = a = open((std::string(mrw::ifelse(getenv("srcdir"), "."))
|
||||
+"/test.dat").c_str(), O_RDONLY);
|
||||
CPPUNIT_ASSERT(i==a && a>0); // file is now open
|
||||
CPPUNIT_ASSERT(i==(int)a && (int)a>0); // file is now open
|
||||
mrw::AutoFile b(a);
|
||||
CPPUNIT_ASSERT(a==-1 && i==b); // b has taken ownership
|
||||
CPPUNIT_ASSERT((int)a==-1 && i==(int)b); // b has taken ownership
|
||||
CPPUNIT_ASSERT(read(b, &c, 1)==1 && c=='H'); // file is good
|
||||
mrw::AutoFile cc(i);
|
||||
CPPUNIT_ASSERT(i==b && b==cc); // ooops, two owner!
|
||||
CPPUNIT_ASSERT(i==(int)b && (int)b==(int)cc); // ooops, two owner!
|
||||
cc.release();
|
||||
CPPUNIT_ASSERT(i==b && cc==-1); // it's ok now
|
||||
CPPUNIT_ASSERT(i==(int)b && (int)cc==-1); // it's ok now
|
||||
b = open("test.dat", O_RDONLY);
|
||||
//close(i);
|
||||
CPPUNIT_ASSERT_EQUAL((ssize_t)-1, read(i, &c, 1)); // old file is closed
|
||||
|
@@ -39,7 +39,6 @@
|
||||
|
||||
*/
|
||||
#include <mrw/exec.hxx>
|
||||
#include <mrw/stacktrace.hxx>
|
||||
#include <mrw/stdext.hxx>
|
||||
#include <cppunit/TestFixture.h>
|
||||
#include <cppunit/ui/text/TestRunner.h>
|
||||
|
@@ -28,7 +28,6 @@
|
||||
#include <mrw/map.hxx>
|
||||
#include <mrw/multiset.hxx>
|
||||
#include <mrw/multimap.hxx>
|
||||
#include <mrw/stacktrace.hxx>
|
||||
#include <mrw/stdext.hxx>
|
||||
#include <cppunit/TestFixture.h>
|
||||
#include <cppunit/ui/text/TestRunner.h>
|
||||
@@ -154,7 +153,6 @@ class StdExtTest: public CppUnit::TestFixture {
|
||||
try {
|
||||
s<<1<<2<<3<<4<<5<<6<<7<<8<<8;
|
||||
} catch (mrw::invalid_argument& e) {
|
||||
mrw::StackTrace::createSymtable();
|
||||
exc=true;
|
||||
}
|
||||
CPPUNIT_ASSERT(exc);
|
||||
|
Reference in New Issue
Block a user