gmock-cardinalities.h (googletest-release-1.10.0) | : | gmock-cardinalities.h (googletest-release-1.11.0) | ||
---|---|---|---|---|
skipping to change at line 38 | skipping to change at line 38 | |||
// 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 commonly used cardinalities. More | // This file implements some commonly used cardinalities. More | |||
// cardinalities can be defined by the user implementing the | // cardinalities can be defined by the user implementing the | |||
// CardinalityInterface interface if necessary. | // CardinalityInterface interface if necessary. | |||
// GOOGLETEST_CM0002 DO NOT DELETE | // GOOGLETEST_CM0002 DO NOT DELETE | |||
#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ | #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ | |||
#define GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ | #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ | |||
#include <limits.h> | #include <limits.h> | |||
#include <memory> | #include <memory> | |||
#include <ostream> // NOLINT | #include <ostream> // NOLINT | |||
#include "gmock/internal/gmock-port.h" | #include "gmock/internal/gmock-port.h" | |||
#include "gtest/gtest.h" | #include "gtest/gtest.h" | |||
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ | GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ | |||
/* class A needs to have dll-interface to be used by clients of class B */) | /* class A needs to have dll-interface to be used by clients of class B */) | |||
skipping to change at line 156 | skipping to change at line 156 | |||
// Creates a cardinality from its implementation. | // Creates a cardinality from its implementation. | |||
inline Cardinality MakeCardinality(const CardinalityInterface* c) { | inline Cardinality MakeCardinality(const CardinalityInterface* c) { | |||
return Cardinality(c); | return Cardinality(c); | |||
} | } | |||
} // namespace testing | } // namespace testing | |||
GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 | GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 | |||
#endif // GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ | #endif // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |