coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-21 19:14:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'google:main' into master

Browse Source
This commit is contained in:
Anthony Graca 2021-12-10 15:48:23 -08:00 committed by GitHub
commit 88c3f5a8f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
googletest/include/gtest/internal/gtest-port.h
View File

@ -689,25 +689,29 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
// A macro to disallow copy operator= // A macro to disallow copy operator=
// This should be used in the private: declarations for a class. // 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) \ #define GTEST_DISALLOW_ASSIGN_(type) \
type& operator=(type const &) = delete type& operator=(type const&) = delete /* NOLINT */
// A macro to disallow copy constructor and operator= // A macro to disallow copy constructor and operator=
// This should be used in the private: declarations for a class. // 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_COPY_AND_ASSIGN_(type) \ #define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \
type(type const&) = delete; \ type(type const&) = delete; \
type& operator=(type const&) = delete type& operator=(type const&) = delete /* NOLINT */
// A macro to disallow move operator= // A macro to disallow move operator=
// This should be used in the private: declarations for a class. // 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) \ #define GTEST_DISALLOW_MOVE_ASSIGN_(type) \
type& operator=(type &&) noexcept = delete type& operator=(type&&) noexcept = delete /* NOLINT */
// A macro to disallow move constructor and operator= // A macro to disallow move constructor and operator=
// This should be used in the private: declarations for a class. // 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_AND_ASSIGN_(type) \ #define GTEST_DISALLOW_MOVE_AND_ASSIGN_(type) \
type(type&&) noexcept = delete; \ type(type&&) noexcept = delete; \
type& operator=(type&&) noexcept = delete type& operator=(type&&) noexcept = delete /* NOLINT */
// Tell the compiler to warn about unused return values for functions declared // Tell the compiler to warn about unused return values for functions declared
// with this macro. The macro should be used on function declarations // with this macro. The macro should be used on function declarations

4
googletest/src/gtest.cc
View File

@ -5849,9 +5849,7 @@ bool UnitTestImpl::RunAllTests() {
return true; return true;
} }
random_seed_ = GTEST_FLAG_GET(shuffle) random_seed_ = GetRandomSeedFromFlag(GTEST_FLAG_GET(random_seed));
? GetRandomSeedFromFlag(GTEST_FLAG_GET(random_seed))
: 0;
// True if and only if at least one test has failed. // True if and only if at least one test has failed.
bool failed = false; bool failed = false;