diff options
author | Brad King <brad.king@kitware.com> | 2018-03-16 11:53:36 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-03-16 11:53:36 (GMT) |
commit | 4e9aa8015842758ccfadd694723c7b6c705b9745 (patch) | |
tree | 08b241c8ca0ddd57e7e80568820269c1f1be16d3 /Tests | |
parent | df27bd3f83f3854df24bce9b0a57b425b0396585 (diff) | |
parent | fc96d99c3efae369f60db6f13cb1610121563d7f (diff) | |
download | CMake-4e9aa8015842758ccfadd694723c7b6c705b9745.zip CMake-4e9aa8015842758ccfadd694723c7b6c705b9745.tar.gz CMake-4e9aa8015842758ccfadd694723c7b6c705b9745.tar.bz2 |
Merge branch 'intel-initializer-list' into release-3.11
Merge-request: !1855
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CompileFeatures/cxx_generalized_initializers.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Tests/CompileFeatures/cxx_generalized_initializers.cpp b/Tests/CompileFeatures/cxx_generalized_initializers.cpp index cfe9d98..0df0a33 100644 --- a/Tests/CompileFeatures/cxx_generalized_initializers.cpp +++ b/Tests/CompileFeatures/cxx_generalized_initializers.cpp @@ -11,11 +11,17 @@ class initializer_list const _E* __begin_; size_t __size_; +#ifdef __INTEL_COMPILER + // The Intel compiler internally asserts the constructor overloads, so + // reproduce the constructor used in its <initializer_list> header. + initializer_list(const _E*, size_t) {} +#else public: template <typename T1, typename T2> initializer_list(T1, T2) { } +#endif }; } |