Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proposed 2.3.0-b1 #5050

Merged
merged 20 commits into from
Jun 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Rewrite includes (#4997)
  • Loading branch information
Pretty Printer authored and thejohnfreeman committed Jun 20, 2024
commit 1d23148e6dd53957fcb6205c07a5c6cd7b64d50c
2 changes: 1 addition & 1 deletion include/xrpl/basics/BasicConfig.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef RIPPLE_BASICS_BASICCONFIG_H_INCLUDED
#define RIPPLE_BASICS_BASICCONFIG_H_INCLUDED

#include <ripple/basics/contract.h>
#include <xrpl/basics/contract.h>
#include <boost/beast/core/string.hpp>
#include <boost/lexical_cast.hpp>
#include <algorithm>
2 changes: 1 addition & 1 deletion include/xrpl/basics/Buffer.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef RIPPLE_BASICS_BUFFER_H_INCLUDED
#define RIPPLE_BASICS_BUFFER_H_INCLUDED

#include <ripple/basics/Slice.h>
#include <xrpl/basics/Slice.h>
#include <cassert>
#include <cstdint>
#include <cstring>
2 changes: 1 addition & 1 deletion include/xrpl/basics/CompressionAlgorithms.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef RIPPLED_COMPRESSIONALGORITHMS_H_INCLUDED
#define RIPPLED_COMPRESSIONALGORITHMS_H_INCLUDED

#include <ripple/basics/contract.h>
#include <xrpl/basics/contract.h>
#include <algorithm>
#include <cstdint>
#include <lz4.h>
2 changes: 1 addition & 1 deletion include/xrpl/basics/CountedObject.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED
#define RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED

#include <ripple/beast/type_name.h>
#include <xrpl/beast/type_name.h>
#include <atomic>
#include <string>
#include <utility>
2 changes: 1 addition & 1 deletion include/xrpl/basics/Expected.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef RIPPLE_BASICS_EXPECTED_H_INCLUDED
#define RIPPLE_BASICS_EXPECTED_H_INCLUDED

#include <ripple/basics/contract.h>
#include <xrpl/basics/contract.h>

#include <boost/outcome.hpp>

2 changes: 1 addition & 1 deletion include/xrpl/basics/FeeUnits.h
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
#ifndef BASICS_FEES_H_INCLUDED
#define BASICS_FEES_H_INCLUDED

#include <ripple/basics/XRPAmount.h>
#include <xrpl/basics/XRPAmount.h>
#include <boost/multiprecision/cpp_int.hpp>
#include <limits>
#include <utility>
6 changes: 3 additions & 3 deletions include/xrpl/basics/IOUAmount.h
Original file line number Diff line number Diff line change
@@ -20,9 +20,9 @@
#ifndef RIPPLE_BASICS_IOUAMOUNT_H_INCLUDED
#define RIPPLE_BASICS_IOUAMOUNT_H_INCLUDED

#include <ripple/basics/LocalValue.h>
#include <ripple/basics/Number.h>
#include <ripple/beast/utility/Zero.h>
#include <xrpl/basics/LocalValue.h>
#include <xrpl/basics/Number.h>
#include <xrpl/beast/utility/Zero.h>
#include <boost/operators.hpp>
#include <cstdint>
#include <string>
4 changes: 2 additions & 2 deletions include/xrpl/basics/KeyCache.h
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
#ifndef RIPPLE_BASICS_KEYCACHE_H
#define RIPPLE_BASICS_KEYCACHE_H

#include <ripple/basics/TaggedCache.h>
#include <ripple/basics/base_uint.h>
#include <xrpl/basics/TaggedCache.h>
#include <xrpl/basics/base_uint.h>

namespace ripple {

4 changes: 2 additions & 2 deletions include/xrpl/basics/Log.h
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
#ifndef RIPPLE_BASICS_LOG_H_INCLUDED
#define RIPPLE_BASICS_LOG_H_INCLUDED

#include <ripple/basics/UnorderedContainers.h>
#include <ripple/beast/utility/Journal.h>
#include <xrpl/basics/UnorderedContainers.h>
#include <xrpl/beast/utility/Journal.h>
#include <boost/beast/core/string.hpp>
#include <boost/filesystem.hpp>
#include <map>
2 changes: 1 addition & 1 deletion include/xrpl/basics/Number.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef RIPPLE_BASICS_NUMBER_H_INCLUDED
#define RIPPLE_BASICS_NUMBER_H_INCLUDED

#include <ripple/basics/XRPAmount.h>
#include <xrpl/basics/XRPAmount.h>
#include <cstdint>
#include <limits>
#include <ostream>
2 changes: 1 addition & 1 deletion include/xrpl/basics/RangeSet.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef RIPPLE_BASICS_RANGESET_H_INCLUDED
#define RIPPLE_BASICS_RANGESET_H_INCLUDED

#include <ripple/beast/core/LexicalCast.h>
#include <xrpl/beast/core/LexicalCast.h>

#include <boost/algorithm/string.hpp>
#include <boost/icl/closed_interval.hpp>
2 changes: 1 addition & 1 deletion include/xrpl/basics/Resolver.h
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
#include <functional>
#include <vector>

#include <ripple/beast/net/IPEndpoint.h>
#include <xrpl/beast/net/IPEndpoint.h>

namespace ripple {

4 changes: 2 additions & 2 deletions include/xrpl/basics/ResolverAsio.h
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
#ifndef RIPPLE_BASICS_RESOLVERASIO_H_INCLUDED
#define RIPPLE_BASICS_RESOLVERASIO_H_INCLUDED

#include <ripple/basics/Resolver.h>
#include <ripple/beast/utility/Journal.h>
#include <xrpl/basics/Resolver.h>
#include <xrpl/beast/utility/Journal.h>
#include <boost/asio/io_service.hpp>

namespace ripple {
2 changes: 1 addition & 1 deletion include/xrpl/basics/SHAMapHash.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef RIPPLE_BASICS_SHAMAP_HASH_H_INCLUDED
#define RIPPLE_BASICS_SHAMAP_HASH_H_INCLUDED

#include <ripple/basics/base_uint.h>
#include <xrpl/basics/base_uint.h>

#include <ostream>

2 changes: 1 addition & 1 deletion include/xrpl/basics/SlabAllocator.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef RIPPLE_BASICS_SLABALLOCATOR_H_INCLUDED
#define RIPPLE_BASICS_SLABALLOCATOR_H_INCLUDED

#include <ripple/beast/type_name.h>
#include <xrpl/beast/type_name.h>

#include <boost/align.hpp>
#include <boost/container/static_vector.hpp>
4 changes: 2 additions & 2 deletions include/xrpl/basics/Slice.h
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
#ifndef RIPPLE_BASICS_SLICE_H_INCLUDED
#define RIPPLE_BASICS_SLICE_H_INCLUDED

#include <ripple/basics/contract.h>
#include <ripple/basics/strHex.h>
#include <xrpl/basics/contract.h>
#include <xrpl/basics/strHex.h>
#include <algorithm>
#include <array>
#include <cassert>
4 changes: 2 additions & 2 deletions include/xrpl/basics/StringUtilities.h
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
#ifndef RIPPLE_BASICS_STRINGUTILITIES_H_INCLUDED
#define RIPPLE_BASICS_STRINGUTILITIES_H_INCLUDED

#include <ripple/basics/Blob.h>
#include <ripple/basics/strHex.h>
#include <xrpl/basics/Blob.h>
#include <xrpl/basics/strHex.h>

#include <boost/format.hpp>
#include <boost/utility/string_view.hpp>
10 changes: 5 additions & 5 deletions include/xrpl/basics/TaggedCache.h
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@
#ifndef RIPPLE_BASICS_TAGGEDCACHE_H_INCLUDED
#define RIPPLE_BASICS_TAGGEDCACHE_H_INCLUDED

#include <ripple/basics/Log.h>
#include <ripple/basics/UnorderedContainers.h>
#include <ripple/basics/hardened_hash.h>
#include <ripple/beast/clock/abstract_clock.h>
#include <ripple/beast/insight/Insight.h>
#include <xrpl/basics/Log.h>
#include <xrpl/basics/UnorderedContainers.h>
#include <xrpl/basics/hardened_hash.h>
#include <xrpl/beast/clock/abstract_clock.h>
#include <xrpl/beast/insight/Insight.h>
#include <atomic>
#include <functional>
#include <mutex>
10 changes: 5 additions & 5 deletions include/xrpl/basics/UnorderedContainers.h
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@
#ifndef RIPPLE_BASICS_UNORDEREDCONTAINERS_H_INCLUDED
#define RIPPLE_BASICS_UNORDEREDCONTAINERS_H_INCLUDED

#include <ripple/basics/hardened_hash.h>
#include <ripple/basics/partitioned_unordered_map.h>
#include <ripple/beast/hash/hash_append.h>
#include <ripple/beast/hash/uhash.h>
#include <ripple/beast/hash/xxhasher.h>
#include <xrpl/basics/hardened_hash.h>
#include <xrpl/basics/partitioned_unordered_map.h>
#include <xrpl/beast/hash/hash_append.h>
#include <xrpl/beast/hash/uhash.h>
#include <xrpl/beast/hash/xxhasher.h>
#include <unordered_map>
#include <unordered_set>

8 changes: 4 additions & 4 deletions include/xrpl/basics/XRPAmount.h
Original file line number Diff line number Diff line change
@@ -20,10 +20,10 @@
#ifndef RIPPLE_BASICS_XRPAMOUNT_H_INCLUDED
#define RIPPLE_BASICS_XRPAMOUNT_H_INCLUDED

#include <ripple/basics/contract.h>
#include <ripple/basics/safe_cast.h>
#include <ripple/beast/utility/Zero.h>
#include <ripple/json/json_value.h>
#include <xrpl/basics/contract.h>
#include <xrpl/basics/safe_cast.h>
#include <xrpl/beast/utility/Zero.h>
#include <xrpl/json/json_value.h>

#include <boost/multiprecision/cpp_int.hpp>
#include <boost/operators.hpp>
12 changes: 6 additions & 6 deletions include/xrpl/basics/base_uint.h
Original file line number Diff line number Diff line change
@@ -25,12 +25,12 @@
#ifndef RIPPLE_BASICS_BASE_UINT_H_INCLUDED
#define RIPPLE_BASICS_BASE_UINT_H_INCLUDED

#include <ripple/basics/Expected.h>
#include <ripple/basics/Slice.h>
#include <ripple/basics/contract.h>
#include <ripple/basics/hardened_hash.h>
#include <ripple/basics/strHex.h>
#include <ripple/beast/utility/Zero.h>
#include <xrpl/basics/Expected.h>
#include <xrpl/basics/Slice.h>
#include <xrpl/basics/contract.h>
#include <xrpl/basics/hardened_hash.h>
#include <xrpl/basics/strHex.h>
#include <xrpl/beast/utility/Zero.h>
#include <boost/endian/conversion.hpp>
#include <boost/functional/hash.hpp>
#include <algorithm>
6 changes: 3 additions & 3 deletions include/xrpl/basics/chrono.h
Original file line number Diff line number Diff line change
@@ -22,9 +22,9 @@

#include <date/date.h>

#include <ripple/beast/clock/abstract_clock.h>
#include <ripple/beast/clock/basic_seconds_clock.h>
#include <ripple/beast/clock/manual_clock.h>
#include <xrpl/beast/clock/abstract_clock.h>
#include <xrpl/beast/clock/basic_seconds_clock.h>
#include <xrpl/beast/clock/manual_clock.h>

#include <chrono>
#include <cstdint>
2 changes: 1 addition & 1 deletion include/xrpl/basics/contract.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef RIPPLE_BASICS_CONTRACT_H_INCLUDED
#define RIPPLE_BASICS_CONTRACT_H_INCLUDED

#include <ripple/beast/type_name.h>
#include <xrpl/beast/type_name.h>
#include <exception>
#include <string>
#include <typeinfo>
4 changes: 2 additions & 2 deletions include/xrpl/basics/hardened_hash.h
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
#ifndef RIPPLE_BASICS_HARDENED_HASH_H_INCLUDED
#define RIPPLE_BASICS_HARDENED_HASH_H_INCLUDED

#include <ripple/beast/hash/hash_append.h>
#include <ripple/beast/hash/xxhasher.h>
#include <xrpl/beast/hash/hash_append.h>
#include <xrpl/beast/hash/xxhasher.h>

#include <cstdint>
#include <functional>
2 changes: 1 addition & 1 deletion include/xrpl/basics/random.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef RIPPLE_BASICS_RANDOM_H_INCLUDED
#define RIPPLE_BASICS_RANDOM_H_INCLUDED

#include <ripple/beast/xor_shift_engine.h>
#include <xrpl/beast/xor_shift_engine.h>
#include <cassert>
#include <cstddef>
#include <cstdint>
2 changes: 1 addition & 1 deletion include/xrpl/basics/tagged_integer.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED
#define BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED

#include <ripple/beast/hash/hash_append.h>
#include <xrpl/beast/hash/hash_append.h>
#include <boost/operators.hpp>
#include <functional>
#include <iostream>
2 changes: 1 addition & 1 deletion include/xrpl/beast/clock/manual_clock.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
#define BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED

#include <ripple/beast/clock/abstract_clock.h>
#include <xrpl/beast/clock/abstract_clock.h>
#include <cassert>

namespace beast {
2 changes: 1 addition & 1 deletion include/xrpl/beast/container/aged_container_utility.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
#define BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED

#include <ripple/beast/container/aged_container.h>
#include <xrpl/beast/container/aged_container.h>

#include <type_traits>

2 changes: 1 addition & 1 deletion include/xrpl/beast/container/aged_map.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef BEAST_CONTAINER_AGED_MAP_H_INCLUDED
#define BEAST_CONTAINER_AGED_MAP_H_INCLUDED

#include <ripple/beast/container/detail/aged_ordered_container.h>
#include <xrpl/beast/container/detail/aged_ordered_container.h>

#include <chrono>
#include <functional>
2 changes: 1 addition & 1 deletion include/xrpl/beast/container/aged_multimap.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
#define BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED

#include <ripple/beast/container/detail/aged_ordered_container.h>
#include <xrpl/beast/container/detail/aged_ordered_container.h>

#include <chrono>
#include <functional>
2 changes: 1 addition & 1 deletion include/xrpl/beast/container/aged_multiset.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
#define BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED

#include <ripple/beast/container/detail/aged_ordered_container.h>
#include <xrpl/beast/container/detail/aged_ordered_container.h>

#include <chrono>
#include <functional>
2 changes: 1 addition & 1 deletion include/xrpl/beast/container/aged_set.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef BEAST_CONTAINER_AGED_SET_H_INCLUDED
#define BEAST_CONTAINER_AGED_SET_H_INCLUDED

#include <ripple/beast/container/detail/aged_ordered_container.h>
#include <xrpl/beast/container/detail/aged_ordered_container.h>

#include <chrono>
#include <functional>
2 changes: 1 addition & 1 deletion include/xrpl/beast/container/aged_unordered_map.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
#define BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED

#include <ripple/beast/container/detail/aged_unordered_container.h>
#include <xrpl/beast/container/detail/aged_unordered_container.h>

#include <chrono>
#include <functional>
2 changes: 1 addition & 1 deletion include/xrpl/beast/container/aged_unordered_multimap.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
#define BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED

#include <ripple/beast/container/detail/aged_unordered_container.h>
#include <xrpl/beast/container/detail/aged_unordered_container.h>

#include <chrono>
#include <functional>
2 changes: 1 addition & 1 deletion include/xrpl/beast/container/aged_unordered_multiset.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
#define BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED

#include <ripple/beast/container/detail/aged_unordered_container.h>
#include <xrpl/beast/container/detail/aged_unordered_container.h>

#include <chrono>
#include <functional>
2 changes: 1 addition & 1 deletion include/xrpl/beast/container/aged_unordered_set.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#ifndef BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
#define BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED

#include <ripple/beast/container/detail/aged_unordered_container.h>
#include <xrpl/beast/container/detail/aged_unordered_container.h>

#include <chrono>
#include <functional>
10 changes: 5 additions & 5 deletions include/xrpl/beast/container/detail/aged_ordered_container.h
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@
#ifndef BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED
#define BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED

#include <ripple/beast/clock/abstract_clock.h>
#include <ripple/beast/container/aged_container.h>
#include <ripple/beast/container/detail/aged_associative_container.h>
#include <ripple/beast/container/detail/aged_container_iterator.h>
#include <ripple/beast/container/detail/empty_base_optimization.h>
#include <xrpl/beast/clock/abstract_clock.h>
#include <xrpl/beast/container/aged_container.h>
#include <xrpl/beast/container/detail/aged_associative_container.h>
#include <xrpl/beast/container/detail/aged_container_iterator.h>
#include <xrpl/beast/container/detail/empty_base_optimization.h>
#include <boost/intrusive/list.hpp>
#include <boost/intrusive/set.hpp>
#include <boost/version.hpp>
Loading