diff options
| author | kosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386> | 2015-07-27 23:05:57 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386> | 2015-07-27 23:05:57 +0000 |
| commit | 33ae017a3727dd03e6f92d7e24b3e0f5a6975127 (patch) | |
| tree | 8c371995cbc84c5100c3d837f924bc63e44f33fc | |
| parent | beddfd6b31578fab57e314ea9a678d0af01f5ed4 (diff) | |
| download | googlemock-33ae017a3727dd03e6f92d7e24b3e0f5a6975127.tar.gz | |
Inject customization point for gmock-matchers.h
git-svn-id: http://googlemock.googlecode.com/svn/trunk@559 8415998a-534a-0410-bf83-d39667b30386
| -rw-r--r-- | include/gmock/gmock-matchers.h | 5 | ||||
| -rw-r--r-- | include/gmock/internal/custom/gmock-matchers.h | 39 |
2 files changed, 43 insertions, 1 deletions
diff --git a/include/gmock/gmock-matchers.h b/include/gmock/gmock-matchers.h index 67cbe0f..33b37a7 100644 --- a/include/gmock/gmock-matchers.h +++ b/include/gmock/gmock-matchers.h @@ -4392,5 +4392,8 @@ inline InnerMatcher AllArgs(const InnerMatcher& matcher) { return matcher; } } // namespace testing +// Include any custom callback matchers added by the local installation. +// We must include this header at the end to make sure it can use the +// declarations from this file. +#include "gmock/internal/custom/gmock-matchers.h" #endif // GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_ - diff --git a/include/gmock/internal/custom/gmock-matchers.h b/include/gmock/internal/custom/gmock-matchers.h new file mode 100644 index 0000000..f2efef9 --- /dev/null +++ b/include/gmock/internal/custom/gmock-matchers.h @@ -0,0 +1,39 @@ +// Copyright 2015, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (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. +// ============================================================ +// +// Adds google3 callback support to CallableTraits. +// +#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_ +#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_ + +#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_ |