Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-03-20 21:03:11 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-03-20 21:26:25 +0400
commit6ba5c0c2683bb7718dfceca3868d5f2c9e4795c1 (patch)
tree11989e797939c41ba4b889ebcfe63456320a50cf /extern/libmv/third_party/glog/src/vlog_is_on.cc
parent2ea78fb28f5f90c736b6d048b5e1f1d787c48920 (diff)
Update Libmv to latest upstream
This is mainly a maintaince commit which syncs changes between Blender and Libmv upstream also bringing new GLog version. This GLog version is presumably have better support of MinGW from "the box". This commit is also aimed to make further 3d part libs update easier.
Diffstat (limited to 'extern/libmv/third_party/glog/src/vlog_is_on.cc')
-rw-r--r--extern/libmv/third_party/glog/src/vlog_is_on.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/extern/libmv/third_party/glog/src/vlog_is_on.cc b/extern/libmv/third_party/glog/src/vlog_is_on.cc
index 4396aa8d066..cd7fc19bca8 100644
--- a/extern/libmv/third_party/glog/src/vlog_is_on.cc
+++ b/extern/libmv/third_party/glog/src/vlog_is_on.cc
@@ -40,8 +40,8 @@
#include <cstdio>
#include <string>
#include "base/commandlineflags.h"
-#include <glog/logging.h>
-#include <glog/raw_logging.h>
+#include "glog/logging.h"
+#include "glog/raw_logging.h"
#include "base/googleinit.h"
// glog doesn't have annotation
@@ -62,11 +62,7 @@ _START_GOOGLE_NAMESPACE_
namespace glog_internal_namespace_ {
-// Put protytype here to suppress strict compiler flags
-GOOGLE_GLOG_DLL_DECL bool SafeFNMatch_(const char* pattern,
- size_t patt_len,
- const char* str,
- size_t str_len);
+namespace {
// Implementation of fnmatch that does not need 0-termination
// of arguments and does not allocate any memory,
@@ -101,6 +97,8 @@ GOOGLE_GLOG_DLL_DECL bool SafeFNMatch_(const char* pattern,
}
}
+} // namespace
+
} // namespace glog_internal_namespace_
using glog_internal_namespace_::SafeFNMatch_;