diff --git a/ChangeLog b/ChangeLog index 7158259..92d3ad5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2015-05-05 18:43 marc + + * configure.ac: need to do a minor update due to least modulo 256 + +2015-05-05 17:43 marc + + * test/makefile.am: fixed dependency in bug + +2015-05-04 12:54 marc + + * ChangeLog, configure.ac: Mac sh has no echo -n + 2015-05-04 12:11 marc * configure.ac: on Mac, LEAST cannot be larger than 255 diff --git a/doc/makefile.am b/doc/makefile.am index 4ff26f8..631e906 100644 --- a/doc/makefile.am +++ b/doc/makefile.am @@ -29,7 +29,7 @@ endif # mv latex/refman.pdf @PACKAGE_NAME@-@PACKAGE_VERSION@.pdf CLEANFILES = doxygen.errors @PACKAGE_NAME@-@PACKAGE_VERSION@.pdf -DISTCLEANFILES = @PACKAGE_NAME@.doxytag +DISTCLEANFILES = @PACKAGE_NAME@.doxytag debug.txt MAINTAINERCLEANFILES = makefile.in distclean-local: diff --git a/src/mrw/auto.hxx b/src/mrw/auto.hxx index 6967c4c..7eabea1 100644 --- a/src/mrw/auto.hxx +++ b/src/mrw/auto.hxx @@ -82,7 +82,7 @@ namespace mrw { typedef mrw::AutoResource AutoBfd; template class Auto { public: - typedef mrw::AutoResource Free; + typedef mrw::AutoResource Free; }; @endcode @param RESOURCE_TYPE type of the resource to manage @@ -97,7 +97,7 @@ namespace mrw { typename FUNCTION_PTR, FUNCTION_PTR FREE_FUNCTION, typename INITIAL_VALUE_TYPE = RESOURCE_TYPE, - INITIAL_VALUE_TYPE INITIAL_VALUE = 0, + INITIAL_VALUE_TYPE INITIAL_VALUE = (INITIAL_VALUE_TYPE)0, typename FREE_TYPE = RESOURCE_TYPE> class AutoResource { public: @@ -436,7 +436,7 @@ namespace mrw { */ template class Auto { public: - typedef mrw::AutoResource Free; + typedef mrw::AutoResource Free; private: /** @internal work around compiler warning: diff --git a/test/auto_test.cxx b/test/auto_test.cxx index 6f1b79a..309f9c8 100644 --- a/test/auto_test.cxx +++ b/test/auto_test.cxx @@ -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 diff --git a/test/exec_test.cxx b/test/exec_test.cxx index b3e43c1..80b9c9e 100644 --- a/test/exec_test.cxx +++ b/test/exec_test.cxx @@ -39,7 +39,6 @@ */ #include -#include #include #include #include diff --git a/test/stdext_test.cxx b/test/stdext_test.cxx index 7cde639..32ad380 100644 --- a/test/stdext_test.cxx +++ b/test/stdext_test.cxx @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -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);