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>2012-03-11 23:52:25 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-03-11 23:52:25 +0400
commit42b3463030b07ba3a87574c173e759e3bb15353b (patch)
tree1f7c20c45c294d9137bd75efabc414b02e6d7f60 /extern/libmv/third_party/glog/src/utilities.h
parentc21c58f44c16b3d503d81577c1943f1f4b47b675 (diff)
Bundle new upstream version of libmv from own branch
This version of libmv includes new gflags and glog libraries which makes it possible to compile libmv with clang compiler. Also remove code from CMakeLists which was disabling libmv if using clang. Tested on linux with gcc-4.6 and clang-3.0, windows cmake+msvc and scons+mingw. Could be some issues with other platforms/build system which shall be simple to resolve.
Diffstat (limited to 'extern/libmv/third_party/glog/src/utilities.h')
-rw-r--r--extern/libmv/third_party/glog/src/utilities.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/extern/libmv/third_party/glog/src/utilities.h b/extern/libmv/third_party/glog/src/utilities.h
index bbb0eb0746c..c8215b73f33 100644
--- a/extern/libmv/third_party/glog/src/utilities.h
+++ b/extern/libmv/third_party/glog/src/utilities.h
@@ -161,6 +161,7 @@ typedef double WallTime;
WallTime WallTime_Now();
int32 GetMainThreadPid();
+bool PidHasChanged();
pid_t GetTID();
@@ -215,6 +216,9 @@ struct CrashReason {
void SetCrashReason(const CrashReason* r);
+void InitGoogleLoggingUtilities(const char* argv0);
+void ShutdownGoogleLoggingUtilities();
+
} // namespace glog_internal_namespace_
_END_GOOGLE_NAMESPACE_