Exclude duplicate gmock_mutant functor templates in WIN64

testing/generate_gmock_mutant.py

Index: testing/generate_gmock_mutant.py
diff --git a/testing/generate_gmock_mutant.py b/testing/generate_gmock_mutant.py
index 5920b52374b60b351ff0443a540721d7476ffab0..a7ace9c86ff57654f85b3dfb064831db801e8f41 100755
--- a/testing/generate_gmock_mutant.py
+++ b/testing/generate_gmock_mutant.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2013 The Chromium Authors. All rights reserved.

[DaleCurtis, 2013/02/05 21:07:38]

We don't update copyright date on changes anymore.

[wolenetz, 2013/02/05 21:38:46]

Done.

 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -7,7 +7,7 @@ import string
 import sys
 
 HEADER = """\
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.

[DaleCurtis, 2013/02/05 21:07:38]

This one is probably okay.

[wolenetz, 2013/02/05 21:38:46]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -417,8 +417,10 @@ def GenerateCreateFunctor(prebound, calltime):
   print "#endif  // GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING\n"
 
   # OS_WIN specific. Same functors but with stdcall calling conventions.
+  # These are not for WIN64 (x86_64) because there is only one calling
+  # convention in WIN64.
   # Functor for method with __stdcall calling conventions.
-  print "#if defined (OS_WIN)"
+  print "#if defined (OS_WIN) and !defined (ARCH_CPU_X86_64)"

[DaleCurtis, 2013/02/05 21:07:38]

s/and/&&/

[wolenetz, 2013/02/05 21:38:46]

Whoops!  Thanks for catching this.

   stdcall_method = CREATE_METHOD_FUNCTOR_TEMPLATE
   stdcall_method = stdcall_method.replace("U::", "__stdcall U::")
   stdcall_method = FixCode(stdcall_method % args)
@@ -435,7 +437,7 @@ def GenerateCreateFunctor(prebound, calltime):
   stdcall2 = stdcall2.replace(" " * 17 + "Tuple", " " * 31 + "Tuple")
   print stdcall2
   print "#endif  // GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING"
-  print "#endif  // OS_WIN\n"
+  print "#endif  // defined (OS_WIN) and !defined (ARCH_CPU_X86_64)\n"

[DaleCurtis, 2013/02/05 21:07:38]

Ditto.

[wolenetz, 2013/02/05 21:38:46]

Done.

 
 
 def main():