diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-17 23:58:45 +0100 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-17 23:58:45 +0100 |
| commit | 9d77e63e125a24e8ba6cbe02b40681a37f59cd5f (patch) | |
| tree | 5b4f48b7b3fd7c99e702774ffc53da0f3822613e /googlemock/include/gmock/gmock-more-matchers.h | |
| parent | 1cd979a80701a6c8c370f3a69048ba5cbec62a28 (diff) | |
| parent | e82d320567a45db1a999f9109f2b9a733bc59bb1 (diff) | |
| download | googletest-9d77e63e125a24e8ba6cbe02b40681a37f59cd5f.tar.gz googletest-9d77e63e125a24e8ba6cbe02b40681a37f59cd5f.tar.bz2 googletest-9d77e63e125a24e8ba6cbe02b40681a37f59cd5f.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/include/gmock/gmock-more-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-more-matchers.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/googlemock/include/gmock/gmock-more-matchers.h b/googlemock/include/gmock/gmock-more-matchers.h index 6c6b3e3c..1c9a399a 100644 --- a/googlemock/include/gmock/gmock-more-matchers.h +++ b/googlemock/include/gmock/gmock-more-matchers.h @@ -26,8 +26,7 @@ // 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. -// -// Author: marcus.boerger@google.com (Marcus Boerger) + // Google Mock - a framework for writing C++ mock classes. // @@ -38,8 +37,8 @@ // GOOGLETEST_CM0002 DO NOT DELETE -#ifndef GMOCK_GMOCK_MORE_MATCHERS_H_ -#define GMOCK_GMOCK_MORE_MATCHERS_H_ +#ifndef GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_ +#define GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_ #include "gmock/gmock-generated-matchers.h" @@ -90,4 +89,4 @@ MATCHER(IsFalse, negation ? "is true" : "is false") { } // namespace testing -#endif // GMOCK_GMOCK_MORE_MATCHERS_H_ +#endif // GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_ |