diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 13:55:00 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 14:02:04 +0300 |
commit | caa2306d16e879659cdbef4ec54752637fb5c474 (patch) | |
tree | 1255c9cdbdc9d18f67b40cb755ca58897e5cefd2 /intern | |
parent | 784517dfb9650f284d5f7e283b47233c00183686 (diff) |
Libmv: Update to latest upstream version
Main purpose of this is to bring new gflags library which is more likely
to have a fix for undefined order of static variables initialization and
also to bring new glog where some compilation error are fixed (which are
only visible with more strict checks with clang and c++11 enabled).
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/blender_logging.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/blender/blender_logging.cpp b/intern/cycles/blender/blender_logging.cpp index 9a3725745c2..24ec2b4aedd 100644 --- a/intern/cycles/blender/blender_logging.cpp +++ b/intern/cycles/blender/blender_logging.cpp @@ -33,10 +33,10 @@ void CCL_init_logging(const char *argv0) google::GLOG_FATAL); google::InitGoogleLogging(argv0); - google::SetCommandLineOption("logtostderr", "1"); - google::SetCommandLineOption("v", "0"); - google::SetCommandLineOption("stderrthreshold", severity_fatal); - google::SetCommandLineOption("minloglevel", severity_fatal); + gflags::SetCommandLineOption("logtostderr", "1"); + gflags::SetCommandLineOption("v", "0"); + gflags::SetCommandLineOption("stderrthreshold", severity_fatal); + gflags::SetCommandLineOption("minloglevel", severity_fatal); #else (void) argv0; #endif @@ -45,10 +45,10 @@ void CCL_init_logging(const char *argv0) void CCL_start_debug_logging(void) { #ifdef WITH_CYCLES_LOGGING - google::SetCommandLineOption("logtostderr", "1"); - google::SetCommandLineOption("v", "2"); - google::SetCommandLineOption("stderrthreshold", "1"); - google::SetCommandLineOption("minloglevel", "0"); + gflags::SetCommandLineOption("logtostderr", "1"); + gflags::SetCommandLineOption("v", "2"); + gflags::SetCommandLineOption("stderrthreshold", "1"); + gflags::SetCommandLineOption("minloglevel", "0"); #endif } @@ -58,7 +58,7 @@ void CCL_logging_verbosity_set(int verbosity) char val[10]; snprintf(val, sizeof(val), "%d", verbosity); - google::SetCommandLineOption("v", val); + gflags::SetCommandLineOption("v", val); #else (void) verbosity; #endif |