summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-04-30 13:42:00 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-04-30 13:42:00 (GMT)
commit8535d4cf5dbe1f48a7da7bece7e435a2bd412eee (patch)
tree1d777bb9a49e9a8f95efff1e8ab36aba1e3f7ec8 /Tests
parenta676ced3464cb7bea7b26f9f2bf235f0e70c4145 (diff)
parenta36b957fc4594264965a86b54e5eab40520cf79d (diff)
downloadCMake-8535d4cf5dbe1f48a7da7bece7e435a2bd412eee.zip
CMake-8535d4cf5dbe1f48a7da7bece7e435a2bd412eee.tar.gz
CMake-8535d4cf5dbe1f48a7da7bece7e435a2bd412eee.tar.bz2
Merge topic 'cxx98-features'
a36b957f Features: Add cxx_template_template_parameters.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CompileFeatures/cxx_template_template_parameters.cpp18
-rw-r--r--Tests/SystemInformation/SystemInformation.in1
2 files changed, 19 insertions, 0 deletions
diff --git a/Tests/CompileFeatures/cxx_template_template_parameters.cpp b/Tests/CompileFeatures/cxx_template_template_parameters.cpp
new file mode 100644
index 0000000..0fdd18d
--- /dev/null
+++ b/Tests/CompileFeatures/cxx_template_template_parameters.cpp
@@ -0,0 +1,18 @@
+
+template<template <typename> class T, typename U>
+void someFunc(T<U>)
+{
+
+}
+
+template<typename T>
+struct A
+{
+
+};
+
+void otherFunc()
+{
+ A<int> a;
+ someFunc(a);
+}
diff --git a/Tests/SystemInformation/SystemInformation.in b/Tests/SystemInformation/SystemInformation.in
index 954a2fe..9966e8d 100644
--- a/Tests/SystemInformation/SystemInformation.in
+++ b/Tests/SystemInformation/SystemInformation.in
@@ -26,6 +26,7 @@ CMAKE_CXX11_STANDARD_COMPILE_OPTION == "${CMAKE_CXX11_STANDARD_COMPILE_OPTION}"
CMAKE_CXX98_EXTENSION_COMPILE_OPTION == "${CMAKE_CXX98_EXTENSION_COMPILE_OPTION}"
CMAKE_CXX11_EXTENSION_COMPILE_OPTION == "${CMAKE_CXX11_EXTENSION_COMPILE_OPTION}"
CMAKE_CXX_COMPILE_FEATURES == "${CMAKE_CXX_COMPILE_FEATURES}"
+CMAKE_CXX98_COMPILE_FEATURES == "${CMAKE_CXX98_COMPILE_FEATURES}"
CMAKE_CXX11_COMPILE_FEATURES == "${CMAKE_CXX11_COMPILE_FEATURES}"
// C shared library flag