|
118 | 118 | "/wd4068", # unknown pragma |
119 | 119 | # qualifier applied to function type has no meaning; ignored |
120 | 120 | "/wd4180", |
121 | | - # conversion from 'type1' to 'type2', possible loss of data |
122 | | - "/wd4244", |
123 | | - # conversion from 'size_t' to 'type', possible loss of data |
124 | | - "/wd4267", |
125 | 121 | # The decorated name was longer than the compiler limit |
126 | 122 | "/wd4503", |
127 | 123 | # forcing value to bool 'true' or 'false' (performance warning) |
@@ -158,24 +154,33 @@ def GccStyleFilterAndCombine(default_flags, test_flags): |
158 | 154 | COPT_VARS = { |
159 | 155 | "ABSL_GCC_FLAGS": ABSL_GCC_FLAGS, |
160 | 156 | "ABSL_GCC_TEST_FLAGS": GccStyleFilterAndCombine( |
161 | | - ABSL_GCC_FLAGS, ABSL_GCC_TEST_ADDITIONAL_FLAGS), |
| 157 | + ABSL_GCC_FLAGS, ABSL_GCC_TEST_ADDITIONAL_FLAGS |
| 158 | + ), |
162 | 159 | "ABSL_LLVM_FLAGS": ABSL_LLVM_FLAGS, |
163 | 160 | "ABSL_LLVM_TEST_FLAGS": GccStyleFilterAndCombine( |
164 | | - ABSL_LLVM_FLAGS, ABSL_LLVM_TEST_ADDITIONAL_FLAGS), |
165 | | - "ABSL_CLANG_CL_FLAGS": |
166 | | - MSVC_BIG_WARNING_FLAGS + MSVC_DEFINES, |
167 | | - "ABSL_CLANG_CL_TEST_FLAGS": |
168 | | - MSVC_BIG_WARNING_FLAGS + MSVC_DEFINES + ABSL_LLVM_TEST_ADDITIONAL_FLAGS, |
169 | | - "ABSL_MSVC_FLAGS": |
170 | | - MSVC_BIG_WARNING_FLAGS + MSVC_WARNING_FLAGS + MSVC_DEFINES, |
171 | | - "ABSL_MSVC_TEST_FLAGS": |
172 | | - MSVC_BIG_WARNING_FLAGS + MSVC_WARNING_FLAGS + MSVC_DEFINES + [ |
| 161 | + ABSL_LLVM_FLAGS, ABSL_LLVM_TEST_ADDITIONAL_FLAGS |
| 162 | + ), |
| 163 | + "ABSL_CLANG_CL_FLAGS": MSVC_BIG_WARNING_FLAGS + MSVC_DEFINES, |
| 164 | + "ABSL_CLANG_CL_TEST_FLAGS": ( |
| 165 | + MSVC_BIG_WARNING_FLAGS + MSVC_DEFINES + ABSL_LLVM_TEST_ADDITIONAL_FLAGS |
| 166 | + ), |
| 167 | + "ABSL_MSVC_FLAGS": ( |
| 168 | + MSVC_BIG_WARNING_FLAGS + MSVC_WARNING_FLAGS + MSVC_DEFINES |
| 169 | + ), |
| 170 | + "ABSL_MSVC_TEST_FLAGS": ( |
| 171 | + MSVC_BIG_WARNING_FLAGS |
| 172 | + + MSVC_WARNING_FLAGS |
| 173 | + + MSVC_DEFINES |
| 174 | + + [ |
173 | 175 | "/wd4018", # signed/unsigned mismatch |
174 | 176 | "/wd4101", # unreferenced local variable |
| 177 | + "/wd4244", # shortening conversion |
| 178 | + "/wd4267", # shortening conversion |
175 | 179 | "/wd4503", # decorated name length exceeded, name was truncated |
176 | 180 | "/wd4996", # use of deprecated symbol |
177 | 181 | "/DNOMINMAX", # disable the min() and max() macros from <windows.h> |
178 | | - ], |
| 182 | + ] |
| 183 | + ), |
179 | 184 | "ABSL_MSVC_LINKOPTS": [ |
180 | 185 | # Object file doesn't export any previously undefined symbols |
181 | 186 | "-ignore:4221", |
|
0 commit comments