fix for latest visual studio (from experimental/filesystem to filesys…

…tem)
potree · Feb 24, 2020 · 5f38c01 · 5f38c01
1 parent ec1e315
commit 5f38c01
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 21 deletions.
diff --git a/PotreeConverter/include/PointReader.h b/PotreeConverter/include/PointReader.h
@@ -3,12 +3,12 @@
 #ifndef POINTREADER_H
 #define POINTREADER_H
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 #include "Point.h"
 #include "AABB.h"
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 namespace Potree{
 

diff --git a/PotreeConverter/include/stuff.h b/PotreeConverter/include/stuff.h
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 #include "Vector3.h"
 #include "AABB.h"
@@ -33,10 +33,9 @@ using std::cout;
 using std::cin;
 using std::endl;
 using std::vector;
-using std::binary_function;
 using std::map;
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 namespace Potree {
 

diff --git a/PotreeConverter/src/BINPointReader.cpp b/PotreeConverter/src/BINPointReader.cpp
@@ -3,12 +3,12 @@
 #include <iostream>
 #include <vector>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 #include "BINPointReader.hpp"
 #include "stuff.h"
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 using std::ifstream;
 using std::cout;

diff --git a/PotreeConverter/src/LASPointReader.cpp b/PotreeConverter/src/LASPointReader.cpp
@@ -4,14 +4,14 @@
 #include <iostream>
 #include <vector>
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include "laszip_api.h"
 
 #include "LASPointReader.h"
 #include "stuff.h"
 
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 using std::ifstream;
 using std::cout;

diff --git a/PotreeConverter/src/PotreeConverter.cpp b/PotreeConverter/src/PotreeConverter.cpp
@@ -1,6 +1,6 @@
 
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 #include "rapidjson/document.h"
 #include "rapidjson/prettywriter.h"
@@ -46,7 +46,7 @@ using std::chrono::milliseconds;
 using std::chrono::duration_cast;
 using std::fstream;
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 namespace Potree{
 
@@ -100,10 +100,10 @@ vector<PointAttribute> checkAvailableStandardAttributes(string file) {
 	laszip_request_compatibility_mode(laszip_reader, request_reader);
 
 	bool hasClassification = false;
-	bool hasGpsTime = false;
-	bool hasIntensity = false;
-	bool hasNumberOfReturns = false;
-	bool hasReturnNumber = false;
+	bool hasGpsTime = false;
+	bool hasIntensity = false;
+	bool hasNumberOfReturns = false;
+	bool hasReturnNumber = false;
 	bool hasPointSourceId = false;
 
 	{

diff --git a/PotreeConverter/src/PotreeWriter.cpp b/PotreeConverter/src/PotreeWriter.cpp
@@ -7,7 +7,7 @@
 #include <fstream>
 #include <iomanip>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 #include "AABB.h"
 #include "SparseGrid.h"
@@ -31,7 +31,7 @@ using std::chrono::high_resolution_clock;
 using std::chrono::milliseconds;
 using std::chrono::duration_cast;
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 namespace Potree{
 

diff --git a/PotreeConverter/src/main.cpp b/PotreeConverter/src/main.cpp
@@ -13,14 +13,13 @@
 #include "arguments.hpp"
 #include <filesystem>
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 using std::string;
 using std::cout;
 using std::cerr;
 using std::endl;
 using std::vector;
-using std::binary_function;
 using std::map;
 using std::chrono::high_resolution_clock;
 using std::chrono::milliseconds;
@@ -251,7 +250,7 @@ PotreeArguments parseArguments(int argc, char **argv){
 	}
 
    try {
-    auto absolutePath = fs::canonical(fs::system_complete(argv[0]));
+    auto absolutePath = fs::canonical(fs::absolute(argv[0]));
     a.executablePath = absolutePath.parent_path().string();
    } catch (const fs::filesystem_error &e) {
      // do nothing

diff --git a/PotreeConverter/src/stuff.cpp b/PotreeConverter/src/stuff.cpp
@@ -29,7 +29,6 @@ using std::cout;
 using std::cin;
 using std::endl;
 using std::vector;
-using std::binary_function;
 using std::map;