Fixed issues related to building with slightly newer template libraries

- including <cstdint> in `wast_to_wasm.cpp` - forcing template inference to `path` instead of string in `clio`
Wire-Network · Nov 26, 2024 · e12f5e2 · e12f5e2
1 parent 1b4d66c
commit e12f5e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/libraries/chain/include/sysio/chain/wast_to_wasm.hpp b/libraries/chain/include/sysio/chain/wast_to_wasm.hpp
@@ -1,6 +1,8 @@
 #pragma once
-#include <vector>
+
+#include <cstdint>
 #include <string>
+#include <vector>
 
 namespace sysio { namespace chain {
 

diff --git a/programs/clio/main.cpp b/programs/clio/main.cpp
@@ -3149,9 +3149,9 @@ int main( int argc, char** argv ) {
         fc::path cpath = fc::canonical(fc::path(contractPath));
 
         if( wasmPath.empty() ) {
-           wasmPath = (cpath / (cpath.filename().generic_string()+".wasm")).generic_string();
+           wasmPath = (cpath / fc::path(cpath.filename().generic_string()+".wasm")).generic_string();
         } else if ( boost::filesystem::path(wasmPath).is_relative() ) {
-           wasmPath = (cpath / wasmPath).generic_string();
+           wasmPath = (cpath / fc::path(wasmPath)).generic_string();
         }
 
         std::cerr << localized(("Reading WASM from " + wasmPath + "...").c_str()) << std::endl;
@@ -3203,9 +3203,9 @@ int main( int argc, char** argv ) {
         fc::path cpath = fc::canonical(fc::path(contractPath));
 
         if( abiPath.empty() ) {
-           abiPath = (cpath / (cpath.filename().generic_string()+".abi")).generic_string();
+           abiPath = (cpath / fc::path(cpath.filename().generic_string()+".abi")).generic_string();
         } else if ( boost::filesystem::path(abiPath).is_relative() ) {
-           abiPath = (cpath / abiPath).generic_string();
+           abiPath = (cpath / fc::path(abiPath)).generic_string();
         }
 
         SYS_ASSERT( fc::exists( abiPath ), abi_file_not_found, "no abi file found ${f}", ("f", abiPath)  );