开源软件构建与测试

Changes of Revision 5

_service:tar_scm:cpp17_filesystem_namespace.patch Changed

@@ -1,13 +1,34 @@
 diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp
-index 80bc848..2533b65 100644
+index 80bc848..6051feb 100644
 --- a/src/compiler/clc/clc_helpers.cpp
 +++ b/src/compiler/clc/clc_helpers.cpp
-@@ -65,7 +65,7 @@
+@@ -23,7 +23,20 @@
+ // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ // OTHER DEALINGS IN THE SOFTWARE.
+ 
+-#include <filesystem>
++#ifndef __has_include
++  static_assert(false, "__has_include not supported");
++#else
++#  if __cplusplus >= 201703L && __has_include(<filesystem>)
++#    include <filesystem>
++     namespace fs = std::filesystem;
++#  elif __has_include(<experimental/filesystem>)
++#    include <experimental/filesystem>
++     namespace fs = std::experimental::filesystem;
++#  elif __has_include(<boost/filesystem.hpp>)
++#    include <boost/filesystem.hpp>
++     namespace fs = boost::filesystem;
++#  endif
++#endif
+ #include <sstream>
+ #include <mutex>
+ 
+@@ -65,7 +78,6 @@
  
  #include "clc_helpers.h"
  
 -namespace fs = std::filesystem;
-+namespace fs = std::experimental::filesystem;
  
  /* Use the highest version of SPIRV supported by SPIRV-Tools. */
  constexpr spv_target_env spirv_target = SPV_ENV_UNIVERSAL_1_5;

_service Changed