[Bf-blender-cvs] [356ec42] master: Attempt to fix compilation error with msvc2013

Sergey Sharybin noreply at git.blender.org
Fri Mar 21 11:11:56 CET 2014


Commit: 356ec42bda20efe50d5cad7061b299a220a57818
Author: Sergey Sharybin
Date:   Fri Mar 21 16:06:30 2014 +0600
https://developer.blender.org/rB356ec42bda20efe50d5cad7061b299a220a57818

Attempt to fix compilation error with msvc2013

===================================================================

M	extern/libmv/ChangeLog
M	extern/libmv/third_party/glog/src/logging.cc

===================================================================

diff --git a/extern/libmv/ChangeLog b/extern/libmv/ChangeLog
index 703f64f..29a06fa 100644
--- a/extern/libmv/ChangeLog
+++ b/extern/libmv/ChangeLog
@@ -1,3 +1,9 @@
+commit d14a372dfe09c7339f267c4904a541fbe2efec43
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Fri Mar 21 16:02:41 2014 +0600
+
+    Attempt to fix compilation error with msvc2013
+
 commit 933531580b4dc4b65601d785cedc16506d615d7b
 Author: Sergey Sharybin <sergey.vfx at gmail.com>
 Date:   Thu Mar 20 23:07:34 2014 +0600
@@ -664,9 +670,3 @@ Date:   Thu Mar 14 14:53:42 2013 +0600
       it happened to be behind the camera.
     
     - Cleaned style a bit.
-
-commit 8bee982972a0b5bded3555b60e0987af685f85bd
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date:   Fri May 10 13:27:21 2013 +0600
-
-    Left extra debugging print in reconstruction scale by accident.
diff --git a/extern/libmv/third_party/glog/src/logging.cc b/extern/libmv/third_party/glog/src/logging.cc
index 03c427d..5e2ce61 100644
--- a/extern/libmv/third_party/glog/src/logging.cc
+++ b/extern/libmv/third_party/glog/src/logging.cc
@@ -34,6 +34,7 @@
 #include <assert.h>
 #include <iomanip>
 #include <string>
+#include <algorithm>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>  // For _exit.
 #endif




More information about the Bf-blender-cvs mailing list