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/gmock-cardinalities.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/gmock-cardinalities.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-cardinalities.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-cardinalities.h b/googlemock/include/gmock/gmock-cardinalities.h index fc315f92..f9169315 100644 --- a/googlemock/include/gmock/gmock-cardinalities.h +++ b/googlemock/include/gmock/gmock-cardinalities.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: wan@google.com (Zhanyong Wan) + // Google Mock - a framework for writing C++ mock classes. // @@ -35,6 +34,8 @@ // cardinalities can be defined by the user implementing the // CardinalityInterface interface if necessary. +// GOOGLETEST_CM0002 DO NOT DELETE + #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ @@ -43,6 +44,9 @@ #include "gmock/internal/gmock-port.h" #include "gtest/gtest.h" +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ +/* class A needs to have dll-interface to be used by clients of class B */) + namespace testing { // To implement a cardinality Foo, define: @@ -144,4 +148,6 @@ inline Cardinality MakeCardinality(const CardinalityInterface* c) { } // namespace testing +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 + #endif // GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ |