[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50657] trunk/blender/extern/libmv/ third_party/ceres/internal/ceres: Ceres: reshuffle include order to solve compilation error with MSVC

[Sergey Sharybin]

Revision: 50657
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50657
Author:   nazgul
Date:     2012-09-16 12:24:48 +0000 (Sun, 16 Sep 2012)
Log Message:
-----------
Ceres: reshuffle include order to solve compilation error with MSVC

Not sure why exactly this happens, would need extra investigation
and should probably be also fixed in upstream.

Modified Paths:
--------------
    trunk/blender/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc
    trunk/blender/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc
    trunk/blender/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc

Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc	2012-09-16 12:24:43 UTC (rev 50656)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc	2012-09-16 12:24:48 UTC (rev 50657)
@@ -28,12 +28,12 @@
 //
 // Author: sameeragarwal at google.com (Sameer Agarwal)
 
+#include "glog/logging.h"
 #include "ceres/block_random_access_dense_matrix.h"
 
 #include <vector>
 #include "ceres/internal/eigen.h"
 #include "ceres/internal/scoped_ptr.h"
-#include "glog/logging.h"
 
 namespace ceres {
 namespace internal {

Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc	2012-09-16 12:24:43 UTC (rev 50656)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc	2012-09-16 12:24:48 UTC (rev 50657)
@@ -28,6 +28,7 @@
 //
 // Author: sameeragarwal at google.com (Sameer Agarwal)
 
+#include "glog/logging.h"
 #include "ceres/block_random_access_sparse_matrix.h"
 
 #include <algorithm>
@@ -39,7 +40,6 @@
 #include "ceres/mutex.h"
 #include "ceres/triplet_sparse_matrix.h"
 #include "ceres/types.h"
-#include "glog/logging.h"
 
 namespace ceres {
 namespace internal {

Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc	2012-09-16 12:24:43 UTC (rev 50656)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc	2012-09-16 12:24:48 UTC (rev 50657)
@@ -38,6 +38,7 @@
 #endif  // CERES_NO_CXSPARSE
 
 #include "Eigen/Dense"
+#include "glog/logging.h"
 #include "ceres/block_random_access_dense_matrix.h"
 #include "ceres/block_random_access_matrix.h"
 #include "ceres/block_random_access_sparse_matrix.h"