Merge branch 'master' into josh/fix_scoped_class2

21e51855 · Gennadiy Civil · GitHub · 3e2cb754 · 490554aa · 21e51855
Unverified Commit 21e51855 authored Aug 16, 2018 by Gennadiy Civil Committed by GitHub Aug 16, 2018
20 changed files
--- a/googletest/include/gtest/internal/gtest-param-util.h
+++ b/googletest/include/gtest/internal/gtest-param-util.h
--- a/googletest/include/gtest/internal/gtest-port-arch.h
+++ b/googletest/include/gtest/internal/gtest-port-arch.h
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
--- a/googletest/include/gtest/internal/gtest-string.h
+++ b/googletest/include/gtest/internal/gtest-string.h
--- a/googletest/include/gtest/internal/gtest-tuple.h
+++ b/googletest/include/gtest/internal/gtest-tuple.h
--- a/googletest/include/gtest/internal/gtest-tuple.h.pump
+++ b/googletest/include/gtest/internal/gtest-tuple.h.pump
--- a/googletest/include/gtest/internal/gtest-type-util.h
+++ b/googletest/include/gtest/internal/gtest-type-util.h
--- a/googletest/include/gtest/internal/gtest-type-util.h.pump
+++ b/googletest/include/gtest/internal/gtest-type-util.h.pump
--- a/googletest/samples/prime_tables.h
+++ b/googletest/samples/prime_tables.h
--- a/googletest/samples/sample1.cc
+++ b/googletest/samples/sample1.cc
--- a/googletest/samples/sample1.h
+++ b/googletest/samples/sample1.h
--- a/googletest/samples/sample10_unittest.cc
+++ b/googletest/samples/sample10_unittest.cc
--- a/googletest/samples/sample1_unittest.cc
+++ b/googletest/samples/sample1_unittest.cc
--- a/googletest/samples/sample2.cc
+++ b/googletest/samples/sample2.cc
--- a/googletest/samples/sample2.h
+++ b/googletest/samples/sample2.h
--- a/googletest/samples/sample2_unittest.cc
+++ b/googletest/samples/sample2_unittest.cc
--- a/googletest/samples/sample3-inl.h
+++ b/googletest/samples/sample3-inl.h
--- a/googletest/samples/sample3_unittest.cc
+++ b/googletest/samples/sample3_unittest.cc
--- a/googletest/samples/sample4.cc
+++ b/googletest/samples/sample4.cc
--- a/googletest/samples/sample4.h
+++ b/googletest/samples/sample4.h