diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-10-24 21:13:56 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-10-24 21:13:56 +0000 |
| commit | 4c11f25f8c972bc5bed6d92abe2a0a3e41f499d7 (patch) | |
| tree | 56ae16e703b8a380113bf2018520e22d2edd512b /include/gtest/internal/gtest-port.h | |
| parent | 97ef1c705eb24945cf4a2bca9eafe5357281703b (diff) | |
| download | googletest-4c11f25f8c972bc5bed6d92abe2a0a3e41f499d7.tar.gz googletest-4c11f25f8c972bc5bed6d92abe2a0a3e41f499d7.tar.bz2 googletest-4c11f25f8c972bc5bed6d92abe2a0a3e41f499d7.zip | |
Expressed the thread-safety annotations in code, replacing the existing comment-based system (by Aaron Jacobs).
Diffstat (limited to 'include/gtest/internal/gtest-port.h')
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index f3b7b62f..cb870c9e 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -1789,6 +1789,10 @@ typedef TypeWithSize<8>::Int TimeInMillis; // Represents time in milliseconds. #define GTEST_DEFINE_string_(name, default_val, doc) \ GTEST_API_ ::testing::internal::String GTEST_FLAG(name) = (default_val) +// Thread annotations +#define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks) +#define GTEST_LOCK_EXCLUDED_(locks) + // Parses 'str' for a 32-bit signed integer. If successful, writes the result // to *value and returns true; otherwise leaves *value unchanged and returns // false. |