gmock-port.h (googletest-release-1.10.0) | : | gmock-port.h (googletest-release-1.11.0) | ||
---|---|---|---|---|
skipping to change at line 40 | skipping to change at line 40 | |||
// | // | |||
// Low-level types and utilities for porting Google Mock to various | // Low-level types and utilities for porting Google Mock to various | |||
// platforms. All macros ending with _ and symbols defined in an | // platforms. All macros ending with _ and symbols defined in an | |||
// internal namespace are subject to change without notice. Code | // internal namespace are subject to change without notice. Code | |||
// outside Google Mock MUST NOT USE THEM DIRECTLY. Macros that don't | // outside Google Mock MUST NOT USE THEM DIRECTLY. Macros that don't | |||
// end with _ are part of Google Mock's public API and can be used by | // end with _ are part of Google Mock's public API and can be used by | |||
// code outside Google Mock. | // code outside Google Mock. | |||
// GOOGLETEST_CM0002 DO NOT DELETE | // GOOGLETEST_CM0002 DO NOT DELETE | |||
#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_ | #ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_ | |||
#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_ | #define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_ | |||
#include <assert.h> | #include <assert.h> | |||
#include <stdlib.h> | #include <stdlib.h> | |||
#include <cstdint> | ||||
#include <iostream> | #include <iostream> | |||
// Most of the utilities needed for porting Google Mock are also | // Most of the utilities needed for porting Google Mock are also | |||
// required for Google Test and are defined in gtest-port.h. | // required for Google Test and are defined in gtest-port.h. | |||
// | // | |||
// Note to maintainers: to reduce code duplication, prefer adding | // Note to maintainers: to reduce code duplication, prefer adding | |||
// portability utilities to Google Test's gtest-port.h instead of | // portability utilities to Google Test's gtest-port.h instead of | |||
// here, as Google Mock depends on Google Test. Only add a utility | // here, as Google Mock depends on Google Test. Only add a utility | |||
// here if it's truly specific to Google Mock. | // here if it's truly specific to Google Mock. | |||
skipping to change at line 72 | skipping to change at line 73 | |||
#endif | #endif | |||
// Macro for referencing flags. This is public as we want the user to | // Macro for referencing flags. This is public as we want the user to | |||
// use this syntax to reference Google Mock flags. | // use this syntax to reference Google Mock flags. | |||
#define GMOCK_FLAG(name) FLAGS_gmock_##name | #define GMOCK_FLAG(name) FLAGS_gmock_##name | |||
#if !defined(GMOCK_DECLARE_bool_) | #if !defined(GMOCK_DECLARE_bool_) | |||
// Macros for declaring flags. | // Macros for declaring flags. | |||
# define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name) | # define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name) | |||
# define GMOCK_DECLARE_int32_(name) \ | # define GMOCK_DECLARE_int32_(name) extern GTEST_API_ int32_t GMOCK_FLAG(name) | |||
extern GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name) | ||||
# define GMOCK_DECLARE_string_(name) \ | # define GMOCK_DECLARE_string_(name) \ | |||
extern GTEST_API_ ::std::string GMOCK_FLAG(name) | extern GTEST_API_ ::std::string GMOCK_FLAG(name) | |||
// Macros for defining flags. | // Macros for defining flags. | |||
# define GMOCK_DEFINE_bool_(name, default_val, doc) \ | # define GMOCK_DEFINE_bool_(name, default_val, doc) \ | |||
GTEST_API_ bool GMOCK_FLAG(name) = (default_val) | GTEST_API_ bool GMOCK_FLAG(name) = (default_val) | |||
# define GMOCK_DEFINE_int32_(name, default_val, doc) \ | # define GMOCK_DEFINE_int32_(name, default_val, doc) \ | |||
GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name) = (default_val) | GTEST_API_ int32_t GMOCK_FLAG(name) = (default_val) | |||
# define GMOCK_DEFINE_string_(name, default_val, doc) \ | # define GMOCK_DEFINE_string_(name, default_val, doc) \ | |||
GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val) | GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val) | |||
#endif // !defined(GMOCK_DECLARE_bool_) | #endif // !defined(GMOCK_DECLARE_bool_) | |||
#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_ | #endif // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_ | |||
End of changes. 5 change blocks. | ||||
5 lines changed or deleted | 5 lines changed or added |