Skip to content

Commit efb9d1e

Browse files
graydongraydon
committed
Break circular include that defeats template instantiation rules
1 parent 45503d2 commit efb9d1e

24 files changed

+23
-1
lines changed

‎src/bucket/BucketManagerImpl.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "historywork/VerifyBucketWork.h"
1515
#include "ledger/LedgerManager.h"
1616
#include "ledger/LedgerTxn.h"
17+
#include "ledger/LedgerTypeUtils.h"
1718
#include "main/Application.h"
1819
#include "main/Config.h"
1920
#include "util/Fs.h"

‎src/bucket/test/BucketListTests.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "bucket/BucketOutputIterator.h"
1919
#include "bucket/test/BucketTestUtils.h"
2020
#include "crypto/Hex.h"
21+
#include "ledger/LedgerTypeUtils.h"
2122
#include "ledger/test/LedgerTestUtils.h"
2223
#include "lib/catch.hpp"
2324
#include "lib/util/stdrandom.h"

‎src/herder/Upgrades.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "ledger/LedgerTxn.h"
1414
#include "ledger/LedgerTxnEntry.h"
1515
#include "ledger/LedgerTxnHeader.h"
16+
#include "ledger/LedgerTypeUtils.h"
1617
#include "ledger/NetworkConfig.h"
1718
#include "ledger/TrustLineWrapper.h"
1819
#include "main/Config.h"

‎src/herder/test/UpgradesTests.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "ledger/LedgerTxn.h"
1818
#include "ledger/LedgerTxnEntry.h"
1919
#include "ledger/LedgerTxnHeader.h"
20+
#include "ledger/LedgerTypeUtils.h"
2021
#include "ledger/NetworkConfig.h"
2122
#include "ledger/TrustLineWrapper.h"
2223
#include "lib/catch.hpp"

‎src/ledger/LedgerCloseMetaFrame.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include "ledger/LedgerCloseMetaFrame.h"
66
#include "crypto/SHA.h"
7+
#include "ledger/LedgerTypeUtils.h"
78
#include "transactions/TransactionMetaFrame.h"
89
#include "util/GlobalChecks.h"
910
#include "util/ProtocolVersion.h"

‎src/ledger/LedgerHashUtils.h

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include "crypto/ShortHash.h"
88
#include "ledger/InternalLedgerEntry.h"
9-
#include "ledger/LedgerTypeUtils.h"
109
#include "util/HashOfHash.h"
1110
#include "xdr/Stellar-ledger-entries.h"
1211
#include "xdr/Stellar-ledger.h"

‎src/ledger/LedgerTxn.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "ledger/LedgerTxnEntry.h"
1515
#include "ledger/LedgerTxnHeader.h"
1616
#include "ledger/LedgerTxnImpl.h"
17+
#include "ledger/LedgerTypeUtils.h"
1718
#include "ledger/NonSociRelatedException.h"
1819
#include "main/Application.h"
1920
#include "transactions/TransactionUtils.h"

‎src/ledger/LedgerTxnAccountSQL.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "database/Database.h"
99
#include "database/DatabaseTypeSpecificOperation.h"
1010
#include "ledger/LedgerTxnImpl.h"
11+
#include "ledger/LedgerTypeUtils.h"
1112
#include "main/Application.h"
1213
#include "util/Decoder.h"
1314
#include "util/GlobalChecks.h"

‎src/ledger/LedgerTxnClaimableBalanceSQL.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
44

55
#include "ledger/LedgerTxnImpl.h"
6+
#include "ledger/LedgerTypeUtils.h"
67
#include "main/Application.h"
78
#include "util/GlobalChecks.h"
89
#include "util/types.h"

‎src/ledger/LedgerTxnConfigSettingSQL.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
44

55
#include "ledger/LedgerTxnImpl.h"
6+
#include "ledger/LedgerTypeUtils.h"
67
#include "ledger/NonSociRelatedException.h"
78
#include "main/Application.h"
89
#include "util/GlobalChecks.h"

‎src/ledger/LedgerTxnContractCodeSQL.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
44

55
#include "ledger/LedgerTxnImpl.h"
6+
#include "ledger/LedgerTypeUtils.h"
67
#include "ledger/NonSociRelatedException.h"
78
#include "main/Application.h"
89
#include "util/GlobalChecks.h"

‎src/ledger/LedgerTxnContractDataSQL.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
44

55
#include "ledger/LedgerTxnImpl.h"
6+
#include "ledger/LedgerTypeUtils.h"
67
#include "ledger/NonSociRelatedException.h"
78
#include "main/Application.h"
89
#include "util/GlobalChecks.h"

‎src/ledger/LedgerTxnDataSQL.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "database/Database.h"
88
#include "database/DatabaseTypeSpecificOperation.h"
99
#include "ledger/LedgerTxnImpl.h"
10+
#include "ledger/LedgerTypeUtils.h"
1011
#include "main/Application.h"
1112
#include "util/Decoder.h"
1213
#include "util/GlobalChecks.h"

‎src/ledger/LedgerTxnLiquidityPoolSQL.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
44

55
#include "ledger/LedgerTxnImpl.h"
6+
#include "ledger/LedgerTypeUtils.h"
67
#include "ledger/NonSociRelatedException.h"
78
#include "main/Application.h"
89
#include "util/GlobalChecks.h"

‎src/ledger/LedgerTxnOfferSQL.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "database/Database.h"
88
#include "database/DatabaseTypeSpecificOperation.h"
99
#include "ledger/LedgerTxnImpl.h"
10+
#include "ledger/LedgerTypeUtils.h"
1011
#include "main/Application.h"
1112
#include "main/Config.h"
1213
#include "transactions/TransactionUtils.h"

‎src/ledger/LedgerTxnTTLSQL.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
55

66
#include "ledger/LedgerTxnImpl.h"
7+
#include "ledger/LedgerTypeUtils.h"
78
#include "ledger/NonSociRelatedException.h"
89
#include "main/Application.h"
910
#include "util/GlobalChecks.h"

‎src/ledger/LedgerTxnTrustLineSQL.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "database/Database.h"
88
#include "database/DatabaseTypeSpecificOperation.h"
99
#include "ledger/LedgerTxnImpl.h"
10+
#include "ledger/LedgerTypeUtils.h"
1011
#include "ledger/NonSociRelatedException.h"
1112
#include "main/Application.h"
1213
#include "util/GlobalChecks.h"

‎src/main/ApplicationUtils.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "invariant/BucketListIsConsistentWithDatabase.h"
2020
#include "ledger/LedgerHeaderUtils.h"
2121
#include "ledger/LedgerManager.h"
22+
#include "ledger/LedgerTypeUtils.h"
2223
#include "main/ErrorMessages.h"
2324
#include "main/ExternalQueue.h"
2425
#include "main/Maintainer.h"

‎src/test/TxTests.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "ledger/LedgerTxn.h"
1212
#include "ledger/LedgerTxnEntry.h"
1313
#include "ledger/LedgerTxnHeader.h"
14+
#include "ledger/LedgerTypeUtils.h"
1415
#include "ledger/TrustLineWrapper.h"
1516
#include "ledger/test/LedgerTestUtils.h"
1617
#include "main/Application.h"

‎src/transactions/ExtendFootprintTTLOpFrame.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "transactions/ExtendFootprintTTLOpFrame.h"
66
#include "TransactionUtils.h"
77
#include "ledger/LedgerManagerImpl.h"
8+
#include "ledger/LedgerTypeUtils.h"
89
#include <Tracy.hpp>
910

1011
namespace stellar

‎src/transactions/InvokeHostFunctionOpFrame.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "ledger/LedgerManagerImpl.h"
2525
#include "ledger/LedgerTxn.h"
2626
#include "ledger/LedgerTxnEntry.h"
27+
#include "ledger/LedgerTypeUtils.h"
2728
#include "rust/RustBridge.h"
2829
#include "transactions/InvokeHostFunctionOpFrame.h"
2930
#include <Tracy.hpp>

‎src/transactions/RestoreFootprintOpFrame.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "transactions/RestoreFootprintOpFrame.h"
66
#include "TransactionUtils.h"
77
#include "ledger/LedgerManagerImpl.h"
8+
#include "ledger/LedgerTypeUtils.h"
89
#include <Tracy.hpp>
910

1011
namespace stellar

‎src/transactions/test/InvokeHostFunctionTests.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "herder/Herder.h"
1414
#include "ledger/LedgerManager.h"
1515
#include "ledger/LedgerTxn.h"
16+
#include "ledger/LedgerTypeUtils.h"
1617
#include "ledger/test/LedgerTestUtils.h"
1718
#include "lib/catch.hpp"
1819
#include "main/Application.h"

‎src/transactions/test/SorobanTxTestUtils.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
44

55
#include "SorobanTxTestUtils.h"
6+
#include "ledger/LedgerTypeUtils.h"
67
#include "lib/catch.hpp"
78
#include "rust/RustBridge.h"
89
#include "test/TestAccount.h"

0 commit comments

Comments
 (0)