@@ -211,7 +211,7 @@ inline std::string log_filename_generator_impl(LogTriState multilog, const std::
211
211
#define LOG_FLF_VAL , __FILE__, __LINE__, __FUNCTION__
212
212
#else
213
213
#define LOG_FLF_FMT " [%24s:%5ld][%24s] "
214
- #define LOG_FLF_VAL , __FILE__, __LINE__, __FUNCTION__
214
+ #define LOG_FLF_VAL , __FILE__, ( long ) __LINE__, __FUNCTION__
215
215
#endif
216
216
#else
217
217
#define LOG_FLF_FMT " %s"
@@ -224,7 +224,7 @@ inline std::string log_filename_generator_impl(LogTriState multilog, const std::
224
224
#define LOG_TEE_FLF_VAL , __FILE__, __LINE__, __FUNCTION__
225
225
#else
226
226
#define LOG_TEE_FLF_FMT " [%24s:%5ld][%24s] "
227
- #define LOG_TEE_FLF_VAL , __FILE__, __LINE__, __FUNCTION__
227
+ #define LOG_TEE_FLF_VAL , __FILE__, ( long ) __LINE__, __FUNCTION__
228
228
#endif
229
229
#else
230
230
#define LOG_TEE_FLF_FMT " %s"
@@ -294,7 +294,7 @@ inline std::string log_filename_generator_impl(LogTriState multilog, const std::
294
294
// Main LOG macro.
295
295
// behaves like printf, and supports arguments the exact same way.
296
296
//
297
- #ifndef _MSC_VER
297
+ #if !defined( _MSC_VER) || defined(__clang__)
298
298
#define LOG (...) LOG_IMPL(__VA_ARGS__, " " )
299
299
#else
300
300
#define LOG (str, ...) LOG_IMPL(" %s" str, " " , ##__VA_ARGS__, " " )
@@ -308,14 +308,14 @@ inline std::string log_filename_generator_impl(LogTriState multilog, const std::
308
308
// Secondary target can be changed just like LOG_TARGET
309
309
// by defining LOG_TEE_TARGET
310
310
//
311
- #ifndef _MSC_VER
311
+ #if !defined( _MSC_VER) || defined(__clang__)
312
312
#define LOG_TEE (...) LOG_TEE_IMPL(__VA_ARGS__, " " )
313
313
#else
314
314
#define LOG_TEE (str, ...) LOG_TEE_IMPL(" %s" str, " " , ##__VA_ARGS__, " " )
315
315
#endif
316
316
317
317
// LOG macro variants with auto endline.
318
- #ifndef _MSC_VER
318
+ #if !defined( _MSC_VER) || defined(__clang__)
319
319
#define LOGLN (...) LOG_IMPL(__VA_ARGS__, " \n " )
320
320
#define LOG_TEELN (...) LOG_TEE_IMPL(__VA_ARGS__, " \n " )
321
321
#else
0 commit comments