[Bf-blender-cvs] [998537e2136] temp-cpp-file-system: Fix compile errors with `USE_CPP_FILESYSTEM` disabled

Julian Eisel noreply at git.blender.org
Tue Aug 3 18:10:01 CEST 2021


Commit: 998537e21362c32a3845123dc8dcbd3e0a143305
Author: Julian Eisel
Date:   Tue Aug 3 18:07:54 2021 +0200
Branches: temp-cpp-file-system
https://developer.blender.org/rB998537e21362c32a3845123dc8dcbd3e0a143305

Fix compile errors with `USE_CPP_FILESYSTEM` disabled

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

M	source/blender/blenlib/intern/storage.cc

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

diff --git a/source/blender/blenlib/intern/storage.cc b/source/blender/blenlib/intern/storage.cc
index 31338fbff6d..861de916e4f 100644
--- a/source/blender/blenlib/intern/storage.cc
+++ b/source/blender/blenlib/intern/storage.cc
@@ -87,7 +87,9 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
+#ifdef USE_CPP_FILESYSTEM
 using namespace blender::bli;
+#endif
 
 /**
  * Copies the current working directory into *dir (max size maxncpy), and
@@ -468,7 +470,7 @@ bool BLI_is_dir(const char *file)
   std::error_code error;
   return filesystem::is_directory(file, error);
 #else
-  return S_ISDIR(BLI_file_mode(file))
+  return S_ISDIR(BLI_file_mode(file));
 #endif
 }



More information about the Bf-blender-cvs mailing list