Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / base / flags.cc

diff --git a/src/third_party/webrtc/base/flags.cc b/src/third_party/webrtc/base/flags.cc
index fe7a334..a5e1c45 100644 (file)
--- a/src/third_party/webrtc/base/flags.cc
+++ b/src/third_party/webrtc/base/flags.cc
@@ -56,7 +56,7 @@ void Flag::SetToDefault() {
       variable_->s = default_.s;
       return;
   }
-  UNREACHABLE();
+  FATAL() << "unreachable code";
 }
 
 
@@ -67,8 +67,7 @@ static const char* Type2String(Flag::Type type) {
     case Flag::FLOAT: return "float";
     case Flag::STRING: return "string";
   }
-  UNREACHABLE();
-  return NULL;
+  FATAL() << "unreachable code";
 }
 
 
@@ -87,7 +86,7 @@ static void PrintFlagValue(Flag::Type type, FlagValue* p) {
       printf("%s", p->s);
       return;
   }
-  UNREACHABLE();
+  FATAL() << "unreachable code";
 }
 
 
@@ -164,8 +163,7 @@ void FlagList::SplitArgument(const char* arg,
     if (*arg == '=') {
       // make a copy so we can NUL-terminate flag name
       int n = static_cast<int>(arg - *name);
-      if (n >= buffer_size)
-        Fatal(__FILE__, __LINE__, "CHECK(%s) failed", "n < buffer_size");
+      CHECK_LT(n, buffer_size);
       memcpy(buffer, *name, n * sizeof(char));
       buffer[n] = '\0';
       *name = buffer;
@@ -259,8 +257,7 @@ int FlagList::SetFlagsFromCommandLine(int* argc, const char** argv,
 
 void FlagList::Register(Flag* flag) {
   assert(flag != NULL && strlen(flag->name()) > 0);
-  if (Lookup(flag->name()) != NULL)
-    Fatal(flag->file(), 0, "flag %s declared twice", flag->name());
+  CHECK(!Lookup(flag->name())) << "flag " << flag->name() << " declared twice";
   flag->next_ = list_;
   list_ = flag;
 }
@@ -294,6 +291,6 @@ WindowsCommandLineArguments::~WindowsCommandLineArguments() {
 
   delete[] argv_;
 }
-#endif  // WEBRTC_WIN 
+#endif  // WEBRTC_WIN
 
 }  // namespace rtc