Merge remote-tracking branch 'upstream/develop' into pr/test_fixes

* upstream/develop: Add external directory to Conan recipe's exports (5006) Add missing includes (5011)
XRPLF · May 7, 2024 · a926a2d · a926a2d
2 parents 540713d + f650949
commit a926a2d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 1 deletion.
diff --git a/conanfile.py b/conanfile.py
@@ -116,7 +116,7 @@ def requirements(self):
             self.requires('rocksdb/6.29.5')
 
     exports_sources = (
-        'CMakeLists.txt', 'Builds/*', 'bin/getRippledInfo', 'src/*', 'cfg/*'
+        'CMakeLists.txt', 'Builds/*', 'bin/getRippledInfo', 'src/*', 'cfg/*', 'external/*'
     )
 
     def layout(self):

diff --git a/src/ripple/conditions/impl/utils.h b/src/ripple/conditions/impl/utils.h
@@ -20,6 +20,8 @@
 #ifndef RIPPLE_CONDITIONS_UTILS_H
 #define RIPPLE_CONDITIONS_UTILS_H
 
+#include <ripple/basics/Buffer.h>
+#include <ripple/basics/Slice.h>
 #include <ripple/basics/strHex.h>
 #include <ripple/conditions/impl/error.h>
 #include <boost/dynamic_bitset.hpp>

diff --git a/src/ripple/consensus/LedgerTrie.h b/src/ripple/consensus/LedgerTrie.h
@@ -23,6 +23,7 @@
 #include <ripple/basics/ToString.h>
 #include <ripple/json/json_value.h>
 #include <algorithm>
+#include <iomanip>
 #include <memory>
 #include <optional>
 #include <sstream>

diff --git a/src/test/csf/Histogram.h b/src/test/csf/Histogram.h
@@ -20,7 +20,9 @@
 #define RIPPLE_TEST_CSF_HISTOGRAM_H_INCLUDED
 
 #include <algorithm>
+#include <cassert>
 #include <chrono>
+#include <cmath>
 #include <map>
 
 namespace ripple {

diff --git a/src/test/csf/Tx.h b/src/test/csf/Tx.h
@@ -24,6 +24,7 @@
 #include <boost/iterator/function_output_iterator.hpp>
 #include <map>
 #include <ostream>
+#include <sstream>
 #include <string>
 #include <type_traits>
 

diff --git a/src/test/jtx/JTx.h b/src/test/jtx/JTx.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_JTX_JTX_H_INCLUDED
 
 #include <ripple/json/json_value.h>
+#include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/STTx.h>
 #include <ripple/protocol/TER.h>
 #include <test/jtx/basic_prop.h>

diff --git a/src/test/rpc/GRPCTestClientBase.h b/src/test/rpc/GRPCTestClientBase.h
@@ -20,6 +20,7 @@
 #ifndef RIPPLED_GRPCTESTCLIENTBASE_H
 #define RIPPLED_GRPCTESTCLIENTBASE_H
 
+#include <grpcpp/grpcpp.h>
 #include <org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 #include <test/jtx/envconfig.h>