fix windows run error bug

anlongfei · Jan 20, 2014 · 3c63555 · 3c63555
1 parent 1580289
commit 3c63555
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/utils/logging.hpp b/src/utils/logging.hpp
@@ -95,7 +95,7 @@ class ul_logger {
     ul_logger(const char * _filename = NULL,
         int _lvl = 0) {
 
-        if (!(log_fpo = fopen(_filename, "w"))) {
+        if (!_filename || !(log_fpo = fopen(_filename, "w"))) {
             log_fpo = stderr;
         }
 

diff --git a/thirdparty/boost/include/boost/multi_array/view.hpp b/thirdparty/boost/include/boost/multi_array/view.hpp
@@ -318,7 +318,16 @@ class multi_array_view :
                               other.shape()+this->num_dimensions(),
                               this->shape()));
       // iterator-based copy
+#if _MSC_VER >= 1600
+      auto
+        iterThis = begin();
+      auto
+        iterOther = other.begin();
+      for (; iterThis != end(); ++iterThis, ++iterOther)
+        *iterThis = *iterOther;
+#else
       std::copy(other.begin(),other.end(),begin());
+#endif
     }
     return *this;
   }