Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(249)

Unified Diff: sync/internal_api/public/base/ordinal_unittest.cc

Issue 809073005: replace COMPILE_ASSERT with static_assert in sync/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nit Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/internal_api/public/base/ordinal.h ('k') | sync/protocol/proto_enum_conversions.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/public/base/ordinal_unittest.cc
diff --git a/sync/internal_api/public/base/ordinal_unittest.cc b/sync/internal_api/public/base/ordinal_unittest.cc
index 8c77d6d6582c5bb9fd487376e99541d445644600..7401e836583f927edee4f0b907bcaa74319edeeb 100644
--- a/sync/internal_api/public/base/ordinal_unittest.cc
+++ b/sync/internal_api/public/base/ordinal_unittest.cc
@@ -38,50 +38,50 @@ typedef Ordinal<TestOrdinalTraits> TestOrdinal;
typedef Ordinal<LongOrdinalTraits> LongOrdinal;
typedef Ordinal<LargeOrdinalTraits> LargeOrdinal;
-COMPILE_ASSERT(TestOrdinal::kZeroDigit == '0',
- TestOrdinalHasCorrectZeroDigit);
-COMPILE_ASSERT(TestOrdinal::kOneDigit == '1',
- TestOrdinalHasCorrectOneDigit);
-COMPILE_ASSERT(TestOrdinal::kMidDigit == '2',
- TestOrdinalHasCorrectMidDigit);
-COMPILE_ASSERT(TestOrdinal::kMaxDigit == '3',
- TestOrdinalHasCorrectMaxDigit);
-COMPILE_ASSERT(TestOrdinal::kMidDigitValue == 2,
- TestOrdinalHasCorrectMidDigitValue);
-COMPILE_ASSERT(TestOrdinal::kMaxDigitValue == 3,
- TestOrdinalHasCorrectMaxDigitValue);
-COMPILE_ASSERT(TestOrdinal::kRadix == 4,
- TestOrdinalHasCorrectRadix);
-
-COMPILE_ASSERT(LongOrdinal::kZeroDigit == '0',
- LongOrdinalkZeroDigit_incorrect);
-COMPILE_ASSERT(LongOrdinal::kOneDigit == '1',
- LongOrdinalkOneDigit_incorrect);
-COMPILE_ASSERT(LongOrdinal::kMidDigit == '5',
- LongOrdinalkMidDigit_incorrect);
-COMPILE_ASSERT(LongOrdinal::kMaxDigit == '9',
- LongOrdinalkMaxDigit_incorrect);
-COMPILE_ASSERT(LongOrdinal::kMidDigitValue == 5,
- LongOrdinalkMidDigitValue_incorrect);
-COMPILE_ASSERT(LongOrdinal::kMaxDigitValue == 9,
- LongOrdinalkMaxDigitValue_incorrect);
-COMPILE_ASSERT(LongOrdinal::kRadix == 10,
- LongOrdinalkRadix_incorrect);
-
-COMPILE_ASSERT(static_cast<char>(LargeOrdinal::kZeroDigit) == '\x00',
- LargeOrdinalkZeroDigit_incorrect);
-COMPILE_ASSERT(static_cast<char>(LargeOrdinal::kOneDigit) == '\x01',
- LargeOrdinalkOneDigit_incorrect);
-COMPILE_ASSERT(static_cast<char>(LargeOrdinal::kMidDigit) == '\x80',
- LargeOrdinalkMidDigit_incorrect);
-COMPILE_ASSERT(static_cast<char>(LargeOrdinal::kMaxDigit) == '\xff',
- LargeOrdinalkMaxDigit_incorrect);
-COMPILE_ASSERT(LargeOrdinal::kMidDigitValue == 128,
- LargeOrdinalkMidDigitValue_incorrect);
-COMPILE_ASSERT(LargeOrdinal::kMaxDigitValue == 255,
- LargeOrdinalkMaxDigitValue_incorrect);
-COMPILE_ASSERT(LargeOrdinal::kRadix == 256,
- LargeOrdinalkRadix_incorrect);
+static_assert(TestOrdinal::kZeroDigit == '0',
+ "incorrect TestOrdinal zero digit");
+static_assert(TestOrdinal::kOneDigit == '1',
+ "incorrect TestOrdinal one digit");
+static_assert(TestOrdinal::kMidDigit == '2',
+ "incorrect TestOrdinal min digit");
+static_assert(TestOrdinal::kMaxDigit == '3',
+ "incorrect TestOrdinal max digit");
+static_assert(TestOrdinal::kMidDigitValue == 2,
+ "incorrect TestOrdinal mid digit value");
+static_assert(TestOrdinal::kMaxDigitValue == 3,
+ "incorrect TestOrdinal max digit value");
+static_assert(TestOrdinal::kRadix == 4,
+ "incorrect TestOrdinal radix");
+
+static_assert(LongOrdinal::kZeroDigit == '0',
+ "incorrect LongOrdinal zero digit");
+static_assert(LongOrdinal::kOneDigit == '1',
+ "incorrect LongOrdinal one digit");
+static_assert(LongOrdinal::kMidDigit == '5',
+ "incorrect LongOrdinal mid digit");
+static_assert(LongOrdinal::kMaxDigit == '9',
+ "incorrect LongOrdinal max digit");
+static_assert(LongOrdinal::kMidDigitValue == 5,
+ "incorrect LongOrdinal mid digit value");
+static_assert(LongOrdinal::kMaxDigitValue == 9,
+ "incorrect LongOrdinal max digit value");
+static_assert(LongOrdinal::kRadix == 10,
+ "incorrect LongOrdinal radix");
+
+static_assert(static_cast<char>(LargeOrdinal::kZeroDigit) == '\x00',
+ "incorrect LargeOrdinal zero digit");
+static_assert(static_cast<char>(LargeOrdinal::kOneDigit) == '\x01',
+ "incorrect LargeOrdinal one digit");
+static_assert(static_cast<char>(LargeOrdinal::kMidDigit) == '\x80',
+ "incorrect LargeOrdinal mid digit");
+static_assert(static_cast<char>(LargeOrdinal::kMaxDigit) == '\xff',
+ "incorrect LargeOrdinal max digit");
+static_assert(LargeOrdinal::kMidDigitValue == 128,
+ "incorrect LargeOrdinal mid digit value");
+static_assert(LargeOrdinal::kMaxDigitValue == 255,
+ "incorrect LargeOrdinal max digit value");
+static_assert(LargeOrdinal::kRadix == 256,
+ "incorrect LargeOrdinal radix");
// Create Ordinals that satisfy all but one criterion for validity.
// IsValid() should return false for all of them.
« no previous file with comments | « sync/internal_api/public/base/ordinal.h ('k') | sync/protocol/proto_enum_conversions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698