From 7a6f835f449f5ceb760464aeb92b521bd0b87213 Mon Sep 17 00:00:00 2001
From: Ravin Perera <33562092+ravinsp@users.noreply.github.com>
Date: Mon, 28 Oct 2019 09:47:29 +0530
Subject: [PATCH] Reverted std filesystem to boost filesystem.

---
 CMakeLists.txt |  1 -
 src/conf.cpp   | 15 +++++++--------
 src/proc.cpp   |  4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbbfcd71..af9d25f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,6 @@ target_link_libraries(hpcore
     libboost_log.a
     libboost_log_setup.a
     libboost_filesystem.a
-    stdc++fs
     pthread
     crypto
     ssl
diff --git a/src/conf.cpp b/src/conf.cpp
index 6af1f9c2..ab48a675 100644
--- a/src/conf.cpp
+++ b/src/conf.cpp
@@ -2,14 +2,13 @@
 #include <iostream>
 #include <fstream>
 #include <unordered_set>
-#include <experimental/filesystem>
 #include <sodium.h>
 #include <rapidjson/document.h>
 #include <rapidjson/schema.h>
 #include <rapidjson/istreamwrapper.h>
 #include <rapidjson/ostreamwrapper.h>
 #include <rapidjson/prettywriter.h>
-
+#include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #include "conf.hpp"
 #include "crypto.hpp"
@@ -78,15 +77,15 @@ int rekey()
  */
 int create_contract()
 {
-    if (std::experimental::filesystem::exists(ctx.contractDir))
+    if (boost::filesystem::exists(ctx.contractDir))
     {
         std::cout << "Contract dir already exists. Cannot create contract at the same location.\n";
         return -1;
     }
 
-    std::experimental::filesystem::create_directories(ctx.configDir);
-    std::experimental::filesystem::create_directories(ctx.histDir);
-    std::experimental::filesystem::create_directories(ctx.stateDir);
+    boost::filesystem::create_directories(ctx.configDir);
+    boost::filesystem::create_directories(ctx.histDir);
+    boost::filesystem::create_directories(ctx.stateDir);
 
     //Create config file with default settings.
 
@@ -430,7 +429,7 @@ int validate_config()
     }
 
     // Check whether the contract binary actually exists.
-    if (!std::experimental::filesystem::exists(cfg.binary))
+    if (!boost::filesystem::exists(cfg.binary))
     {
         std::cout << "Contract binary does not exist: " << cfg.binary << std::endl;
         return -1;
@@ -459,7 +458,7 @@ int validate_contract_dir_paths()
 
     for (std::string &path : paths)
     {
-        if (!std::experimental::filesystem::exists(path))
+        if (!boost::filesystem::exists(path))
         {
             if (path == ctx.tlsKeyFile || path == ctx.tlsCertFile)
             {
diff --git a/src/proc.cpp b/src/proc.cpp
index 8d2e5806..09f19036 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -2,13 +2,13 @@
 #include <iostream>
 #include <stdlib.h>
 #include <vector>
-#include <experimental/filesystem>
 #include <unistd.h>
 #include <sstream>
 #include <fcntl.h>
 #include <sys/uio.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
+#include <boost/filesystem.hpp>
 #include "proc.hpp"
 #include "conf.hpp"
 #include "hplog.hpp"
@@ -125,7 +125,7 @@ int exec_contract(const ContractExecArgs &args)
         close_unused_fds(false);
 
         // Set the contract process working directory.
-        std::experimental::filesystem::current_path(conf::ctx.contractDir);
+        boost::filesystem::current_path(conf::ctx.contractDir);
 
         // Write the contract input message from HotPocket to the stdin (0) of the contract process.
         write_contract_args(args);