diff options
| author | Jonathan Wendeborn <jonathan.wendeborn@bruker.com> | 2018-10-16 08:38:34 +0200 |
|---|---|---|
| committer | Jonathan Wendeborn <jonathan.wendeborn@bruker.com> | 2018-10-16 08:38:34 +0200 |
| commit | 96d16157721cda1fd6981e6ce70645acb44220da (patch) | |
| tree | c68f2939aaf8904f06e7235dfa4607f167fbb758 /googlemock/include/gmock/internal/custom/gmock-matchers.h | |
| parent | 386391b0144201e0cf5f66d8ba1cb60a1076f673 (diff) | |
| parent | 8c82ba48e433005b9e25835b4a342ef4dcc0cfc0 (diff) | |
| download | googletest-96d16157721cda1fd6981e6ce70645acb44220da.tar.gz googletest-96d16157721cda1fd6981e6ce70645acb44220da.tar.bz2 googletest-96d16157721cda1fd6981e6ce70645acb44220da.zip | |
Merge branch 'isnice' of https://github.com/BrukerJWD/googletest into isnice
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_ |