Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141196
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/141196
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/unit_tests/memory_manager.cpp'
--- src/unit_tests/memory_manager.cpp 2012-09-19 21:16:15 +0000
+++ src/unit_tests/memory_manager.cpp 2012-12-24 02:56:21 +0000
@@ -39,20 +39,20 @@
#define ASSERT_TRUE( EXPR ) assert_true( #EXPR, testName, !!(EXPR) )
#define ASSERT_EXCEPTION( EXPR, EXCEPTION ) \
- try { EXPR; assert_true( #EXPR, testName, false); } \
+ try { EXPR; assert_true( #EXPR, testName, false ); } \
catch (EXCEPTION const& ) { } \
- catch ( std::exception const &e ){ print_exception( #EXPR, testName, e ); } \
- catch ( ... ) { assert_true ( #EXPR, testName, false ); }
+ catch ( std::exception const &e ) { print_exception( #EXPR, testName, e ); } \
+ catch ( ... ) { assert_true( #EXPR, testName, false ); }
#define ASSERT_NO_EXCEPTION( EXPR ) \
- try {EXPR; } \
- catch ( std::exception const &e ){ print_exception( #EXPR, testName, e ); } \
- catch ( ... ) { assert_true (#EXPR, testName, false ); }
+ try { EXPR; } \
+ catch ( std::exception const &e ) { print_exception( #EXPR, testName, e ); } \
+ catch ( ... ) { assert_true( #EXPR, testName, false ); }
#define ASSERT_TRUE_AND_NO_EXCEPTION( EXPR ) \
try { ASSERT_TRUE ( EXPR ); } \
catch ( std::exception const &e ) { print_exception( #EXPR, testName, e ); } \
- catch ( ... ) {assert_true( #EXPR, testName, false ); }
+ catch ( ... ) { assert_true( #EXPR, testName, false ); }
#define TEST( TESTNAME ) \
static void TESTNAME () { \
=== modified file 'src/unit_tests/test_base64.cpp'
--- src/unit_tests/test_base64.cpp 2012-09-19 21:16:15 +0000
+++ src/unit_tests/test_base64.cpp 2012-12-24 02:56:21 +0000
@@ -53,11 +53,13 @@
#define ASSERT_NO_EXCEPTION( NO, EXPR ) \
try { EXPR; } \
- catch ( std::exception const &e ) { print_exception( NO, #EXPR, __LINE__, e ); }
+ catch ( exception const &e ) { print_exception( NO, #EXPR, __LINE__, e ); } \
+ catch ( ... ) { assert_true( NO, #EXPR, __LINE__, false ); }
#define ASSERT_EXCEPTION( NO, EXPR, EXCEPTION ) \
try { EXPR; assert_true( NO, #EXPR, __LINE__, false ); } \
- catch ( EXCEPTION const& ) { }
+ catch ( EXCEPTION const& ) { } \
+ catch ( ... ) { assert_true( NO, #EXPR, __LINE__, false ); }
///////////////////////////////////////////////////////////////////////////////}
=== modified file 'src/unit_tests/test_base64_streambuf.cpp'
--- src/unit_tests/test_base64_streambuf.cpp 2012-06-15 17:01:01 +0000
+++ src/unit_tests/test_base64_streambuf.cpp 2012-12-24 02:56:21 +0000
@@ -51,7 +51,8 @@
#define ASSERT_TRUE_AND_NO_EXCEPTION( NO, EXPR ) \
try { ASSERT_TRUE( NO, EXPR ); } \
- catch ( std::exception const &e ) { print_exception( NO, #EXPR, __LINE__, e ); }
+ catch ( exception const &e ) { print_exception( NO, #EXPR, __LINE__, e ); } \
+ catch ( ... ) { assert_true( NO, #EXPR, __LINE__, false ); }
///////////////////////////////////////////////////////////////////////////////
=== modified file 'src/unit_tests/test_icu_streambuf.cpp'
--- src/unit_tests/test_icu_streambuf.cpp 2012-09-19 21:16:15 +0000
+++ src/unit_tests/test_icu_streambuf.cpp 2012-12-24 02:56:21 +0000
@@ -71,7 +71,8 @@
#define ASSERT_TRUE_AND_NO_EXCEPTION( NO, EXPR ) \
try { ASSERT_TRUE( NO, EXPR ); } \
- catch ( std::exception const &e ) { print_exception( NO, #EXPR, __LINE__, e ); }
+ catch ( exception const &e ) { print_exception( NO, #EXPR, __LINE__, e ); } \
+ catch ( ... ) { assert_true( NO, #EXPR, __LINE__, false ); }
///////////////////////////////////////////////////////////////////////////////
=== modified file 'src/unit_tests/test_json_parser.cpp'
--- src/unit_tests/test_json_parser.cpp 2012-09-19 21:16:15 +0000
+++ src/unit_tests/test_json_parser.cpp 2012-12-24 02:56:21 +0000
@@ -55,7 +55,8 @@
#define ASSERT_EXCEPTION( EXPR, EXCEPTION ) \
try { EXPR; assert_true( #EXPR, __LINE__, false ); } \
- catch ( EXCEPTION const& ) { }
+ catch ( EXCEPTION const& ) { } \
+ catch ( ... ) { assert_true( #EXPR, __LINE__, false ); }
#define ASSERT_NO_EXCEPTION( EXPR ) \
try { EXPR; } \
=== modified file 'src/unit_tests/test_string.cpp'
--- src/unit_tests/test_string.cpp 2012-09-19 21:16:15 +0000
+++ src/unit_tests/test_string.cpp 2012-12-24 02:56:21 +0000
@@ -82,7 +82,8 @@
#define ASSERT_EXCEPTION( EXPR, EXCEPTION ) \
try { EXPR; assert_true( #EXPR, __LINE__, false ); } \
- catch ( EXCEPTION const& ) { }
+ catch ( EXCEPTION const& ) { } \
+ catch ( ... ) { assert_true( #EXPR, __LINE__, false ); }
#define ASSERT_NO_EXCEPTION( EXPR ) \
try { EXPR; } \
=== modified file 'src/unit_tests/test_unordered_map.cpp'
--- src/unit_tests/test_unordered_map.cpp 2012-12-05 02:14:31 +0000
+++ src/unit_tests/test_unordered_map.cpp 2012-12-24 02:56:21 +0000
@@ -53,7 +53,8 @@
#define ASSERT_EXCEPTION( EXPR, EXCEPTION ) \
try { EXPR; assert_true( #EXPR, __LINE__, false ); } \
- catch ( EXCEPTION const& ) { }
+ catch ( EXCEPTION const& ) { } \
+ catch ( ... ) { assert_true( #EXPR, __LINE__, false ); }
///////////////////////////////////////////////////////////////////////////////
=== modified file 'src/util/icu_streambuf.h'
--- src/util/icu_streambuf.h 2012-09-19 21:16:15 +0000
+++ src/util/icu_streambuf.h 2012-12-24 02:56:21 +0000
@@ -38,7 +38,7 @@
* is.ios::rdbuf( &xbuf );
* \endcode
* Note that the %icu_streambuf must exist for as long as it's being used by
- * the stream. If you are replacing the streabuf for a stream you did not
+ * the stream. If you are replacing the streambuf for a stream you did not
* create, you should set it back to the original streambuf:
* \code
* void f( ostream &os ) {
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
