diff options
author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-08-25 18:54:04 -0400 |
---|---|---|
committer | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-08-25 18:54:04 -0400 |
commit | 0b6d3b195ee0c04e097454efa1a4dc96e9f57271 (patch) | |
tree | 4e05b23702c200f3df94db96d257f5ddb8e131ff /googlemock/include/gmock/internal/custom/gmock-matchers.h | |
parent | c80449247c0e3032401297edf19a1be8078900cc (diff) | |
parent | 661699bfc0249b828b09f34be690b6f9ff5d295e (diff) | |
download | googletest-0b6d3b195ee0c04e097454efa1a4dc96e9f57271.tar.gz googletest-0b6d3b195ee0c04e097454efa1a4dc96e9f57271.tar.bz2 googletest-0b6d3b195ee0c04e097454efa1a4dc96e9f57271.zip |
Merge pull request #512 from google/unification
Unify googlemock into googletest
Diffstat (limited to 'googlemock/include/gmock/internal/custom/gmock-matchers.h')
-rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-matchers.h | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/googlemock/include/gmock/internal/custom/gmock-matchers.h b/googlemock/include/gmock/internal/custom/gmock-matchers.h new file mode 100644 index 00000000..f2efef91 --- /dev/null +++ b/googlemock/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_ |