Update base::is_member_function_pointer to use variadic templates.

base/template_util_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/template_util.h"
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
@@ skipping 69 matching lines @@
 COMPILE_ASSERT(!is_member_function_pointer<int>::value,
                IsMemberFunctionPointer);
 COMPILE_ASSERT(!is_member_function_pointer<int*>::value,
                IsMemberFunctionPointer);
 COMPILE_ASSERT(!is_member_function_pointer<void*>::value,
                IsMemberFunctionPointer);
 COMPILE_ASSERT(!is_member_function_pointer<AStruct>::value,
                IsMemberFunctionPointer);
 COMPILE_ASSERT(!is_member_function_pointer<AStruct*>::value,
                IsMemberFunctionPointer);
+COMPILE_ASSERT(!is_member_function_pointer<void(*)()>::value,
+               IsMemberFunctionPointer);
 COMPILE_ASSERT(!is_member_function_pointer<int(*)(int)>::value,
                IsMemberFunctionPointer);
 COMPILE_ASSERT(!is_member_function_pointer<int(*)(int, int)>::value,
                IsMemberFunctionPointer);
 
 COMPILE_ASSERT(is_member_function_pointer<void (AStruct::*)()>::value,
                IsMemberFunctionPointer);
 COMPILE_ASSERT(is_member_function_pointer<void (AStruct::*)(int)>::value,
                IsMemberFunctionPointer);
 COMPILE_ASSERT(is_member_function_pointer<int (AStruct::*)(int)>::value,
                IsMemberFunctionPointer);
 COMPILE_ASSERT(is_member_function_pointer<int (AStruct::*)(int) const>::value,
                IsMemberFunctionPointer);
 COMPILE_ASSERT(is_member_function_pointer<int (AStruct::*)(int, int)>::value,
                IsMemberFunctionPointer);
-COMPILE_ASSERT(is_member_function_pointer<
-                 int (AStruct::*)(int, int) const>::value,
-               IsMemberFunctionPointer);
-COMPILE_ASSERT(is_member_function_pointer<
-                 int (AStruct::*)(int, int, int)>::value,
-               IsMemberFunctionPointer);
-COMPILE_ASSERT(is_member_function_pointer<
-                 int (AStruct::*)(int, int, int) const>::value,
-               IsMemberFunctionPointer);
-COMPILE_ASSERT(is_member_function_pointer<
-                 int (AStruct::*)(int, int, int, int)>::value,
-               IsMemberFunctionPointer);
-COMPILE_ASSERT(is_member_function_pointer<
-                 int (AStruct::*)(int, int, int, int) const>::value,
-               IsMemberFunctionPointer);
-
-// False because we don't have a specialization for 5 params yet.
-COMPILE_ASSERT(!is_member_function_pointer<
-                 int (AStruct::*)(int, int, int, int, int)>::value,
-               IsMemberFunctionPointer);
-COMPILE_ASSERT(!is_member_function_pointer<
-                 int (AStruct::*)(int, int, int, int, int) const>::value,
-               IsMemberFunctionPointer);

[Nico, 2014/09/25 22:19:11]

maybe keep this one (without "!")

[Aaron Boodman, 2014/09/25 22:34:41]

But there's no reason now based on how this works that you'd expect it to be
different than the two argument case, which is already covered above.

 
 }  // namespace
 }  // namespace base