logging: support building with gcc-4.9
authorAdam Simpkins <simpkins@fb.com>
Thu, 29 Jun 2017 21:45:09 +0000 (14:45 -0700)
committerFacebook Github Bot <facebook-github-bot@users.noreply.github.com>
Thu, 29 Jun 2017 21:50:25 +0000 (14:50 -0700)
Summary:
Versions of gcc prior to 5.x only support C++11 constexpr functions, and
require that they consist of only a single return statement.

This updates isLogLevelFatal() to meet those requirements so that it can still
be compiled with gcc 4.9.

Reviewed By: ikobzar

Differential Revision: D5350304

fbshipit-source-id: 2a9c256236c484f8c3d5f83690fde8b7333aa4fc

folly/experimental/logging/LogLevel.h

index 7ce01e66d0dca72da6aefb36b16c0484e537a5e4..75f401b126dbdd2fbab6bd06b23922b13dcacd4f 100644 (file)
@@ -122,10 +122,7 @@ std::ostream& operator<<(std::ostream& os, LogLevel level);
  * Returns true if and only if a LogLevel is fatal.
  */
 inline constexpr bool isLogLevelFatal(LogLevel level) {
-  if (folly::kIsDebug) {
-    return level >= LogLevel::DFATAL;
-  } else {
-    return level >= LogLevel::FATAL;
-  }
+  return folly::kIsDebug ? (level >= LogLevel::DFATAL)
+                         : (level >= LogLevel::FATAL);
 }
 }