diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-16 10:39:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-16 10:39:40 -0400 |
| commit | f3a9fa6a62a29746eba6c7092a2fada2fc1a5e90 (patch) | |
| tree | 7d4dad554bf23bb5783b7aacf4dd0c8704c7754b /googlemock/include/gmock/internal/custom/gmock-matchers.h | |
| parent | 6c093a2391eb66a42bd4146443265eddad06be0c (diff) | |
| parent | 490554aa0f3618e1e5dd217f11fe0c3f188ed615 (diff) | |
| download | googletest-f3a9fa6a62a29746eba6c7092a2fada2fc1a5e90.tar.gz googletest-f3a9fa6a62a29746eba6c7092a2fada2fc1a5e90.tar.bz2 googletest-f3a9fa6a62a29746eba6c7092a2fada2fc1a5e90.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/include/gmock/internal/custom/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-matchers.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/googlemock/include/gmock/internal/custom/gmock-matchers.h b/googlemock/include/gmock/internal/custom/gmock-matchers.h index f2efef91..14aafaab 100644 --- a/googlemock/include/gmock/internal/custom/gmock-matchers.h +++ b/googlemock/include/gmock/internal/custom/gmock-matchers.h @@ -27,13 +27,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// ============================================================ -// An installation-specific extension point for gmock-matchers.h. -// ============================================================ +// Injection point for custom user configurations. See README for details // -// Adds google3 callback support to CallableTraits. -// -#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_ -#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_ +// GOOGLETEST_CM0002 DO NOT DELETE -#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_ +#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_ |