|
From: <sv...@va...> - 2016-01-25 04:27:32
|
Author: bart
Date: Mon Jan 25 04:27:25 2016
New Revision: 15773
Log:
configure.ac: Port to gcc 5
Apparently gcc 5 behaves as follows:
$ gcc -dumpversion
5
Modified:
trunk/configure.ac
trunk/drd/tests/std_thread.cpp
trunk/drd/tests/std_thread2.cpp
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jan 25 04:27:25 2016
@@ -160,7 +160,7 @@
icc-1[[3-9]].*)
AC_MSG_RESULT([ok (ICC version ${gcc_version})])
;;
- notclang-[[3-9]].*|notclang-[[1-9][0-9]]*)
+ notclang-[[3-9]]|notclang-[[3-9]].*|notclang-[[1-9][0-9]]*)
AC_MSG_RESULT([ok (${gcc_version})])
;;
clang-2.9|clang-[[3-9]].*|clang-[[1-9][0-9]]*)
Modified: trunk/drd/tests/std_thread.cpp
==============================================================================
--- trunk/drd/tests/std_thread.cpp (original)
+++ trunk/drd/tests/std_thread.cpp Mon Jan 25 04:27:25 2016
@@ -21,6 +21,7 @@
return 0;
}
+#if defined(__GNUC__) && __GNUC__ -0 < 6
//
// From libstdc++-v3/src/c++11/thread.cc
//
@@ -65,3 +66,4 @@
}
}
}
+#endif
Modified: trunk/drd/tests/std_thread2.cpp
==============================================================================
--- trunk/drd/tests/std_thread2.cpp (original)
+++ trunk/drd/tests/std_thread2.cpp Mon Jan 25 04:27:25 2016
@@ -26,6 +26,7 @@
return 0;
}
+#if defined(__GNUC__) && __GNUC__ -0 < 6
//
// From libstdc++-v3/src/c++11/thread.cc
//
@@ -70,3 +71,4 @@
}
}
}
+#endif
|