[med-svn] [mia] 01/04: Add patch to fix compilation with BOOST 1.60

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository mia.

commit 6a4b20465f6d27ace428ab971ca84196eec0b1ef
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Tue Apr 26 15:24:18 2016 +0000

    Add patch to fix compilation with BOOST 1.60
---
 debian/patches/03_fix-boost1.60_mia-2.2.7.patch | 123 ++++++++++++++++++++++++
 debian/patches/series                           |   1 +
 2 files changed, 124 insertions(+)

diff --git a/debian/patches/03_fix-boost1.60_mia-2.2.7.patch b/debian/patches/03_fix-boost1.60_mia-2.2.7.patch
new file mode 100644
index 0000000..dfb6369
--- /dev/null
+++ b/debian/patches/03_fix-boost1.60_mia-2.2.7.patch
@@ -0,0 +1,123 @@
+Description: BOOST_MESSAGE has been renamed in BOOST_TEST_MESSAGE now.
+Author: Gianfranco Costamagna <locutusofborg at debian.org>
+
+--- a/mia/3d/test_nonrigidregister.cc
++++ b/mia/3d/test_nonrigidregister.cc
+@@ -36,7 +36,7 @@
+ 
+ BOOST_AUTO_TEST_CASE ( test_nothing ) 
+ {
+-	BOOST_MESSAGE("This is a placeholder"); 
++	BOOST_TEST_MESSAGE("This is a placeholder"); 
+ }
+ 
+ #if 0
+--- a/mia/3d/test_vector.cc
++++ b/mia/3d/test_vector.cc
+@@ -119,7 +119,7 @@
+ 		BOOST_FAIL("error value not detected");
+ 	}
+ 	catch (invalid_argument& x) {
+-		BOOST_MESSAGE(string("Caught:") + string(x.what()));
++		BOOST_TEST_MESSAGE(string("Caught:") + string(x.what()));
+ 	}
+ }
+ 
+@@ -144,7 +144,7 @@
+ 		BOOST_FAIL("error value not detected");
+ 	}
+ 	catch (invalid_argument& x) {
+-		BOOST_MESSAGE(string("Caught:") + string(x.what()));
++		BOOST_TEST_MESSAGE(string("Caught:") + string(x.what()));
+ 	}
+ }
+ 
+--- a/mia/core/test_cmdlineparser.cc
++++ b/mia/core/test_cmdlineparser.cc
+@@ -77,7 +77,7 @@
+ 		BOOST_FAIL("error value not detected");
+ 	}
+ 	catch (invalid_argument& x) {
+-		BOOST_MESSAGE(string("Caught:") + string(x.what()));
++		BOOST_TEST_MESSAGE(string("Caught:") + string(x.what()));
+ 	}
+ }
+ 
+@@ -161,7 +161,7 @@
+ 		BOOST_FAIL("error value not detected");
+ 	}
+ 	catch (invalid_argument& x) {
+-		BOOST_MESSAGE(string("Caught:") + string(x.what()));
++		BOOST_TEST_MESSAGE(string("Caught:") + string(x.what()));
+ 	}
+ }
+ 
+@@ -187,7 +187,7 @@
+ 		BOOST_FAIL("error value not detected");
+ 	}
+ 	catch (invalid_argument& x) {
+-		BOOST_MESSAGE(string("Caught:") + string(x.what()));
++		BOOST_TEST_MESSAGE(string("Caught:") + string(x.what()));
+ 	}
+ }
+ 
+@@ -295,7 +295,7 @@
+ 	BOOST_CHECK_EQUAL(olist.parse(options.size(), (const char**)&options[0], "remaining"),  CCmdOptionList::hr_no);
+ 
+ 	for(auto i = olist.get_remaining().begin(); i != olist.get_remaining().end(); ++i)
+-		BOOST_MESSAGE(*i);
++		BOOST_TEST_MESSAGE(*i);
+ 
+ 	BOOST_CHECK_EQUAL(int_value1,12);
+ 	BOOST_CHECK_EQUAL(int_value2,13);
+--- a/mia/core/test_core.cc
++++ b/mia/core/test_core.cc
+@@ -64,7 +64,7 @@
+ 		BOOST_FAIL("'this-file-should-not-exist.11111' was opened for reading");
+ 	}
+ 	catch (runtime_error& x) {
+-		BOOST_MESSAGE(string("caught an expected exception:") + x.what());
++		BOOST_TEST_MESSAGE(string("caught an expected exception:") + x.what());
+ 	}
+ 
+ 	try {
+@@ -73,7 +73,7 @@
+ 	}
+ 
+ 	catch (runtime_error& x) {
+-		BOOST_MESSAGE(string("caught an expected exception:") + x.what());
++		BOOST_TEST_MESSAGE(string("caught an expected exception:") + x.what());
+ 	}
+ }
+ 
+--- a/mia/core/test_optparam.cc
++++ b/mia/core/test_optparam.cc
+@@ -125,7 +125,7 @@
+ 	}
+ 	catch (invalid_argument& x) {
+ 		// it should throw ...
+-		BOOST_MESSAGE(x.what());
++		BOOST_TEST_MESSAGE(x.what());
+ 	}
+ 
+ }
+@@ -140,7 +140,7 @@
+ 	}
+ 	catch (invalid_argument& x) {
+ 		// it should throw ...
+-		BOOST_MESSAGE(x.what());
++		BOOST_TEST_MESSAGE(x.what());
+ 	}
+ }
+ 
+--- a/cmake/macros.cmake
++++ b/cmake/macros.cmake
+@@ -210,7 +210,7 @@
+ 
+   MIA_EXE_CREATE_DOCU_AND_INTERFACE(mia ${name})
+   ADD_DEPENDENCIES(mia-${name} plugin_test_links)
+-  ADD_TEST(${name} mia-${name} --selftest)
++  ADD_TEST(${name} mia-${name} -- --selftest)
+ ENDMACRO(DEFCHKEXE)
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index adb8975..10e9a0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_spellcheck_corrections.patch
 02_accumulate-not-declared-mia-2.2.7.patch
+03_fix-boost1.60_mia-2.2.7.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mia.git