diff options
| author | Copybara-Service <copybara-worker@google.com> | 2022-01-11 17:01:32 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2022-01-11 17:01:32 (GMT) |
| commit | aea0874c4252d47d1da096ad763b9c04b42c8514 (patch) | |
| tree | d118909a66d85e30d65ae9d532813cf1ab0d4eda /googletest/include/gtest/internal | |
| parent | 1d9f7c5fb2f56b4321b9eec0731b874eb6eef466 (diff) | |
| parent | 58b71c9ea2fa52a7412e2267895d016abe14a971 (diff) | |
| download | googletest-aea0874c4252d47d1da096ad763b9c04b42c8514.zip googletest-aea0874c4252d47d1da096ad763b9c04b42c8514.tar.gz googletest-aea0874c4252d47d1da096ad763b9c04b42c8514.tar.bz2 | |
Merge pull request #3725 from bsilver8192:remove-another-disallow-assign
PiperOrigin-RevId: 421044680
Change-Id: If585089811f1b67eab6f339125c27174ee5bc290
Diffstat (limited to 'googletest/include/gtest/internal')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 619498f..e6ae256 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -188,9 +188,7 @@ // GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning. // GTEST_ATTRIBUTE_UNUSED_ - declares that a class' instances or a // variable don't have to be used. -// GTEST_DISALLOW_ASSIGN_ - disables copy operator=. // GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=. -// GTEST_DISALLOW_MOVE_ASSIGN_ - disables move operator=. // GTEST_DISALLOW_MOVE_AND_ASSIGN_ - disables move ctor and operator=. // GTEST_MUST_USE_RESULT_ - declares that a function's result must be used. // GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is @@ -686,13 +684,6 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; # define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) #endif - -// A macro to disallow copy operator= -// This should be used in the private: declarations for a class. -// NOLINT is for modernize-use-trailing-return-type in macro uses. -#define GTEST_DISALLOW_ASSIGN_(type) \ - type& operator=(type const&) = delete /* NOLINT */ - // A macro to disallow copy constructor and operator= // This should be used in the private: declarations for a class. // NOLINT is for modernize-use-trailing-return-type in macro uses. @@ -700,12 +691,6 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; type(type const&) = delete; \ type& operator=(type const&) = delete /* NOLINT */ -// A macro to disallow move operator= -// This should be used in the private: declarations for a class. -// NOLINT is for modernize-use-trailing-return-type in macro uses. -#define GTEST_DISALLOW_MOVE_ASSIGN_(type) \ - type& operator=(type&&) noexcept = delete /* NOLINT */ - // A macro to disallow move constructor and operator= // This should be used in the private: declarations for a class. // NOLINT is for modernize-use-trailing-return-type in macro uses. |