diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-16 10:35:56 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-16 10:35:56 -0400 |
commit | 1dad4cf52123f52896d63c8fd103b6c84bf6ae7c (patch) | |
tree | 85b7c60880416650d6006d4cdd09c2112d865596 /googlemock/include/gmock/internal/custom/gmock-port.h | |
parent | 10f05a627c2da8d7de78da1b08f984ce8de398fb (diff) | |
parent | 490554aa0f3618e1e5dd217f11fe0c3f188ed615 (diff) | |
download | googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.tar.gz googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.tar.bz2 googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.zip |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/include/gmock/internal/custom/gmock-port.h')
-rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-port.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/googlemock/include/gmock/internal/custom/gmock-port.h b/googlemock/include/gmock/internal/custom/gmock-port.h index 9ce8bfe0..0030fe91 100644 --- a/googlemock/include/gmock/internal/custom/gmock-port.h +++ b/googlemock/include/gmock/internal/custom/gmock-port.h @@ -27,19 +27,12 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Injection point for custom user configurations. -// The following macros can be defined: -// -// Flag related macros: -// GMOCK_DECLARE_bool_(name) -// GMOCK_DECLARE_int32_(name) -// GMOCK_DECLARE_string_(name) -// GMOCK_DEFINE_bool_(name, default_val, doc) -// GMOCK_DEFINE_int32_(name, default_val, doc) -// GMOCK_DEFINE_string_(name, default_val, doc) +// Injection point for custom user configurations. See README for details // // ** Custom implementation starts here ** +// GOOGLETEST_CM0002 DO NOT DELETE + #ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_ #define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_ |