gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp

Browse Source
This commit is contained in:
Masaru Tsuchiyama
2018-07-19 06:51:13 +09:00
committed by GitHub
parent 234958def5 1370e7658b
commit 40cd5d1170
8 changed files with 1721 additions and 2118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/include/gmock/internal/custom/gmock-matchers.h
View File

@@ -32,7 +32,7 @@
// ============================================================
//
// Adds google3 callback support to CallableTraits.
//
#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_