diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-09-16 14:34:27 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-09-16 14:34:27 +0000 |
commit | d4da1f3407b714be627604f16425adacf1651ed3 (patch) | |
tree | 7dfb5718c4df42066dba9bc6a937ce110f71c250 | |
parent | cc5ad53e81046216dcdfdffa59d25406fb98a160 (diff) | |
download | ATCD-d4da1f3407b714be627604f16425adacf1651ed3.tar.gz |
Mon Sep 16 14:34:32 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Compiler_Features_24_Test.cpp:
Removed g++ specific code, that is really a GCC bug, see
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50370
-rw-r--r-- | ACE/ChangeLog | 6 | ||||
-rw-r--r-- | ACE/tests/Compiler_Features_24_Test.cpp | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1b07ddc1cc1..9fd89382613 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Sep 16 14:34:32 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Compiler_Features_24_Test.cpp: + Removed g++ specific code, that is really a GCC bug, see + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50370 + Mon Sep 16 10:48:29 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Compiler_Features_24_Test.cpp: diff --git a/ACE/tests/Compiler_Features_24_Test.cpp b/ACE/tests/Compiler_Features_24_Test.cpp index 7dd5d9fe4be..1bf109e0c0f 100644 --- a/ACE/tests/Compiler_Features_24_Test.cpp +++ b/ACE/tests/Compiler_Features_24_Test.cpp @@ -44,14 +44,7 @@ private: shared_ptr_type stub_; }; -#if defined (__GNUC__) -// g++ allows a redeclaration of the default -template<typename T, - typename = typename std::enable_if< - std::is_base_of<T_base, T>::value>::type, typename ...Args> -#else template<typename T, typename, typename ...Args> -#endif inline o_r<T> make_f(Args&& ...args) { return o_r<T> (new T (std::forward<Args> (args)...)); @@ -70,6 +63,8 @@ o_t<A>::ref_type create () return make_f<A>(); } +class B {}; + int run_main (int, ACE_TCHAR *[]) { @@ -79,6 +74,9 @@ run_main (int, ACE_TCHAR *[]) ACE_TEXT ("Compiler Feature 24 Test does compile and run.\n"))); o_r<A> l = create(); + o_r<A> l2 = make_f<A>(); + // next line doesn't compile and shouldn't + //o_r<B> l3 = make_f<B>(); ACE_END_TEST; |