gmock-more-matchers.h (googletest-release-1.10.0) | : | gmock-more-matchers.h (googletest-release-1.11.0) | ||
---|---|---|---|---|
skipping to change at line 32 | skipping to change at line 32 | |||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | |||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
// Google Mock - a framework for writing C++ mock classes. | // Google Mock - a framework for writing C++ mock classes. | |||
// | // | |||
// This file implements some matchers that depend on gmock-generated-matchers.h. | // This file implements some matchers that depend on gmock-matchers.h. | |||
// | // | |||
// Note that tests are implemented in gmock-matchers_test.cc rather than | // Note that tests are implemented in gmock-matchers_test.cc rather than | |||
// gmock-more-matchers-test.cc. | // gmock-more-matchers-test.cc. | |||
// GOOGLETEST_CM0002 DO NOT DELETE | // GOOGLETEST_CM0002 DO NOT DELETE | |||
#ifndef GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_ | #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_ | |||
#define GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_ | #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_ | |||
#include "gmock/gmock-generated-matchers.h" | #include "gmock/gmock-matchers.h" | |||
namespace testing { | namespace testing { | |||
// Silence C4100 (unreferenced formal | // Silence C4100 (unreferenced formal | |||
// parameter) for MSVC | // parameter) for MSVC | |||
#ifdef _MSC_VER | #ifdef _MSC_VER | |||
# pragma warning(push) | # pragma warning(push) | |||
# pragma warning(disable:4100) | # pragma warning(disable:4100) | |||
#if (_MSC_VER == 1900) | #if (_MSC_VER == 1900) | |||
// and silence C4800 (C4800: 'int *const ': forcing value | // and silence C4800 (C4800: 'int *const ': forcing value | |||
skipping to change at line 90 | skipping to change at line 90 | |||
MATCHER(IsFalse, negation ? "is true" : "is false") { | MATCHER(IsFalse, negation ? "is true" : "is false") { | |||
return !static_cast<bool>(arg); | return !static_cast<bool>(arg); | |||
} | } | |||
#ifdef _MSC_VER | #ifdef _MSC_VER | |||
# pragma warning(pop) | # pragma warning(pop) | |||
#endif | #endif | |||
} // namespace testing | } // namespace testing | |||
#endif // GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_ | #endif // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_ | |||
End of changes. 4 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added |