Removes some gmock internal macros; sorts the file lists in Makefile.am; picks up gtest r454.

7 files changed, 60 insertions, 67 deletions

diff --git a/Makefile.am b/Makefile.am
index e2a46730..2d967dcc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,16 +29,17 @@ lib_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la
 
 lib_libgmock_la_SOURCES = src/gmock-all.cc
 
-pkginclude_HEADERS = include/gmock/gmock.h \
-                     include/gmock/gmock-actions.h \
-                     include/gmock/gmock-cardinalities.h \
-                     include/gmock/gmock-generated-actions.h \
-                     include/gmock/gmock-generated-function-mockers.h \
-                     include/gmock/gmock-generated-matchers.h \
-                     include/gmock/gmock-generated-nice-strict.h \
-                     include/gmock/gmock-matchers.h \
-                     include/gmock/gmock-more-actions.h \
-                     include/gmock/gmock-spec-builders.h
+pkginclude_HEADERS = \
+  include/gmock/gmock-actions.h \
+  include/gmock/gmock-cardinalities.h \
+  include/gmock/gmock-generated-actions.h \
+  include/gmock/gmock-generated-function-mockers.h \
+  include/gmock/gmock-generated-matchers.h \
+  include/gmock/gmock-generated-nice-strict.h \
+  include/gmock/gmock-matchers.h \
+  include/gmock/gmock-more-actions.h \
+  include/gmock/gmock-spec-builders.h \
+  include/gmock/gmock.h
 
 pkginclude_internaldir = $(pkgincludedir)/internal
 pkginclude_internal_HEADERS = \
@@ -70,34 +71,35 @@ test_gmock_spec_builders_test_LDADD = $(GTEST_LIBS) lib/libgmock.la
 # verifies that libgmock_main works.
 TESTS += test/gmock_link_test
 check_PROGRAMS += test/gmock_link_test
-test_gmock_link_test_SOURCES = test/gmock_link_test.cc \
-                               test/gmock_link2_test.cc \
-                               test/gmock_link_test.h
+test_gmock_link_test_SOURCES = \
+  test/gmock_link2_test.cc \
+  test/gmock_link_test.cc \
+  test/gmock_link_test.h
 test_gmock_link_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la
 
 # Tests that fused gmock files compile and work.
 TESTS += test/gmock_fused_test
 check_PROGRAMS += test/gmock_fused_test
-test_gmock_fused_test_SOURCES = fused-src/gmock-gtest-all.cc \
-                                fused-src/gmock_main.cc \
-                                fused-src/gmock/gmock.h \
-                                fused-src/gtest/gtest.h \
-                                test/gmock_test.cc
+test_gmock_fused_test_SOURCES = \
+  fused-src/gmock-gtest-all.cc \
+  fused-src/gmock/gmock.h \
+  fused-src/gmock_main.cc \
+  fused-src/gtest/gtest.h \
+  test/gmock_test.cc
 test_gmock_fused_test_CPPFLAGS = -I"$(srcdir)/fused-src"
 
 # Google Mock source files that we don't compile directly.
 GMOCK_SOURCE_INGLUDES = \
-  src/gmock.cc \
   src/gmock-cardinalities.cc \
   src/gmock-internal-utils.cc \
   src/gmock-matchers.cc \
-  src/gmock-spec-builders.cc
+  src/gmock-spec-builders.cc \
+  src/gmock.cc
 
 EXTRA_DIST += $(GMOCK_SOURCE_INGLUDES)
 
 # C++ tests that we don't compile using autotools.
 EXTRA_DIST += \
-  test/gmock_all_test.cc \
   test/gmock-actions_test.cc \
   test/gmock-cardinalities_test.cc \
   test/gmock-generated-actions_test.cc \
@@ -108,56 +110,58 @@ EXTRA_DIST += \
   test/gmock-matchers_test.cc \
   test/gmock-more-actions_test.cc \
   test/gmock-nice-strict_test.cc \
-  test/gmock-port_test.cc
+  test/gmock-port_test.cc \
+  test/gmock_all_test.cc
 
 # Python tests, which we don't run using autotools.
 EXTRA_DIST += \
-  test/gmock_test_utils.py \
-  test/gmock_leak_test_.cc \
   test/gmock_leak_test.py \
-  test/gmock_output_test_.cc \
+  test/gmock_leak_test_.cc \
   test/gmock_output_test.py \
-  test/gmock_output_test_golden.txt
+  test/gmock_output_test_.cc \
+  test/gmock_output_test_golden.txt \
+  test/gmock_test_utils.py
 
 # Nonstandard package files for distribution.
 EXTRA_DIST += \
-    CHANGES \
-    CONTRIBUTORS \
-    make/Makefile
+  CHANGES \
+  CONTRIBUTORS \
+  make/Makefile
 
 # Pump scripts for generating Google Mock headers.
 # TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump.
-EXTRA_DIST += include/gmock/gmock-generated-actions.h.pump \
-              include/gmock/gmock-generated-function-mockers.h.pump \
-              include/gmock/gmock-generated-matchers.h.pump \
-              include/gmock/gmock-generated-nice-strict.h.pump \
-              include/gmock/internal/gmock-generated-internal-utils.h.pump
+EXTRA_DIST += \
+  include/gmock/gmock-generated-actions.h.pump \
+  include/gmock/gmock-generated-function-mockers.h.pump \
+  include/gmock/gmock-generated-matchers.h.pump \
+  include/gmock/gmock-generated-nice-strict.h.pump \
+  include/gmock/internal/gmock-generated-internal-utils.h.pump
 
 # Script for fusing Google Mock and Google Test source files.
 EXTRA_DIST += scripts/fuse_gmock_files.py
 
 # The Google Mock Generator tool from the cppclean project.
 EXTRA_DIST += \
-    scripts/generator/COPYING \
-    scripts/generator/README \
-    scripts/generator/README.cppclean \
-    scripts/generator/cpp/__init__.py \
-    scripts/generator/cpp/ast.py \
-    scripts/generator/cpp/gmock_class.py \
-    scripts/generator/cpp/keywords.py \
-    scripts/generator/cpp/tokenize.py \
-    scripts/generator/cpp/utils.py \
-    scripts/generator/gmock_gen.py
+  scripts/generator/COPYING \
+  scripts/generator/README \
+  scripts/generator/README.cppclean \
+  scripts/generator/cpp/__init__.py \
+  scripts/generator/cpp/ast.py \
+  scripts/generator/cpp/gmock_class.py \
+  scripts/generator/cpp/keywords.py \
+  scripts/generator/cpp/tokenize.py \
+  scripts/generator/cpp/utils.py \
+  scripts/generator/gmock_gen.py
 
 # Microsoft Visual Studio 2005 projects.
 EXTRA_DIST += \
-    msvc/gmock.sln \
-    msvc/gmock.vcproj \
-    msvc/gmock_config.vsprops \
-    msvc/gmock_link_test.vcproj \
-    msvc/gmock_main.vcproj \
-    msvc/gmock-spec-builders_test.vcproj \
-    msvc/gmock_test.vcproj
+  msvc/gmock-spec-builders_test.vcproj \
+  msvc/gmock.sln \
+  msvc/gmock.vcproj \
+  msvc/gmock_config.vsprops \
+  msvc/gmock_link_test.vcproj \
+  msvc/gmock_main.vcproj \
+  msvc/gmock_test.vcproj
 
 # gmock_test.cc does not really depend on files generated by the
 # fused-gmock-internal rule.  However, gmock_test.o does, and it is
diff --git a/include/gmock/gmock-generated-actions.h b/include/gmock/gmock-generated-actions.h
index 2b53c7b9..65652f8e 100644
--- a/include/gmock/gmock-generated-actions.h
+++ b/include/gmock/gmock-generated-actions.h
@@ -1378,7 +1378,7 @@ DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6,
 
 // The name of the class template implementing the action template.
 #define GMOCK_ACTION_CLASS_(name, value_params)\
-    GMOCK_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
+    GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
 
 #define ACTION_TEMPLATE(name, template_params, value_params)\
   template <GMOCK_INTERNAL_DECL_##template_params\
diff --git a/include/gmock/gmock-generated-actions.h.pump b/include/gmock/gmock-generated-actions.h.pump
index 75b1e7a0..b1deb798 100644
--- a/include/gmock/gmock-generated-actions.h.pump
+++ b/include/gmock/gmock-generated-actions.h.pump
@@ -605,7 +605,7 @@ $if i==1 [[P]] $elif i>=2 [[P$i]]
 
 // The name of the class template implementing the action template.
 #define GMOCK_ACTION_CLASS_(name, value_params)\
-    GMOCK_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
+    GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
 
 $range k 0..n-1
 
diff --git a/include/gmock/gmock-generated-function-mockers.h b/include/gmock/gmock-generated-function-mockers.h
index 58be7e19..65090861 100644
--- a/include/gmock/gmock-generated-function-mockers.h
+++ b/include/gmock/gmock-generated-function-mockers.h
@@ -339,7 +339,7 @@ using internal::FunctionMocker;
 // The variable for mocking the given method.
 // INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
 #define GMOCK_MOCKER_(arity, constness, Method) \
-    GMOCK_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
+    GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
 
 // INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
 #define GMOCK_METHOD0_(tn, constness, ct, Method, F) \
diff --git a/include/gmock/gmock-generated-function-mockers.h.pump b/include/gmock/gmock-generated-function-mockers.h.pump
index 20a44541..e0a0cd10 100644
--- a/include/gmock/gmock-generated-function-mockers.h.pump
+++ b/include/gmock/gmock-generated-function-mockers.h.pump
@@ -119,7 +119,7 @@ using internal::FunctionMocker;
 // The variable for mocking the given method.
 // INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
 #define GMOCK_MOCKER_(arity, constness, Method) \
-    GMOCK_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
+    GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
 
 
 $for i [[
diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h
index 7038c2e4..27d2b747 100644
--- a/include/gmock/gmock-spec-builders.h
+++ b/include/gmock/gmock-spec-builders.h
@@ -537,7 +537,7 @@ class InSequence {
   bool sequence_created_;
 
   GTEST_DISALLOW_COPY_AND_ASSIGN_(InSequence);  // NOLINT
-} GMOCK_ATTRIBUTE_UNUSED_;
+} GTEST_ATTRIBUTE_UNUSED_;
 
 namespace internal {
 
diff --git a/include/gmock/internal/gmock-internal-utils.h b/include/gmock/internal/gmock-internal-utils.h
index 69a23380..19ea89eb 100644
--- a/include/gmock/internal/gmock-internal-utils.h
+++ b/include/gmock/internal/gmock-internal-utils.h
@@ -46,17 +46,6 @@
 #include <gmock/internal/gmock-port.h>
 #include <gtest/gtest.h>
 
-// Concatenates two pre-processor symbols; works for concatenating
-// built-in macros like __FILE__ and __LINE__.
-#define GMOCK_CONCAT_TOKEN_IMPL_(foo, bar) foo##bar
-#define GMOCK_CONCAT_TOKEN_(foo, bar) GMOCK_CONCAT_TOKEN_IMPL_(foo, bar)
-
-#ifdef __GNUC__
-#define GMOCK_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
-#else
-#define GMOCK_ATTRIBUTE_UNUSED_
-#endif  // __GNUC__
-
 namespace testing {
 namespace internal {