From bf90c4cd8e91c2e3d6dbb25af5ca31fba535fde1 Mon Sep 17 00:00:00 2001 From: Paolo Carlini <paolo.carlini@oracle.com> Date: Fri, 12 Oct 2012 08:30:00 +0000 Subject: [PATCH] re PR c++/52744 (bad handling of member (function) pointers in template parameters) 2012-10-12 Paolo Carlini <paolo.carlini@oracle.com> PR c++/52744 * g++.dg/cpp0x/pr52744.C: New. From-SVN: r192392 --- gcc/testsuite/ChangeLog | 5 ++ gcc/testsuite/g++.dg/cpp0x/pr52744.C | 83 ++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/pr52744.C diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0612d04351fa..9f3d29906f9a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-10-12 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/52744 + * g++.dg/cpp0x/pr52744.C: New. + 2012-10-12 Janus Weil <janus@gcc.gnu.org> PR fortran/40453 diff --git a/gcc/testsuite/g++.dg/cpp0x/pr52744.C b/gcc/testsuite/g++.dg/cpp0x/pr52744.C new file mode 100644 index 000000000000..1a01fb2957f3 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr52744.C @@ -0,0 +1,83 @@ +// PR c++/52744 +// { dg-do compile { target c++11 } } + +struct T +{ + int a; + void b(){} + int c(int) + { + return 1; + } +}; + +template<typename CT, CT> struct member_helper; + +template<typename FT, FT(T::*mem)> +struct member_helper<FT(T::*), mem> +{ + static const char* worker() + { + return "for members"; + } +}; + +template<typename Return, typename... Args, Return(T::*fun)(Args...)> +struct member_helper<Return(T::*)(Args...), fun> +{ + static const char* worker() + { + return "for member functions returning non void"; + } +}; + +template<typename... Args, void(T::*fun)(Args...)> +struct member_helper<void(T::*)(Args...), fun> +{ + static const char* worker() + { + return "for member functions returning void"; + } +}; + +void member_test() +{ + member_helper<decltype(&T::a), &T::a>::worker(); + member_helper<decltype(&T::b), &T::b>::worker(); + member_helper<decltype(&T::c), &T::c>::worker(); +} + +typedef void lua_State; + +template<typename T, T> class function_helper +{ + static_assert(sizeof(T) != sizeof(T), + "Error: function_helper works with functions (duh)"); +}; + +template<typename Return, typename... Args, Return(*func)(Args...)> +struct function_helper<Return(*)(Args...), func> +{ + static int wrapper(lua_State* l) + { + return 1; + } +}; + +template<typename... Args, void(*func)(Args...)> +struct function_helper<void(*)(Args...), func> +{ + static int wrapper(lua_State* l) + { + return 0; + } +}; + +int ciao(int){ return 0; } +void ciao2(int){} + +void function_test() +{ + function_helper<decltype(&ciao), &ciao>::wrapper(0); + function_helper<decltype(&ciao2), &ciao2>::wrapper(0); +} -- GitLab