From c3ae4da83a437ff2e45f1bf85b6b90101cec77bd Mon Sep 17 00:00:00 2001 From: Tom Ritchford Date: Wed, 28 Jan 2015 17:47:36 -0500 Subject: [PATCH] Fix include guards in rippled. --- src/ripple/app/book/Amount.h | 4 +- src/ripple/app/book/Amounts.h | 4 +- src/ripple/app/book/BookTip.h | 4 +- src/ripple/app/book/Offer.h | 4 +- src/ripple/app/book/OfferStream.h | 4 +- src/ripple/app/book/Quality.h | 4 +- src/ripple/app/book/Taker.h | 4 +- src/ripple/app/book/Types.h | 4 +- src/ripple/app/consensus/DisputedTx.h | 4 +- src/ripple/app/consensus/LedgerConsensus.h | 4 +- src/ripple/app/data/DBInit.h | 4 +- src/ripple/app/data/Database.h | 4 +- src/ripple/app/data/DatabaseCon.h | 4 +- src/ripple/app/data/SqliteDatabase.h | 4 +- src/ripple/app/ledger/AcceptedLedger.h | 4 +- src/ripple/app/ledger/AcceptedLedgerTx.h | 4 +- src/ripple/app/ledger/AccountStateSF.h | 4 +- src/ripple/app/ledger/BookListeners.h | 4 +- src/ripple/app/ledger/ConsensusTransSetSF.h | 4 +- .../app/ledger/DirectoryEntryIterator.h | 4 +- src/ripple/app/ledger/InboundLedger.h | 4 +- src/ripple/app/ledger/InboundLedgers.h | 4 +- src/ripple/app/ledger/Ledger.h | 4 +- src/ripple/app/ledger/LedgerCleaner.h | 4 +- src/ripple/app/ledger/LedgerEntrySet.h | 4 +- src/ripple/app/ledger/LedgerHistory.h | 4 +- src/ripple/app/ledger/LedgerHolder.h | 4 +- src/ripple/app/ledger/LedgerMaster.h | 4 +- src/ripple/app/ledger/LedgerProposal.h | 4 +- src/ripple/app/ledger/LedgerTiming.h | 4 +- src/ripple/app/ledger/LedgerToJson.h | 4 +- src/ripple/app/ledger/OrderBookDB.h | 4 +- src/ripple/app/ledger/OrderBookIterator.h | 4 +- src/ripple/app/ledger/TransactionStateSF.h | 4 +- src/ripple/app/main/Application.h | 4 +- src/ripple/app/main/CollectorManager.h | 4 +- src/ripple/app/main/LoadManager.h | 4 +- src/ripple/app/main/LocalCredentials.h | 4 +- src/ripple/app/main/NodeStoreScheduler.h | 4 +- src/ripple/app/main/Tuning.h | 4 +- src/ripple/app/misc/AccountState.h | 4 +- src/ripple/app/misc/AmendmentTable.h | 4 +- src/ripple/app/misc/CanonicalTXSet.h | 4 +- .../app/misc/DefaultMissingNodeHandler.h | 4 +- src/ripple/app/misc/FeeVote.h | 4 +- src/ripple/app/misc/IHashRouter.h | 4 +- src/ripple/app/misc/NetworkOPs.h | 4 +- src/ripple/app/misc/OrderBook.h | 4 +- src/ripple/app/misc/SHAMapStore.h | 4 +- src/ripple/app/misc/SHAMapStoreImp.h | 4 +- src/ripple/app/misc/Validations.h | 4 +- src/ripple/app/node/SqliteFactory.h | 4 +- src/ripple/app/paths/AccountCurrencies.h | 4 +- src/ripple/app/paths/Credit.h | 4 +- src/ripple/app/paths/FindPaths.h | 4 +- src/ripple/app/paths/Node.h | 4 +- src/ripple/app/paths/NodeDirectory.h | 4 +- src/ripple/app/paths/PathRequest.h | 4 +- src/ripple/app/paths/PathRequests.h | 4 +- src/ripple/app/paths/PathState.h | 4 +- src/ripple/app/paths/Pathfinder.h | 4 +- src/ripple/app/paths/RippleCalc.h | 4 +- src/ripple/app/paths/RippleLineCache.h | 4 +- src/ripple/app/paths/RippleState.h | 4 +- src/ripple/app/paths/Tuning.h | 4 +- src/ripple/app/paths/Types.h | 4 +- src/ripple/app/paths/cursor/PathCursor.h | 4 +- src/ripple/app/paths/cursor/RippleLiquidity.h | 4 +- src/ripple/app/peers/ClusterNodeStatus.h | 4 +- src/ripple/app/peers/PeerSet.h | 4 +- src/ripple/app/peers/UniqueNodeList.h | 4 +- src/ripple/app/transactors/CreateOffer.h | 83 +++++++++++++++++++ src/ripple/app/transactors/CreateTicket.h | 27 ++++++ src/ripple/app/transactors/Transactor.h | 4 +- src/ripple/app/tx/LocalTxs.h | 4 +- src/ripple/app/tx/Transaction.h | 4 +- src/ripple/app/tx/TransactionAcquire.h | 4 +- src/ripple/app/tx/TransactionEngine.h | 4 +- src/ripple/app/tx/TransactionMaster.h | 4 +- src/ripple/app/tx/TransactionMeta.h | 4 +- src/ripple/app/websocket/WSConnection.h | 4 +- src/ripple/app/websocket/WSDoor.h | 4 +- src/ripple/app/websocket/WSServerHandler.h | 4 +- src/ripple/basics/ByteOrder.h | 4 +- src/ripple/basics/TestSuite.h | 4 +- src/ripple/basics/UnorderedContainers.h | 4 +- src/ripple/basics/base_uint.h | 4 +- .../basics/impl/CheckLibraryVersionsImpl.h | 4 +- src/ripple/core/ConfigSections.h | 4 +- src/ripple/core/Job.h | 4 +- src/ripple/core/JobTypes.h | 4 +- src/ripple/core/LoadEvent.h | 4 +- src/ripple/core/LoadFeeTrack.h | 4 +- src/ripple/core/LoadMonitor.h | 4 +- src/ripple/core/impl/LoadFeeTrackImp.h | 4 +- src/ripple/crypto/Base58.h | 4 +- src/ripple/crypto/Base58Data.h | 4 +- src/ripple/crypto/ECDSA.h | 4 +- src/ripple/crypto/ECIES.h | 4 +- src/ripple/crypto/GenerateDeterministicKey.h | 4 +- src/ripple/crypto/ec_key.h | 4 +- src/ripple/json/JsonPropertyStream.h | 4 +- src/ripple/json/impl/json_assert.h | 4 +- src/ripple/json/impl/json_autolink.h | 4 +- src/ripple/json/impl/json_batchallocator.h | 4 +- src/ripple/json/json_config.h | 4 +- src/ripple/json/json_features.h | 4 +- src/ripple/json/json_forwards.h | 4 +- src/ripple/json/json_reader.h | 4 +- src/ripple/json/json_value.h | 4 +- src/ripple/json/json_writer.h | 4 +- src/ripple/json/to_string.h | 4 +- src/ripple/net/HTTPClient.h | 4 +- src/ripple/net/HTTPRequest.h | 4 +- src/ripple/net/InfoSub.h | 4 +- src/ripple/net/RPCCall.h | 4 +- src/ripple/net/RPCErr.h | 4 +- src/ripple/net/RPCSub.h | 4 +- src/ripple/net/SNTPClient.h | 4 +- src/ripple/nodestore/tests/Base.test.h | 4 +- src/ripple/peerfinder/impl/PrivateTypes.h | 4 +- src/ripple/peerfinder/impl/iosformat.h | 4 +- src/ripple/peerfinder/sim/sync_timer.h | 4 +- src/ripple/protocol/Blob.h | 4 +- src/ripple/protocol/Issue.h | 4 +- src/ripple/protocol/SField.h | 4 +- src/ripple/protocol/STBitString.h | 4 +- src/ripple/protocol/STPathSet.h | 4 +- src/ripple/protocol/STTx.h | 4 +- src/ripple/protocol/STVector256.h | 4 +- src/ripple/protocol/SystemParameters.h | 4 +- src/ripple/protocol/TER.h | 4 +- src/ripple/protocol/UintTypes.h | 4 +- src/ripple/rpc/Context.h | 4 +- src/ripple/rpc/Coroutine.h | 4 +- src/ripple/rpc/InternalHandler.h | 4 +- src/ripple/rpc/RPCHandler.h | 4 +- src/ripple/rpc/Status.h | 4 +- src/ripple/rpc/Yield.h | 4 +- src/ripple/rpc/handlers/Handlers.h | 4 +- src/ripple/rpc/handlers/Ledger.h | 4 +- src/ripple/rpc/impl/DoPrint.h | 4 +- src/ripple/rpc/impl/Handler.h | 4 +- src/ripple/rpc/impl/JsonObject.h | 4 +- src/ripple/rpc/impl/JsonWriter.h | 4 +- src/ripple/rpc/impl/WriteJson.h | 4 +- src/ripple/shamap/SHAMapAddNode.h | 4 +- src/ripple/shamap/SHAMapItem.h | 4 +- src/ripple/shamap/SHAMapMissingNode.h | 4 +- src/ripple/shamap/SHAMapNodeID.h | 4 +- src/ripple/shamap/SHAMapSyncFilter.h | 4 +- src/ripple/shamap/SHAMapTreeNode.h | 4 +- src/ripple/shamap/TreeNodeCache.h | 4 +- src/ripple/unity/git_id.h | 4 +- src/ripple/unity/hyperleveldb.h | 4 +- src/ripple/unity/leveldb.h | 4 +- src/ripple/unity/rocksdb.h | 4 +- src/ripple/unity/websocket.h | 4 +- src/ripple/websocket/autosocket/AutoSocket.h | 4 +- 159 files changed, 425 insertions(+), 313 deletions(-) create mode 100644 src/ripple/app/transactors/CreateOffer.h create mode 100644 src/ripple/app/transactors/CreateTicket.h diff --git a/src/ripple/app/book/Amount.h b/src/ripple/app/book/Amount.h index fe04319ad0..62e5736c13 100644 --- a/src/ripple/app/book/Amount.h +++ b/src/ripple/app/book/Amount.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CORE_AMOUNT_H_INCLUDED -#define RIPPLE_CORE_AMOUNT_H_INCLUDED +#ifndef RIPPLE_APP_BOOK_AMOUNT_H_INCLUDED +#define RIPPLE_APP_BOOK_AMOUNT_H_INCLUDED #include diff --git a/src/ripple/app/book/Amounts.h b/src/ripple/app/book/Amounts.h index e1a35c0280..ac87756d28 100644 --- a/src/ripple/app/book/Amounts.h +++ b/src/ripple/app/book/Amounts.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CORE_AMOUNTS_H_INCLUDED -#define RIPPLE_CORE_AMOUNTS_H_INCLUDED +#ifndef RIPPLE_APP_BOOK_AMOUNTS_H_INCLUDED +#define RIPPLE_APP_BOOK_AMOUNTS_H_INCLUDED #include diff --git a/src/ripple/app/book/BookTip.h b/src/ripple/app/book/BookTip.h index af949b010a..34cb086dca 100644 --- a/src/ripple/app/book/BookTip.h +++ b/src/ripple/app/book/BookTip.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CORE_BOOKTIP_H_INCLUDED -#define RIPPLE_CORE_BOOKTIP_H_INCLUDED +#ifndef RIPPLE_APP_BOOK_BOOKTIP_H_INCLUDED +#define RIPPLE_APP_BOOK_BOOKTIP_H_INCLUDED #include #include diff --git a/src/ripple/app/book/Offer.h b/src/ripple/app/book/Offer.h index 99e29dab08..63468582f1 100644 --- a/src/ripple/app/book/Offer.h +++ b/src/ripple/app/book/Offer.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CORE_OFFER_H_INCLUDED -#define RIPPLE_CORE_OFFER_H_INCLUDED +#ifndef RIPPLE_APP_BOOK_OFFER_H_INCLUDED +#define RIPPLE_APP_BOOK_OFFER_H_INCLUDED #include #include diff --git a/src/ripple/app/book/OfferStream.h b/src/ripple/app/book/OfferStream.h index 76de3e2db6..6d0b036e65 100644 --- a/src/ripple/app/book/OfferStream.h +++ b/src/ripple/app/book/OfferStream.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CORE_OFFERSTREAM_H_INCLUDED -#define RIPPLE_CORE_OFFERSTREAM_H_INCLUDED +#ifndef RIPPLE_APP_BOOK_OFFERSTREAM_H_INCLUDED +#define RIPPLE_APP_BOOK_OFFERSTREAM_H_INCLUDED #include #include diff --git a/src/ripple/app/book/Quality.h b/src/ripple/app/book/Quality.h index 9db92a3b19..4602106573 100644 --- a/src/ripple/app/book/Quality.h +++ b/src/ripple/app/book/Quality.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CORE_QUALITY_H_INCLUDED -#define RIPPLE_CORE_QUALITY_H_INCLUDED +#ifndef RIPPLE_APP_BOOK_QUALITY_H_INCLUDED +#define RIPPLE_APP_BOOK_QUALITY_H_INCLUDED #include #include diff --git a/src/ripple/app/book/Taker.h b/src/ripple/app/book/Taker.h index 4044f245b8..83dbf03234 100644 --- a/src/ripple/app/book/Taker.h +++ b/src/ripple/app/book/Taker.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CORE_TAKER_H_INCLUDED -#define RIPPLE_CORE_TAKER_H_INCLUDED +#ifndef RIPPLE_APP_BOOK_TAKER_H_INCLUDED +#define RIPPLE_APP_BOOK_TAKER_H_INCLUDED #include #include diff --git a/src/ripple/app/book/Types.h b/src/ripple/app/book/Types.h index 66945ac0ad..3b25969f81 100644 --- a/src/ripple/app/book/Types.h +++ b/src/ripple/app/book/Types.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CORE_TYPES_H_INCLUDED -#define RIPPLE_CORE_TYPES_H_INCLUDED +#ifndef RIPPLE_APP_BOOK_TYPES_H_INCLUDED +#define RIPPLE_APP_BOOK_TYPES_H_INCLUDED #include #include diff --git a/src/ripple/app/consensus/DisputedTx.h b/src/ripple/app/consensus/DisputedTx.h index c517e14445..338f68ea24 100644 --- a/src/ripple/app/consensus/DisputedTx.h +++ b/src/ripple/app/consensus/DisputedTx.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_DISPUTEDTX_H -#define RIPPLE_DISPUTEDTX_H +#ifndef RIPPLE_APP_CONSENSUS_DISPUTEDTX_H_INCLUDED +#define RIPPLE_APP_CONSENSUS_DISPUTEDTX_H_INCLUDED #include #include diff --git a/src/ripple/app/consensus/LedgerConsensus.h b/src/ripple/app/consensus/LedgerConsensus.h index b009bac7bc..a6266f7649 100644 --- a/src/ripple/app/consensus/LedgerConsensus.h +++ b/src/ripple/app/consensus/LedgerConsensus.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LEDGERCONSENSUS_H -#define RIPPLE_LEDGERCONSENSUS_H +#ifndef RIPPLE_APP_CONSENSUS_LEDGERCONSENSUS_H_INCLUDED +#define RIPPLE_APP_CONSENSUS_LEDGERCONSENSUS_H_INCLUDED #include #include diff --git a/src/ripple/app/data/DBInit.h b/src/ripple/app/data/DBInit.h index 36dfaa7732..f069afc153 100644 --- a/src/ripple/app/data/DBInit.h +++ b/src/ripple/app/data/DBInit.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_DBINIT_H_INCLUDED -#define RIPPLE_DBINIT_H_INCLUDED +#ifndef RIPPLE_APP_DATA_DBINIT_H_INCLUDED +#define RIPPLE_APP_DATA_DBINIT_H_INCLUDED namespace ripple { diff --git a/src/ripple/app/data/Database.h b/src/ripple/app/data/Database.h index d605c2f130..724b787fcc 100644 --- a/src/ripple/app/data/Database.h +++ b/src/ripple/app/data/Database.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_DATABASE_H_INCLUDED -#define RIPPLE_DATABASE_H_INCLUDED +#ifndef RIPPLE_APP_DATA_DATABASE_H_INCLUDED +#define RIPPLE_APP_DATA_DATABASE_H_INCLUDED #include #include diff --git a/src/ripple/app/data/DatabaseCon.h b/src/ripple/app/data/DatabaseCon.h index d72231e20e..f777c802cd 100644 --- a/src/ripple/app/data/DatabaseCon.h +++ b/src/ripple/app/data/DatabaseCon.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_DATABASECON_H -#define RIPPLE_DATABASECON_H +#ifndef RIPPLE_APP_DATA_DATABASECON_H_INCLUDED +#define RIPPLE_APP_DATA_DATABASECON_H_INCLUDED #include #include diff --git a/src/ripple/app/data/SqliteDatabase.h b/src/ripple/app/data/SqliteDatabase.h index aca6c7def1..873381dfb4 100644 --- a/src/ripple/app/data/SqliteDatabase.h +++ b/src/ripple/app/data/SqliteDatabase.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_SQLITEDATABASE_H_INCLUDED -#define RIPPLE_SQLITEDATABASE_H_INCLUDED +#ifndef RIPPLE_APP_DATA_SQLITEDATABASE_H_INCLUDED +#define RIPPLE_APP_DATA_SQLITEDATABASE_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/AcceptedLedger.h b/src/ripple/app/ledger/AcceptedLedger.h index 639703ea46..694c6766bf 100644 --- a/src/ripple/app/ledger/AcceptedLedger.h +++ b/src/ripple/app/ledger/AcceptedLedger.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_ACCEPTEDLEDGER_H -#define RIPPLE_ACCEPTEDLEDGER_H +#ifndef RIPPLE_APP_LEDGER_ACCEPTEDLEDGER_H_INCLUDED +#define RIPPLE_APP_LEDGER_ACCEPTEDLEDGER_H_INCLUDED #include diff --git a/src/ripple/app/ledger/AcceptedLedgerTx.h b/src/ripple/app/ledger/AcceptedLedgerTx.h index f12cd3a118..47b7be9733 100644 --- a/src/ripple/app/ledger/AcceptedLedgerTx.h +++ b/src/ripple/app/ledger/AcceptedLedgerTx.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_ACCEPTEDLEDGERTX_H -#define RIPPLE_ACCEPTEDLEDGERTX_H +#ifndef RIPPLE_APP_LEDGER_ACCEPTEDLEDGERTX_H_INCLUDED +#define RIPPLE_APP_LEDGER_ACCEPTEDLEDGERTX_H_INCLUDED #include diff --git a/src/ripple/app/ledger/AccountStateSF.h b/src/ripple/app/ledger/AccountStateSF.h index 97697325c4..7c0930c621 100644 --- a/src/ripple/app/ledger/AccountStateSF.h +++ b/src/ripple/app/ledger/AccountStateSF.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LEDGER_ACCOUNTSTATESF_H_INCLUDED -#define RIPPLE_LEDGER_ACCOUNTSTATESF_H_INCLUDED +#ifndef RIPPLE_APP_LEDGER_ACCOUNTSTATESF_H_INCLUDED +#define RIPPLE_APP_LEDGER_ACCOUNTSTATESF_H_INCLUDED #include diff --git a/src/ripple/app/ledger/BookListeners.h b/src/ripple/app/ledger/BookListeners.h index dac8e679a2..2f473e0a6c 100644 --- a/src/ripple/app/ledger/BookListeners.h +++ b/src/ripple/app/ledger/BookListeners.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_BOOKLISTENERS_H -#define RIPPLE_BOOKLISTENERS_H +#ifndef RIPPLE_APP_LEDGER_BOOKLISTENERS_H_INCLUDED +#define RIPPLE_APP_LEDGER_BOOKLISTENERS_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/ConsensusTransSetSF.h b/src/ripple/app/ledger/ConsensusTransSetSF.h index 425bfd8777..88354fa2da 100644 --- a/src/ripple/app/ledger/ConsensusTransSetSF.h +++ b/src/ripple/app/ledger/ConsensusTransSetSF.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LEDGER_CONSENSUSTRANSSETSF_H_INCLUDED -#define RIPPLE_LEDGER_CONSENSUSTRANSSETSF_H_INCLUDED +#ifndef RIPPLE_APP_LEDGER_CONSENSUSTRANSSETSF_H_INCLUDED +#define RIPPLE_APP_LEDGER_CONSENSUSTRANSSETSF_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/DirectoryEntryIterator.h b/src/ripple/app/ledger/DirectoryEntryIterator.h index 0fa87d730d..b2a534c589 100644 --- a/src/ripple/app/ledger/DirectoryEntryIterator.h +++ b/src/ripple/app/ledger/DirectoryEntryIterator.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_DIRECTORYENTRYITERATOR_H_INCLUDED -#define RIPPLE_DIRECTORYENTRYITERATOR_H_INCLUDED +#ifndef RIPPLE_APP_LEDGER_DIRECTORYENTRYITERATOR_H_INCLUDED +#define RIPPLE_APP_LEDGER_DIRECTORYENTRYITERATOR_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/InboundLedger.h b/src/ripple/app/ledger/InboundLedger.h index 8689f03ce4..c29f29f60f 100644 --- a/src/ripple/app/ledger/InboundLedger.h +++ b/src/ripple/app/ledger/InboundLedger.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_INBOUNDLEDGER_H -#define RIPPLE_INBOUNDLEDGER_H +#ifndef RIPPLE_APP_LEDGER_INBOUNDLEDGER_H_INCLUDED +#define RIPPLE_APP_LEDGER_INBOUNDLEDGER_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/InboundLedgers.h b/src/ripple/app/ledger/InboundLedgers.h index f5a0339193..8db87e456e 100644 --- a/src/ripple/app/ledger/InboundLedgers.h +++ b/src/ripple/app/ledger/InboundLedgers.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_INBOUNDLEDGERS_H -#define RIPPLE_INBOUNDLEDGERS_H +#ifndef RIPPLE_APP_LEDGER_INBOUNDLEDGERS_H_INCLUDED +#define RIPPLE_APP_LEDGER_INBOUNDLEDGERS_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/Ledger.h b/src/ripple/app/ledger/Ledger.h index f507d8a9ae..b9c9fc45e8 100644 --- a/src/ripple/app/ledger/Ledger.h +++ b/src/ripple/app/ledger/Ledger.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LEDGER_H -#define RIPPLE_LEDGER_H +#ifndef RIPPLE_APP_LEDGER_LEDGER_H_INCLUDED +#define RIPPLE_APP_LEDGER_LEDGER_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/LedgerCleaner.h b/src/ripple/app/ledger/LedgerCleaner.h index 177ed71711..a54ecb46e3 100644 --- a/src/ripple/app/ledger/LedgerCleaner.h +++ b/src/ripple/app/ledger/LedgerCleaner.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LEDGERCLEANER_H_INCLUDED -#define RIPPLE_LEDGERCLEANER_H_INCLUDED +#ifndef RIPPLE_APP_LEDGER_LEDGERCLEANER_H_INCLUDED +#define RIPPLE_APP_LEDGER_LEDGERCLEANER_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/LedgerEntrySet.h b/src/ripple/app/ledger/LedgerEntrySet.h index ad08a6033d..91d569fd8e 100644 --- a/src/ripple/app/ledger/LedgerEntrySet.h +++ b/src/ripple/app/ledger/LedgerEntrySet.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LEDGERENTRYSET_H -#define RIPPLE_LEDGERENTRYSET_H +#ifndef RIPPLE_APP_LEDGER_LEDGERENTRYSET_H_INCLUDED +#define RIPPLE_APP_LEDGER_LEDGERENTRYSET_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/LedgerHistory.h b/src/ripple/app/ledger/LedgerHistory.h index 28a1b97c70..05bf8ed1b1 100644 --- a/src/ripple/app/ledger/LedgerHistory.h +++ b/src/ripple/app/ledger/LedgerHistory.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LEDGERHISTORY_H -#define RIPPLE_LEDGERHISTORY_H +#ifndef RIPPLE_APP_LEDGER_LEDGERHISTORY_H_INCLUDED +#define RIPPLE_APP_LEDGER_LEDGERHISTORY_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/LedgerHolder.h b/src/ripple/app/ledger/LedgerHolder.h index 5699c72942..aaa2554d26 100644 --- a/src/ripple/app/ledger/LedgerHolder.h +++ b/src/ripple/app/ledger/LedgerHolder.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LEDGERHOLDER_H -#define RIPPLE_LEDGERHOLDER_H +#ifndef RIPPLE_APP_LEDGER_LEDGERHOLDER_H_INCLUDED +#define RIPPLE_APP_LEDGER_LEDGERHOLDER_H_INCLUDED namespace ripple { diff --git a/src/ripple/app/ledger/LedgerMaster.h b/src/ripple/app/ledger/LedgerMaster.h index ffc81ff5e2..a6782b6f65 100644 --- a/src/ripple/app/ledger/LedgerMaster.h +++ b/src/ripple/app/ledger/LedgerMaster.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LEDGERMASTER_H_INCLUDED -#define RIPPLE_LEDGERMASTER_H_INCLUDED +#ifndef RIPPLE_APP_LEDGER_LEDGERMASTER_H_INCLUDED +#define RIPPLE_APP_LEDGER_LEDGERMASTER_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/LedgerProposal.h b/src/ripple/app/ledger/LedgerProposal.h index 229b1e8ebc..83d19b2ace 100644 --- a/src/ripple/app/ledger/LedgerProposal.h +++ b/src/ripple/app/ledger/LedgerProposal.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_LEDGERPROPOSAL_H_INCLUDED -#define RIPPLE_APP_LEDGERPROPOSAL_H_INCLUDED +#ifndef RIPPLE_APP_LEDGER_LEDGERPROPOSAL_H_INCLUDED +#define RIPPLE_APP_LEDGER_LEDGERPROPOSAL_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/LedgerTiming.h b/src/ripple/app/ledger/LedgerTiming.h index 94b88d7829..a57307b908 100644 --- a/src/ripple/app/ledger/LedgerTiming.h +++ b/src/ripple/app/ledger/LedgerTiming.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef __LEDGERTIMING__ -#define __LEDGERTIMING__ +#ifndef RIPPLE_APP_LEDGER_LEDGERTIMING_H_INCLUDED +#define RIPPLE_APP_LEDGER_LEDGERTIMING_H_INCLUDED namespace ripple { diff --git a/src/ripple/app/ledger/LedgerToJson.h b/src/ripple/app/ledger/LedgerToJson.h index 2264f34eb4..8cea96616b 100644 --- a/src/ripple/app/ledger/LedgerToJson.h +++ b/src/ripple/app/ledger/LedgerToJson.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_APP_LEDGER_LEDGERTOJSON_H -#define RIPPLED_RIPPLE_APP_LEDGER_LEDGERTOJSON_H +#ifndef RIPPLE_APP_LEDGER_LEDGERTOJSON_H_INCLUDED +#define RIPPLE_APP_LEDGER_LEDGERTOJSON_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/OrderBookDB.h b/src/ripple/app/ledger/OrderBookDB.h index 936c5e5e6f..9ae2304351 100644 --- a/src/ripple/app/ledger/OrderBookDB.h +++ b/src/ripple/app/ledger/OrderBookDB.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_ORDERBOOKDB_H_INCLUDED -#define RIPPLE_ORDERBOOKDB_H_INCLUDED +#ifndef RIPPLE_APP_LEDGER_ORDERBOOKDB_H_INCLUDED +#define RIPPLE_APP_LEDGER_ORDERBOOKDB_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/OrderBookIterator.h b/src/ripple/app/ledger/OrderBookIterator.h index fd41000147..bf3ab7ea91 100644 --- a/src/ripple/app/ledger/OrderBookIterator.h +++ b/src/ripple/app/ledger/OrderBookIterator.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_ORDERBOOKITERATOR_H_INCLUDED -#define RIPPLE_ORDERBOOKITERATOR_H_INCLUDED +#ifndef RIPPLE_APP_LEDGER_ORDERBOOKITERATOR_H_INCLUDED +#define RIPPLE_APP_LEDGER_ORDERBOOKITERATOR_H_INCLUDED #include #include diff --git a/src/ripple/app/ledger/TransactionStateSF.h b/src/ripple/app/ledger/TransactionStateSF.h index b9338ef1ef..9e4a4d3447 100644 --- a/src/ripple/app/ledger/TransactionStateSF.h +++ b/src/ripple/app/ledger/TransactionStateSF.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LEDGER_TRANSACTIONSTATESF_H_INCLUDED -#define RIPPLE_LEDGER_TRANSACTIONSTATESF_H_INCLUDED +#ifndef RIPPLE_APP_LEDGER_TRANSACTIONSTATESF_H_INCLUDED +#define RIPPLE_APP_LEDGER_TRANSACTIONSTATESF_H_INCLUDED #include #include diff --git a/src/ripple/app/main/Application.h b/src/ripple/app/main/Application.h index 3f1440db0c..c5aebb21c5 100644 --- a/src/ripple/app/main/Application.h +++ b/src/ripple/app/main/Application.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_APPLICATION_H_INCLUDED -#define RIPPLE_APP_APPLICATION_H_INCLUDED +#ifndef RIPPLE_APP_MAIN_APPLICATION_H_INCLUDED +#define RIPPLE_APP_MAIN_APPLICATION_H_INCLUDED #include #include diff --git a/src/ripple/app/main/CollectorManager.h b/src/ripple/app/main/CollectorManager.h index e85adca528..c28b7697e2 100644 --- a/src/ripple/app/main/CollectorManager.h +++ b/src/ripple/app/main/CollectorManager.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_RIPPLECOLLECTOR_H_INCLUDED -#define RIPPLE_RIPPLECOLLECTOR_H_INCLUDED +#ifndef RIPPLE_APP_MAIN_COLLECTORMANAGER_H_INCLUDED +#define RIPPLE_APP_MAIN_COLLECTORMANAGER_H_INCLUDED #include #include diff --git a/src/ripple/app/main/LoadManager.h b/src/ripple/app/main/LoadManager.h index bd291a2c5c..e0e8262c55 100644 --- a/src/ripple/app/main/LoadManager.h +++ b/src/ripple/app/main/LoadManager.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LOADMANAGER_H_INCLUDED -#define RIPPLE_LOADMANAGER_H_INCLUDED +#ifndef RIPPLE_APP_MAIN_LOADMANAGER_H_INCLUDED +#define RIPPLE_APP_MAIN_LOADMANAGER_H_INCLUDED #include #include // diff --git a/src/ripple/app/main/LocalCredentials.h b/src/ripple/app/main/LocalCredentials.h index a2e482b72f..955000a3b8 100644 --- a/src/ripple/app/main/LocalCredentials.h +++ b/src/ripple/app/main/LocalCredentials.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LOCALCREDENTIALS_H -#define RIPPLE_LOCALCREDENTIALS_H +#ifndef RIPPLE_APP_MAIN_LOCALCREDENTIALS_H_INCLUDED +#define RIPPLE_APP_MAIN_LOCALCREDENTIALS_H_INCLUDED #include #include diff --git a/src/ripple/app/main/NodeStoreScheduler.h b/src/ripple/app/main/NodeStoreScheduler.h index 3034928599..c0fd145a32 100644 --- a/src/ripple/app/main/NodeStoreScheduler.h +++ b/src/ripple/app/main/NodeStoreScheduler.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_NODESTORESCHEDULER_H_INCLUDED -#define RIPPLE_APP_NODESTORESCHEDULER_H_INCLUDED +#ifndef RIPPLE_APP_MAIN_NODESTORESCHEDULER_H_INCLUDED +#define RIPPLE_APP_MAIN_NODESTORESCHEDULER_H_INCLUDED #include #include diff --git a/src/ripple/app/main/Tuning.h b/src/ripple/app/main/Tuning.h index fa09ebb4ba..d035e9cbb0 100644 --- a/src/ripple/app/main/Tuning.h +++ b/src/ripple/app/main/Tuning.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APPLICATION_TUNING_H_INCLUDED -#define RIPPLE_APPLICATION_TUNING_H_INCLUDED +#ifndef RIPPLE_APP_MAIN_TUNING_H_INCLUDED +#define RIPPLE_APP_MAIN_TUNING_H_INCLUDED namespace ripple { diff --git a/src/ripple/app/misc/AccountState.h b/src/ripple/app/misc/AccountState.h index e0a594a5b7..47d277c489 100644 --- a/src/ripple/app/misc/AccountState.h +++ b/src/ripple/app/misc/AccountState.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_ACCOUNTSTATE_H -#define RIPPLE_ACCOUNTSTATE_H +#ifndef RIPPLE_APP_MISC_ACCOUNTSTATE_H_INCLUDED +#define RIPPLE_APP_MISC_ACCOUNTSTATE_H_INCLUDED #include #include diff --git a/src/ripple/app/misc/AmendmentTable.h b/src/ripple/app/misc/AmendmentTable.h index 3fd3da6d7f..a51540e037 100644 --- a/src/ripple/app/misc/AmendmentTable.h +++ b/src/ripple/app/misc/AmendmentTable.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_AMENDMENT_TABLE_H -#define RIPPLE_AMENDMENT_TABLE_H +#ifndef RIPPLE_APP_MISC_AMENDMENTTABLE_H_INCLUDED +#define RIPPLE_APP_MISC_AMENDMENTTABLE_H_INCLUDED #include #include diff --git a/src/ripple/app/misc/CanonicalTXSet.h b/src/ripple/app/misc/CanonicalTXSet.h index e028d9d059..447785d61a 100644 --- a/src/ripple/app/misc/CanonicalTXSet.h +++ b/src/ripple/app/misc/CanonicalTXSet.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CANONICALTXSET_H -#define RIPPLE_CANONICALTXSET_H +#ifndef RIPPLE_APP_MISC_CANONICALTXSET_H_INCLUDED +#define RIPPLE_APP_MISC_CANONICALTXSET_H_INCLUDED #include #include diff --git a/src/ripple/app/misc/DefaultMissingNodeHandler.h b/src/ripple/app/misc/DefaultMissingNodeHandler.h index ea8d2577b0..d576919c34 100644 --- a/src/ripple/app/misc/DefaultMissingNodeHandler.h +++ b/src/ripple/app/misc/DefaultMissingNodeHandler.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_DEFAULTMISSINGNODEHANDLER_H_INCLUDED -#define RIPPLE_APP_DEFAULTMISSINGNODEHANDLER_H_INCLUDED +#ifndef RIPPLE_APP_MISC_DEFAULTMISSINGNODEHANDLER_H_INCLUDED +#define RIPPLE_APP_MISC_DEFAULTMISSINGNODEHANDLER_H_INCLUDED #include diff --git a/src/ripple/app/misc/FeeVote.h b/src/ripple/app/misc/FeeVote.h index 1c85662281..c78f72c340 100644 --- a/src/ripple/app/misc/FeeVote.h +++ b/src/ripple/app/misc/FeeVote.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_FEEVOTE_H_INCLUDED -#define RIPPLE_APP_FEEVOTE_H_INCLUDED +#ifndef RIPPLE_APP_MISC_FEEVOTE_H_INCLUDED +#define RIPPLE_APP_MISC_FEEVOTE_H_INCLUDED #include #include diff --git a/src/ripple/app/misc/IHashRouter.h b/src/ripple/app/misc/IHashRouter.h index 3f36860161..120c8a4b1e 100644 --- a/src/ripple/app/misc/IHashRouter.h +++ b/src/ripple/app/misc/IHashRouter.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_HASHROUTER_H_INCLUDED -#define RIPPLE_HASHROUTER_H_INCLUDED +#ifndef RIPPLE_APP_MISC_IHASHROUTER_H_INCLUDED +#define RIPPLE_APP_MISC_IHASHROUTER_H_INCLUDED #include #include diff --git a/src/ripple/app/misc/NetworkOPs.h b/src/ripple/app/misc/NetworkOPs.h index e98e946fd8..d9bfa2fe78 100644 --- a/src/ripple/app/misc/NetworkOPs.h +++ b/src/ripple/app/misc/NetworkOPs.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_NETWORKOPS_H -#define RIPPLE_NETWORKOPS_H +#ifndef RIPPLE_APP_MISC_NETWORKOPS_H_INCLUDED +#define RIPPLE_APP_MISC_NETWORKOPS_H_INCLUDED #include #include diff --git a/src/ripple/app/misc/OrderBook.h b/src/ripple/app/misc/OrderBook.h index 08be8e74ad..c8a2612d04 100644 --- a/src/ripple/app/misc/OrderBook.h +++ b/src/ripple/app/misc/OrderBook.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_ORDERBOOK_H -#define RIPPLE_ORDERBOOK_H +#ifndef RIPPLE_APP_MISC_ORDERBOOK_H_INCLUDED +#define RIPPLE_APP_MISC_ORDERBOOK_H_INCLUDED namespace ripple { diff --git a/src/ripple/app/misc/SHAMapStore.h b/src/ripple/app/misc/SHAMapStore.h index 320e5591d8..796f3c87c3 100644 --- a/src/ripple/app/misc/SHAMapStore.h +++ b/src/ripple/app/misc/SHAMapStore.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_SHAMAPSTORE_H_INCLUDED -#define RIPPLE_APP_SHAMAPSTORE_H_INCLUDED +#ifndef RIPPLE_APP_MISC_SHAMAPSTORE_H_INCLUDED +#define RIPPLE_APP_MISC_SHAMAPSTORE_H_INCLUDED #include #include diff --git a/src/ripple/app/misc/SHAMapStoreImp.h b/src/ripple/app/misc/SHAMapStoreImp.h index e8c6b928cf..7c73cea6c8 100644 --- a/src/ripple/app/misc/SHAMapStoreImp.h +++ b/src/ripple/app/misc/SHAMapStoreImp.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_SHAMAPSTOREIMP_H_INCLUDED -#define RIPPLE_APP_SHAMAPSTOREIMP_H_INCLUDED +#ifndef RIPPLE_APP_MISC_SHAMAPSTOREIMP_H_INCLUDED +#define RIPPLE_APP_MISC_SHAMAPSTOREIMP_H_INCLUDED #include #include diff --git a/src/ripple/app/misc/Validations.h b/src/ripple/app/misc/Validations.h index e04a839c60..7c6b810de9 100644 --- a/src/ripple/app/misc/Validations.h +++ b/src/ripple/app/misc/Validations.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_VALIDATIONS_H_INCLUDED -#define RIPPLE_VALIDATIONS_H_INCLUDED +#ifndef RIPPLE_APP_MISC_VALIDATIONS_H_INCLUDED +#define RIPPLE_APP_MISC_VALIDATIONS_H_INCLUDED #include #include // diff --git a/src/ripple/app/node/SqliteFactory.h b/src/ripple/app/node/SqliteFactory.h index 52d10a5a29..613ab2f46a 100644 --- a/src/ripple/app/node/SqliteFactory.h +++ b/src/ripple/app/node/SqliteFactory.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_SQLITEFACTORY_H_INCLUDED -#define RIPPLE_APP_SQLITEFACTORY_H_INCLUDED +#ifndef RIPPLE_APP_NODE_SQLITEFACTORY_H_INCLUDED +#define RIPPLE_APP_NODE_SQLITEFACTORY_H_INCLUDED #include diff --git a/src/ripple/app/paths/AccountCurrencies.h b/src/ripple/app/paths/AccountCurrencies.h index 207fc34759..7d082d4f00 100644 --- a/src/ripple/app/paths/AccountCurrencies.h +++ b/src/ripple/app/paths/AccountCurrencies.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_APP_PATHS_ACCOUNTCURRENCIES_H -#define RIPPLED_RIPPLE_APP_PATHS_ACCOUNTCURRENCIES_H +#ifndef RIPPLE_APP_PATHS_ACCOUNTCURRENCIES_H_INCLUDED +#define RIPPLE_APP_PATHS_ACCOUNTCURRENCIES_H_INCLUDED #include diff --git a/src/ripple/app/paths/Credit.h b/src/ripple/app/paths/Credit.h index e0ba4b45e2..78372be3a8 100644 --- a/src/ripple/app/paths/Credit.h +++ b/src/ripple/app/paths/Credit.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_APP_PATHS_CREDIT_H -#define RIPPLED_RIPPLE_APP_PATHS_CREDIT_H +#ifndef RIPPLE_APP_PATHS_CREDIT_H_INCLUDED +#define RIPPLE_APP_PATHS_CREDIT_H_INCLUDED #include #include diff --git a/src/ripple/app/paths/FindPaths.h b/src/ripple/app/paths/FindPaths.h index 83feebc5fe..cdc65e85f7 100644 --- a/src/ripple/app/paths/FindPaths.h +++ b/src/ripple/app/paths/FindPaths.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_APP_PATHS_FINDPATHS_H -#define RIPPLED_RIPPLE_APP_PATHS_FINDPATHS_H +#ifndef RIPPLE_APP_PATHS_FINDPATHS_H_INCLUDED +#define RIPPLE_APP_PATHS_FINDPATHS_H_INCLUDED #include diff --git a/src/ripple/app/paths/Node.h b/src/ripple/app/paths/Node.h index 94dc91b5c2..a4230e2f0f 100644 --- a/src/ripple/app/paths/Node.h +++ b/src/ripple/app/paths/Node.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_PATH_NODE_H -#define RIPPLE_APP_PATH_NODE_H +#ifndef RIPPLE_APP_PATHS_NODE_H_INCLUDED +#define RIPPLE_APP_PATHS_NODE_H_INCLUDED #include #include diff --git a/src/ripple/app/paths/NodeDirectory.h b/src/ripple/app/paths/NodeDirectory.h index a3660786ca..1d8791761b 100644 --- a/src/ripple/app/paths/NodeDirectory.h +++ b/src/ripple/app/paths/NodeDirectory.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_MODULE_APP_PATHS_NODEDIRECTORY_H -#define RIPPLED_RIPPLE_MODULE_APP_PATHS_NODEDIRECTORY_H +#ifndef RIPPLE_APP_PATHS_NODEDIRECTORY_H_INCLUDED +#define RIPPLE_APP_PATHS_NODEDIRECTORY_H_INCLUDED #include #include diff --git a/src/ripple/app/paths/PathRequest.h b/src/ripple/app/paths/PathRequest.h index 40a1a32438..d40ddde37f 100644 --- a/src/ripple/app/paths/PathRequest.h +++ b/src/ripple/app/paths/PathRequest.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PATHREQUEST_H -#define RIPPLE_PATHREQUEST_H +#ifndef RIPPLE_APP_PATHS_PATHREQUEST_H_INCLUDED +#define RIPPLE_APP_PATHS_PATHREQUEST_H_INCLUDED #include #include diff --git a/src/ripple/app/paths/PathRequests.h b/src/ripple/app/paths/PathRequests.h index 5731abd982..0d507284ba 100644 --- a/src/ripple/app/paths/PathRequests.h +++ b/src/ripple/app/paths/PathRequests.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PATHREQUESTS_H -#define RIPPLE_PATHREQUESTS_H +#ifndef RIPPLE_APP_PATHS_PATHREQUESTS_H_INCLUDED +#define RIPPLE_APP_PATHS_PATHREQUESTS_H_INCLUDED #include #include diff --git a/src/ripple/app/paths/PathState.h b/src/ripple/app/paths/PathState.h index a76c0b072a..83d143ff0a 100644 --- a/src/ripple/app/paths/PathState.h +++ b/src/ripple/app/paths/PathState.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PATHSTATE_H -#define RIPPLE_PATHSTATE_H +#ifndef RIPPLE_APP_PATHS_PATHSTATE_H_INCLUDED +#define RIPPLE_APP_PATHS_PATHSTATE_H_INCLUDED #include #include diff --git a/src/ripple/app/paths/Pathfinder.h b/src/ripple/app/paths/Pathfinder.h index 9e18710781..f328a67359 100644 --- a/src/ripple/app/paths/Pathfinder.h +++ b/src/ripple/app/paths/Pathfinder.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PATHFINDER_H -#define RIPPLE_PATHFINDER_H +#ifndef RIPPLE_APP_PATHS_PATHFINDER_H_INCLUDED +#define RIPPLE_APP_PATHS_PATHFINDER_H_INCLUDED #include #include diff --git a/src/ripple/app/paths/RippleCalc.h b/src/ripple/app/paths/RippleCalc.h index 6ec05a7ae5..aaddab0502 100644 --- a/src/ripple/app/paths/RippleCalc.h +++ b/src/ripple/app/paths/RippleCalc.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_RIPPLECALC_H -#define RIPPLE_RIPPLECALC_H +#ifndef RIPPLE_APP_PATHS_RIPPLECALC_H_INCLUDED +#define RIPPLE_APP_PATHS_RIPPLECALC_H_INCLUDED #include #include diff --git a/src/ripple/app/paths/RippleLineCache.h b/src/ripple/app/paths/RippleLineCache.h index 8f9557364a..5e5f0ad190 100644 --- a/src/ripple/app/paths/RippleLineCache.h +++ b/src/ripple/app/paths/RippleLineCache.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_RIPPLELINECACHE_H -#define RIPPLE_RIPPLELINECACHE_H +#ifndef RIPPLE_APP_PATHS_RIPPLELINECACHE_H_INCLUDED +#define RIPPLE_APP_PATHS_RIPPLELINECACHE_H_INCLUDED #include #include diff --git a/src/ripple/app/paths/RippleState.h b/src/ripple/app/paths/RippleState.h index 6f7ebf2452..491eddf771 100644 --- a/src/ripple/app/paths/RippleState.h +++ b/src/ripple/app/paths/RippleState.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_RIPPLESTATE_H -#define RIPPLE_RIPPLESTATE_H +#ifndef RIPPLE_APP_PATHS_RIPPLESTATE_H_INCLUDED +#define RIPPLE_APP_PATHS_RIPPLESTATE_H_INCLUDED #include #include diff --git a/src/ripple/app/paths/Tuning.h b/src/ripple/app/paths/Tuning.h index d786502df5..658e1a92d7 100644 --- a/src/ripple/app/paths/Tuning.h +++ b/src/ripple/app/paths/Tuning.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_PATHS_TUNING_H -#define RIPPLE_APP_PATHS_TUNING_H +#ifndef RIPPLE_APP_PATHS_TUNING_H_INCLUDED +#define RIPPLE_APP_PATHS_TUNING_H_INCLUDED namespace ripple { diff --git a/src/ripple/app/paths/Types.h b/src/ripple/app/paths/Types.h index d0b6605623..a1fa74907f 100644 --- a/src/ripple/app/paths/Types.h +++ b/src/ripple/app/paths/Types.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_TYPES_H_INCLUDED -#define RIPPLE_TYPES_H_INCLUDED +#ifndef RIPPLE_APP_PATHS_TYPES_H_INCLUDED +#define RIPPLE_APP_PATHS_TYPES_H_INCLUDED namespace ripple { diff --git a/src/ripple/app/paths/cursor/PathCursor.h b/src/ripple/app/paths/cursor/PathCursor.h index 6c8b93300a..c35dd6ce89 100644 --- a/src/ripple/app/paths/cursor/PathCursor.h +++ b/src/ripple/app/paths/cursor/PathCursor.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_MODULE_APP_PATHS_PATHCURSOR_H -#define RIPPLED_RIPPLE_MODULE_APP_PATHS_PATHCURSOR_H +#ifndef RIPPLE_APP_PATHS_CURSOR_PATHCURSOR_H_INCLUDED +#define RIPPLE_APP_PATHS_CURSOR_PATHCURSOR_H_INCLUDED #include diff --git a/src/ripple/app/paths/cursor/RippleLiquidity.h b/src/ripple/app/paths/cursor/RippleLiquidity.h index 3ff6c75a16..a408e55d14 100644 --- a/src/ripple/app/paths/cursor/RippleLiquidity.h +++ b/src/ripple/app/paths/cursor/RippleLiquidity.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PATHS_CALCULATORS_H -#define RIPPLE_PATHS_CALCULATORS_H +#ifndef RIPPLE_APP_PATHS_CURSOR_RIPPLELIQUIDITY_H_INCLUDED +#define RIPPLE_APP_PATHS_CURSOR_RIPPLELIQUIDITY_H_INCLUDED #include diff --git a/src/ripple/app/peers/ClusterNodeStatus.h b/src/ripple/app/peers/ClusterNodeStatus.h index cbab6b750b..d51106ddf4 100644 --- a/src/ripple/app/peers/ClusterNodeStatus.h +++ b/src/ripple/app/peers/ClusterNodeStatus.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CLUSTERNODESTATUS_H_INCLUDED -#define RIPPLE_CLUSTERNODESTATUS_H_INCLUDED +#ifndef RIPPLE_APP_PEERS_CLUSTERNODESTATUS_H_INCLUDED +#define RIPPLE_APP_PEERS_CLUSTERNODESTATUS_H_INCLUDED namespace ripple { diff --git a/src/ripple/app/peers/PeerSet.h b/src/ripple/app/peers/PeerSet.h index ab3de7f441..c2f1b2ef6a 100644 --- a/src/ripple/app/peers/PeerSet.h +++ b/src/ripple/app/peers/PeerSet.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PEERSET_H -#define RIPPLE_PEERSET_H +#ifndef RIPPLE_APP_PEERS_PEERSET_H_INCLUDED +#define RIPPLE_APP_PEERS_PEERSET_H_INCLUDED #include #include diff --git a/src/ripple/app/peers/UniqueNodeList.h b/src/ripple/app/peers/UniqueNodeList.h index d887c54f47..c6897f3161 100644 --- a/src/ripple/app/peers/UniqueNodeList.h +++ b/src/ripple/app/peers/UniqueNodeList.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_UNIQUENODELIST_H_INCLUDED -#define RIPPLE_UNIQUENODELIST_H_INCLUDED +#ifndef RIPPLE_APP_PEERS_UNIQUENODELIST_H_INCLUDED +#define RIPPLE_APP_PEERS_UNIQUENODELIST_H_INCLUDED #include #include // diff --git a/src/ripple/app/transactors/CreateOffer.h b/src/ripple/app/transactors/CreateOffer.h new file mode 100644 index 0000000000..28299e5b84 --- /dev/null +++ b/src/ripple/app/transactors/CreateOffer.h @@ -0,0 +1,83 @@ +//------------------------------------------------------------------------------ +/* + This file is part of rippled: https://github.com/ripple/rippled + Copyright (c) 2012, 2013 Ripple Labs Inc. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ +//============================================================================== + +#ifndef RIPPLE_APP_TRANSACTORS_CREATEOFFER_H_INCLUDED +#define RIPPLE_APP_TRANSACTORS_CREATEOFFER_H_INCLUDED + +#include +#include +#include +#include +#include +#include +#include +#include + +namespace ripple { + +class CreateOffer + : public Transactor +{ +private: + // What kind of offer we are placing +#if RIPPLE_ENABLE_AUTOBRIDGING + bool autobridging_; +#endif + + // Determine if we are authorized to hold the asset we want to get + TER + checkAcceptAsset(IssueRef issue) const; + + /* Fill offer as much as possible by consuming offers already on the books. + We adjusts account balances and charges fees on top to taker. + + @param taker_amount.in How much the taker offers + @param taker_amount.out How much the taker wants + + @return result.first crossing operation success/failure indicator. + result.second amount of offer left unfilled - only meaningful + if result.first is tesSUCCESS. + */ + std::pair + crossOffersBridged (core::LedgerView& view, + core::Amounts const& taker_amount); + + std::pair + crossOffersDirect (core::LedgerView& view, + core::Amounts const& taker_amount); + + std::pair + crossOffers (core::LedgerView& view, + core::Amounts const& taker_amount); + +public: + CreateOffer (bool autobridging, STTx const& txn, + TransactionEngineParams params, TransactionEngine* engine); + + TER + doApply() override; +}; + +TER +transact_CreateOffer (STTx const& txn, + TransactionEngineParams params, TransactionEngine* engine); + +} + +#endif diff --git a/src/ripple/app/transactors/CreateTicket.h b/src/ripple/app/transactors/CreateTicket.h new file mode 100644 index 0000000000..ffe7a8b542 --- /dev/null +++ b/src/ripple/app/transactors/CreateTicket.h @@ -0,0 +1,27 @@ +//------------------------------------------------------------------------------ +/* + This file is part of rippled: https://github.com/ripple/rippled + Copyright (c) 2014 Ripple Labs Inc. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ +//============================================================================== + +#ifndef RIPPLE_APP_TRANSACTORS_CREATETICKET_H_INCLUDED +#define RIPPLE_APP_TRANSACTORS_CREATETICKET_H_INCLUDED + +namespace ripple { + +} + +#endif diff --git a/src/ripple/app/transactors/Transactor.h b/src/ripple/app/transactors/Transactor.h index db1655e9a3..2cbfacb7de 100644 --- a/src/ripple/app/transactors/Transactor.h +++ b/src/ripple/app/transactors/Transactor.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_TX_TRANSACTOR_H_INCLUDED -#define RIPPLE_TX_TRANSACTOR_H_INCLUDED +#ifndef RIPPLE_APP_TRANSACTORS_TRANSACTOR_H_INCLUDED +#define RIPPLE_APP_TRANSACTORS_TRANSACTOR_H_INCLUDED #include diff --git a/src/ripple/app/tx/LocalTxs.h b/src/ripple/app/tx/LocalTxs.h index 09eedf66da..7825f51f21 100644 --- a/src/ripple/app/tx/LocalTxs.h +++ b/src/ripple/app/tx/LocalTxs.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LOCALTRANSACTIONS_H -#define RIPPLE_LOCALTRANSACTIONS_H +#ifndef RIPPLE_APP_TX_LOCALTXS_H_INCLUDED +#define RIPPLE_APP_TX_LOCALTXS_H_INCLUDED #include #include diff --git a/src/ripple/app/tx/Transaction.h b/src/ripple/app/tx/Transaction.h index 12ba4ff4d8..041caa4d93 100644 --- a/src/ripple/app/tx/Transaction.h +++ b/src/ripple/app/tx/Transaction.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_TRANSACTION_H -#define RIPPLE_TRANSACTION_H +#ifndef RIPPLE_APP_TX_TRANSACTION_H_INCLUDED +#define RIPPLE_APP_TX_TRANSACTION_H_INCLUDED #include #include diff --git a/src/ripple/app/tx/TransactionAcquire.h b/src/ripple/app/tx/TransactionAcquire.h index e3ed402837..0b16492e44 100644 --- a/src/ripple/app/tx/TransactionAcquire.h +++ b/src/ripple/app/tx/TransactionAcquire.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_TRANSACTIONACQUIRE_H -#define RIPPLE_TRANSACTIONACQUIRE_H +#ifndef RIPPLE_APP_TX_TRANSACTIONACQUIRE_H_INCLUDED +#define RIPPLE_APP_TX_TRANSACTIONACQUIRE_H_INCLUDED #include #include diff --git a/src/ripple/app/tx/TransactionEngine.h b/src/ripple/app/tx/TransactionEngine.h index 94c54b8c0b..5d831733b6 100644 --- a/src/ripple/app/tx/TransactionEngine.h +++ b/src/ripple/app/tx/TransactionEngine.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_TRANSACTIONENGINE_H_INCLUDED -#define RIPPLE_APP_TRANSACTIONENGINE_H_INCLUDED +#ifndef RIPPLE_APP_TX_TRANSACTIONENGINE_H_INCLUDED +#define RIPPLE_APP_TX_TRANSACTIONENGINE_H_INCLUDED #include #include diff --git a/src/ripple/app/tx/TransactionMaster.h b/src/ripple/app/tx/TransactionMaster.h index 0547edc1d0..426b31d034 100644 --- a/src/ripple/app/tx/TransactionMaster.h +++ b/src/ripple/app/tx/TransactionMaster.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef __TRANSACTIONMASTER__ -#define __TRANSACTIONMASTER__ +#ifndef RIPPLE_APP_TX_TRANSACTIONMASTER_H_INCLUDED +#define RIPPLE_APP_TX_TRANSACTIONMASTER_H_INCLUDED #include #include diff --git a/src/ripple/app/tx/TransactionMeta.h b/src/ripple/app/tx/TransactionMeta.h index fdb2dd833e..1a1381d6d3 100644 --- a/src/ripple/app/tx/TransactionMeta.h +++ b/src/ripple/app/tx/TransactionMeta.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_TRANSACTIONMETA_H -#define RIPPLE_TRANSACTIONMETA_H +#ifndef RIPPLE_APP_TX_TRANSACTIONMETA_H_INCLUDED +#define RIPPLE_APP_TX_TRANSACTIONMETA_H_INCLUDED #include #include diff --git a/src/ripple/app/websocket/WSConnection.h b/src/ripple/app/websocket/WSConnection.h index 96e46b3aa0..b27398e276 100644 --- a/src/ripple/app/websocket/WSConnection.h +++ b/src/ripple/app/websocket/WSConnection.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_WSCONNECTION_H -#define RIPPLE_WSCONNECTION_H +#ifndef RIPPLE_APP_WEBSOCKET_WSCONNECTION_H_INCLUDED +#define RIPPLE_APP_WEBSOCKET_WSCONNECTION_H_INCLUDED #include #include diff --git a/src/ripple/app/websocket/WSDoor.h b/src/ripple/app/websocket/WSDoor.h index 636d14c1f8..cbf1862f80 100644 --- a/src/ripple/app/websocket/WSDoor.h +++ b/src/ripple/app/websocket/WSDoor.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_WSDOOR_H_INCLUDED -#define RIPPLE_WSDOOR_H_INCLUDED +#ifndef RIPPLE_APP_WEBSOCKET_WSDOOR_H_INCLUDED +#define RIPPLE_APP_WEBSOCKET_WSDOOR_H_INCLUDED #include #include diff --git a/src/ripple/app/websocket/WSServerHandler.h b/src/ripple/app/websocket/WSServerHandler.h index 9d0ff208d7..4707e131db 100644 --- a/src/ripple/app/websocket/WSServerHandler.h +++ b/src/ripple/app/websocket/WSServerHandler.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_WSSERVERHANDLER_H_INCLUDED -#define RIPPLE_WSSERVERHANDLER_H_INCLUDED +#ifndef RIPPLE_APP_WEBSOCKET_WSSERVERHANDLER_H_INCLUDED +#define RIPPLE_APP_WEBSOCKET_WSSERVERHANDLER_H_INCLUDED #include #include diff --git a/src/ripple/basics/ByteOrder.h b/src/ripple/basics/ByteOrder.h index 02a098dabd..fa777f81a8 100644 --- a/src/ripple/basics/ByteOrder.h +++ b/src/ripple/basics/ByteOrder.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_BASICS_BYTEORDER_H -#define RIPPLE_BASICS_BYTEORDER_H +#ifndef RIPPLE_BASICS_BYTEORDER_H_INCLUDED +#define RIPPLE_BASICS_BYTEORDER_H_INCLUDED #include diff --git a/src/ripple/basics/TestSuite.h b/src/ripple/basics/TestSuite.h index 53ae18e9c5..4896614f32 100644 --- a/src/ripple/basics/TestSuite.h +++ b/src/ripple/basics/TestSuite.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_BASICS_TESTSUITE_H -#define RIPPLED_RIPPLE_BASICS_TESTSUITE_H +#ifndef RIPPLE_BASICS_TESTSUITE_H_INCLUDED +#define RIPPLE_BASICS_TESTSUITE_H_INCLUDED #include #include diff --git a/src/ripple/basics/UnorderedContainers.h b/src/ripple/basics/UnorderedContainers.h index f8ab93071b..6497da4a72 100644 --- a/src/ripple/basics/UnorderedContainers.h +++ b/src/ripple/basics/UnorderedContainers.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_BASICS_UNORDERED_CONTAINERS_H_INCLUDED -#define RIPPLE_BASICS_UNORDERED_CONTAINERS_H_INCLUDED +#ifndef RIPPLE_BASICS_UNORDEREDCONTAINERS_H_INCLUDED +#define RIPPLE_BASICS_UNORDEREDCONTAINERS_H_INCLUDED #include #include diff --git a/src/ripple/basics/base_uint.h b/src/ripple/basics/base_uint.h index c16a1d2afc..156e231125 100644 --- a/src/ripple/basics/base_uint.h +++ b/src/ripple/basics/base_uint.h @@ -22,8 +22,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file license.txt or http://www.opensource.org/licenses/mit-license.php. -#ifndef RIPPLE_PROTOCOL_BASE_UINT_H_INCLUDED -#define RIPPLE_PROTOCOL_BASE_UINT_H_INCLUDED +#ifndef RIPPLE_BASICS_BASE_UINT_H_INCLUDED +#define RIPPLE_BASICS_BASE_UINT_H_INCLUDED #include #include diff --git a/src/ripple/basics/impl/CheckLibraryVersionsImpl.h b/src/ripple/basics/impl/CheckLibraryVersionsImpl.h index e2d3c0fd83..e0f63797b9 100644 --- a/src/ripple/basics/impl/CheckLibraryVersionsImpl.h +++ b/src/ripple/basics/impl/CheckLibraryVersionsImpl.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_BASICS_CHECKLIBRARYVERSIONS_IMPL_H_INCLUDED -#define RIPPLE_BASICS_CHECKLIBRARYVERSIONS_IMPL_H_INCLUDED +#ifndef RIPPLE_BASICS_CHECKLIBRARYVERSIONSIMPL_H_INCLUDED +#define RIPPLE_BASICS_CHECKLIBRARYVERSIONSIMPL_H_INCLUDED #include #include diff --git a/src/ripple/core/ConfigSections.h b/src/ripple/core/ConfigSections.h index d1ece80faf..1d6b7e18a3 100644 --- a/src/ripple/core/ConfigSections.h +++ b/src/ripple/core/ConfigSections.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CONFIGSECTIONS_H_INCLUDED -#define RIPPLE_CONFIGSECTIONS_H_INCLUDED +#ifndef RIPPLE_CORE_CONFIGSECTIONS_H_INCLUDED +#define RIPPLE_CORE_CONFIGSECTIONS_H_INCLUDED namespace ripple { diff --git a/src/ripple/core/Job.h b/src/ripple/core/Job.h index fe2f2bf935..2ec2039d81 100644 --- a/src/ripple/core/Job.h +++ b/src/ripple/core/Job.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_JOB_H -#define RIPPLE_JOB_H +#ifndef RIPPLE_CORE_JOB_H_INCLUDED +#define RIPPLE_CORE_JOB_H_INCLUDED #include #include diff --git a/src/ripple/core/JobTypes.h b/src/ripple/core/JobTypes.h index decd09632e..b3a2710e67 100644 --- a/src/ripple/core/JobTypes.h +++ b/src/ripple/core/JobTypes.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_JOBTYPES_H_INCLUDED -#define RIPPLE_JOBTYPES_H_INCLUDED +#ifndef RIPPLE_CORE_JOBTYPES_H_INCLUDED +#define RIPPLE_CORE_JOBTYPES_H_INCLUDED #include #include diff --git a/src/ripple/core/LoadEvent.h b/src/ripple/core/LoadEvent.h index a84edb1c87..773718bce8 100644 --- a/src/ripple/core/LoadEvent.h +++ b/src/ripple/core/LoadEvent.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LOADEVENT_H -#define RIPPLE_LOADEVENT_H +#ifndef RIPPLE_CORE_LOADEVENT_H_INCLUDED +#define RIPPLE_CORE_LOADEVENT_H_INCLUDED #include #include diff --git a/src/ripple/core/LoadFeeTrack.h b/src/ripple/core/LoadFeeTrack.h index cd699cc169..b24a8dcc87 100644 --- a/src/ripple/core/LoadFeeTrack.h +++ b/src/ripple/core/LoadFeeTrack.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LOADFEETRACK_H_INCLUDED -#define RIPPLE_LOADFEETRACK_H_INCLUDED +#ifndef RIPPLE_CORE_LOADFEETRACK_H_INCLUDED +#define RIPPLE_CORE_LOADFEETRACK_H_INCLUDED #include #include diff --git a/src/ripple/core/LoadMonitor.h b/src/ripple/core/LoadMonitor.h index 9ffaa64e05..246e3f9a78 100644 --- a/src/ripple/core/LoadMonitor.h +++ b/src/ripple/core/LoadMonitor.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LOADMONITOR_H_INCLUDED -#define RIPPLE_LOADMONITOR_H_INCLUDED +#ifndef RIPPLE_CORE_LOADMONITOR_H_INCLUDED +#define RIPPLE_CORE_LOADMONITOR_H_INCLUDED #include #include diff --git a/src/ripple/core/impl/LoadFeeTrackImp.h b/src/ripple/core/impl/LoadFeeTrackImp.h index 010f093974..f33ac14870 100644 --- a/src/ripple/core/impl/LoadFeeTrackImp.h +++ b/src/ripple/core/impl/LoadFeeTrackImp.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LOADFEETRACKIMP_H_INCLUDED -#define RIPPLE_LOADFEETRACKIMP_H_INCLUDED +#ifndef RIPPLE_CORE_LOADFEETRACKIMP_H_INCLUDED +#define RIPPLE_CORE_LOADFEETRACKIMP_H_INCLUDED #include #include diff --git a/src/ripple/crypto/Base58.h b/src/ripple/crypto/Base58.h index 6addda90cb..7b8ff4e7bc 100644 --- a/src/ripple/crypto/Base58.h +++ b/src/ripple/crypto/Base58.h @@ -29,8 +29,8 @@ // - E-mail usually won't line-break if there's no punctuation to break at. // - Doubleclicking selects the whole number as one word if it's all alphanumeric. // -#ifndef RIPPLE_CRYPTO_BASE58_H -#define RIPPLE_CRYPTO_BASE58_H +#ifndef RIPPLE_CRYPTO_BASE58_H_INCLUDED +#define RIPPLE_CRYPTO_BASE58_H_INCLUDED #include #include diff --git a/src/ripple/crypto/Base58Data.h b/src/ripple/crypto/Base58Data.h index 0d1014ce4a..2caa782062 100644 --- a/src/ripple/crypto/Base58Data.h +++ b/src/ripple/crypto/Base58Data.h @@ -29,8 +29,8 @@ // - E-mail usually won't line-break if there's no punctuation to break at. // - Doubleclicking selects the whole number as one word if it's all alphanumeric. // -#ifndef RIPPLE_CRYPTO_BASE58DATA_H -#define RIPPLE_CRYPTO_BASE58DATA_H +#ifndef RIPPLE_CRYPTO_BASE58DATA_H_INCLUDED +#define RIPPLE_CRYPTO_BASE58DATA_H_INCLUDED #include #include diff --git a/src/ripple/crypto/ECDSA.h b/src/ripple/crypto/ECDSA.h index 4ef706f434..fa0fda349a 100644 --- a/src/ripple/crypto/ECDSA.h +++ b/src/ripple/crypto/ECDSA.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_ECDSA_H -#define RIPPLE_ECDSA_H +#ifndef RIPPLE_CRYPTO_ECDSA_H_INCLUDED +#define RIPPLE_CRYPTO_ECDSA_H_INCLUDED #include #include diff --git a/src/ripple/crypto/ECIES.h b/src/ripple/crypto/ECIES.h index cadd7f4125..d6f66c725f 100644 --- a/src/ripple/crypto/ECIES.h +++ b/src/ripple/crypto/ECIES.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_ECIES_H -#define RIPPLE_ECIES_H +#ifndef RIPPLE_CRYPTO_ECIES_H_INCLUDED +#define RIPPLE_CRYPTO_ECIES_H_INCLUDED #include #include diff --git a/src/ripple/crypto/GenerateDeterministicKey.h b/src/ripple/crypto/GenerateDeterministicKey.h index b01bd28c63..92f4e60762 100644 --- a/src/ripple/crypto/GenerateDeterministicKey.h +++ b/src/ripple/crypto/GenerateDeterministicKey.h @@ -22,8 +22,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file license.txt or http://www.opensource.org/licenses/mit-license.php. -#ifndef RIPPLE_CKEYDETERMINISTIC_H -#define RIPPLE_CKEYDETERMINISTIC_H +#ifndef RIPPLE_CRYPTO_GENERATEDETERMINISTICKEY_H_INCLUDED +#define RIPPLE_CRYPTO_GENERATEDETERMINISTICKEY_H_INCLUDED #include #include diff --git a/src/ripple/crypto/ec_key.h b/src/ripple/crypto/ec_key.h index c4679a2fe0..e1f21e1098 100644 --- a/src/ripple/crypto/ec_key.h +++ b/src/ripple/crypto/ec_key.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_ECKEY_H -#define RIPPLE_ECKEY_H +#ifndef RIPPLE_CRYPTO_EC_KEY_H_INCLUDED +#define RIPPLE_CRYPTO_EC_KEY_H_INCLUDED #include #include diff --git a/src/ripple/json/JsonPropertyStream.h b/src/ripple/json/JsonPropertyStream.h index 785203a180..9b8dfb1e17 100644 --- a/src/ripple/json/JsonPropertyStream.h +++ b/src/ripple/json/JsonPropertyStream.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_JSONPROPERTYSTREAM_H_INCLUDED -#define RIPPLE_JSONPROPERTYSTREAM_H_INCLUDED +#ifndef RIPPLE_JSON_JSONPROPERTYSTREAM_H_INCLUDED +#define RIPPLE_JSON_JSONPROPERTYSTREAM_H_INCLUDED #include #include diff --git a/src/ripple/json/impl/json_assert.h b/src/ripple/json/impl/json_assert.h index ab1d5ef12d..33eb45b9b6 100644 --- a/src/ripple/json/impl/json_assert.h +++ b/src/ripple/json/impl/json_assert.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef JSONCPPTL_ASSERT_H_INCLUDED -#define JSONCPPTL_ASSERT_H_INCLUDED +#ifndef RIPPLE_JSON_JSON_ASSERT_H_INCLUDED +#define RIPPLE_JSON_JSON_ASSERT_H_INCLUDED #define JSON_ASSERT_UNREACHABLE assert( false ) #define JSON_ASSERT( condition ) assert( condition ); // @todo <= change this into an exception throw diff --git a/src/ripple/json/impl/json_autolink.h b/src/ripple/json/impl/json_autolink.h index 162823dfaa..b614d2821f 100644 --- a/src/ripple/json/impl/json_autolink.h +++ b/src/ripple/json/impl/json_autolink.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef JSON_AUTOLINK_H_INCLUDED -#define JSON_AUTOLINK_H_INCLUDED +#ifndef RIPPLE_JSON_JSON_AUTOLINK_H_INCLUDED +#define RIPPLE_JSON_JSON_AUTOLINK_H_INCLUDED // VFALCO TODO remove this file #error This file is deprecated! diff --git a/src/ripple/json/impl/json_batchallocator.h b/src/ripple/json/impl/json_batchallocator.h index 1b6d782861..4f2d1c99c0 100644 --- a/src/ripple/json/impl/json_batchallocator.h +++ b/src/ripple/json/impl/json_batchallocator.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef JSONCPP_BATCHALLOCATOR_H_INCLUDED -#define JSONCPP_BATCHALLOCATOR_H_INCLUDED +#ifndef RIPPLE_JSON_JSON_BATCHALLOCATOR_H_INCLUDED +#define RIPPLE_JSON_JSON_BATCHALLOCATOR_H_INCLUDED #ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION diff --git a/src/ripple/json/json_config.h b/src/ripple/json/json_config.h index 552c40a34f..39e6e16d63 100644 --- a/src/ripple/json/json_config.h +++ b/src/ripple/json/json_config.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef JSON_CONFIG_H_INCLUDED -#define JSON_CONFIG_H_INCLUDED +#ifndef RIPPLE_JSON_JSON_CONFIG_H_INCLUDED +#define RIPPLE_JSON_JSON_CONFIG_H_INCLUDED /// If defined, indicates that json library is embedded in CppTL library. //# define JSON_IN_CPPTL 1 diff --git a/src/ripple/json/json_features.h b/src/ripple/json/json_features.h index 80c324e7c7..d81e3fe9c0 100644 --- a/src/ripple/json/json_features.h +++ b/src/ripple/json/json_features.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef CPPTL_JSON_FEATURES_H_INCLUDED -#define CPPTL_JSON_FEATURES_H_INCLUDED +#ifndef RIPPLE_JSON_JSON_FEATURES_H_INCLUDED +#define RIPPLE_JSON_JSON_FEATURES_H_INCLUDED #include diff --git a/src/ripple/json/json_forwards.h b/src/ripple/json/json_forwards.h index a0bea19a0f..b3c9fd12df 100644 --- a/src/ripple/json/json_forwards.h +++ b/src/ripple/json/json_forwards.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef JSON_FORWARDS_H_INCLUDED -#define JSON_FORWARDS_H_INCLUDED +#ifndef RIPPLE_JSON_JSON_FORWARDS_H_INCLUDED +#define RIPPLE_JSON_JSON_FORWARDS_H_INCLUDED #include diff --git a/src/ripple/json/json_reader.h b/src/ripple/json/json_reader.h index 61a55fa295..39ca103326 100644 --- a/src/ripple/json/json_reader.h +++ b/src/ripple/json/json_reader.h @@ -17,7 +17,9 @@ */ //============================================================================== -#ifndef CPPTL_JSON_READER_H_INCLUDED +#ifndef RIPPLE_JSON_JSON_READER_H_INCLUDED +#define RIPPLE_JSON_JSON_READER_H_INCLUDED + # define CPPTL_JSON_READER_H_INCLUDED #include diff --git a/src/ripple/json/json_value.h b/src/ripple/json/json_value.h index 8777467824..1b9d807d53 100644 --- a/src/ripple/json/json_value.h +++ b/src/ripple/json/json_value.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef CPPTL_JSON_H_INCLUDED -#define CPPTL_JSON_H_INCLUDED +#ifndef RIPPLE_JSON_JSON_VALUE_H_INCLUDED +#define RIPPLE_JSON_JSON_VALUE_H_INCLUDED #include #include diff --git a/src/ripple/json/json_writer.h b/src/ripple/json/json_writer.h index 5406467b3d..d2cce17966 100644 --- a/src/ripple/json/json_writer.h +++ b/src/ripple/json/json_writer.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef JSON_WRITER_H_INCLUDED -#define JSON_WRITER_H_INCLUDED +#ifndef RIPPLE_JSON_JSON_WRITER_H_INCLUDED +#define RIPPLE_JSON_JSON_WRITER_H_INCLUDED #include #include diff --git a/src/ripple/json/to_string.h b/src/ripple/json/to_string.h index e382b35da1..3d05e2bcf5 100644 --- a/src/ripple/json/to_string.h +++ b/src/ripple/json/to_string.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef JSON_TO_STRING_H_INCLUDED -#define JSON_TO_STRING_H_INCLUDED +#ifndef RIPPLE_JSON_TO_STRING_H_INCLUDED +#define RIPPLE_JSON_TO_STRING_H_INCLUDED #include #include diff --git a/src/ripple/net/HTTPClient.h b/src/ripple/net/HTTPClient.h index 81f0ae37c0..aa3bcb48f0 100644 --- a/src/ripple/net/HTTPClient.h +++ b/src/ripple/net/HTTPClient.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_NET_BASICS_HTTPCLIENT_H_INCLUDED -#define RIPPLE_NET_BASICS_HTTPCLIENT_H_INCLUDED +#ifndef RIPPLE_NET_HTTPCLIENT_H_INCLUDED +#define RIPPLE_NET_HTTPCLIENT_H_INCLUDED #include #include diff --git a/src/ripple/net/HTTPRequest.h b/src/ripple/net/HTTPRequest.h index ce7535de39..3e8d3e2810 100644 --- a/src/ripple/net/HTTPRequest.h +++ b/src/ripple/net/HTTPRequest.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_NET_BASICS_HTTPREQUEST_H_INCLUDED -#define RIPPLE_NET_BASICS_HTTPREQUEST_H_INCLUDED +#ifndef RIPPLE_NET_HTTPREQUEST_H_INCLUDED +#define RIPPLE_NET_HTTPREQUEST_H_INCLUDED #include #include diff --git a/src/ripple/net/InfoSub.h b/src/ripple/net/InfoSub.h index 04c384fb7a..000889f344 100644 --- a/src/ripple/net/InfoSub.h +++ b/src/ripple/net/InfoSub.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_NET_RPC_INFOSUB_H_INCLUDED -#define RIPPLE_NET_RPC_INFOSUB_H_INCLUDED +#ifndef RIPPLE_NET_INFOSUB_H_INCLUDED +#define RIPPLE_NET_INFOSUB_H_INCLUDED #include #include diff --git a/src/ripple/net/RPCCall.h b/src/ripple/net/RPCCall.h index 1d85ffe4b7..60cb9470c2 100644 --- a/src/ripple/net/RPCCall.h +++ b/src/ripple/net/RPCCall.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_NET_RPC_RPCCALL_H_INCLUDED -#define RIPPLE_NET_RPC_RPCCALL_H_INCLUDED +#ifndef RIPPLE_NET_RPCCALL_H_INCLUDED +#define RIPPLE_NET_RPCCALL_H_INCLUDED #include #include diff --git a/src/ripple/net/RPCErr.h b/src/ripple/net/RPCErr.h index bb695b98e9..0841de2b08 100644 --- a/src/ripple/net/RPCErr.h +++ b/src/ripple/net/RPCErr.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_NET_RPC_RPCERR_H_INCLUDED -#define RIPPLE_NET_RPC_RPCERR_H_INCLUDED +#ifndef RIPPLE_NET_RPCERR_H_INCLUDED +#define RIPPLE_NET_RPCERR_H_INCLUDED #include diff --git a/src/ripple/net/RPCSub.h b/src/ripple/net/RPCSub.h index 9f590ed76a..f42e9336dd 100644 --- a/src/ripple/net/RPCSub.h +++ b/src/ripple/net/RPCSub.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_NET_RPC_RPCSUB_H_INCLUDED -#define RIPPLE_NET_RPC_RPCSUB_H_INCLUDED +#ifndef RIPPLE_NET_RPCSUB_H_INCLUDED +#define RIPPLE_NET_RPCSUB_H_INCLUDED #include #include diff --git a/src/ripple/net/SNTPClient.h b/src/ripple/net/SNTPClient.h index 460d303f35..a43c68d268 100644 --- a/src/ripple/net/SNTPClient.h +++ b/src/ripple/net/SNTPClient.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_NET_BASICS_SNTPCLIENT_H_INCLUDED -#define RIPPLE_NET_BASICS_SNTPCLIENT_H_INCLUDED +#ifndef RIPPLE_NET_SNTPCLIENT_H_INCLUDED +#define RIPPLE_NET_SNTPCLIENT_H_INCLUDED #include diff --git a/src/ripple/nodestore/tests/Base.test.h b/src/ripple/nodestore/tests/Base.test.h index e74acac8a8..49b5b4cc11 100644 --- a/src/ripple/nodestore/tests/Base.test.h +++ b/src/ripple/nodestore/tests/Base.test.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_NODESTORE_TESTBASE_H_INCLUDED -#define RIPPLE_NODESTORE_TESTBASE_H_INCLUDED +#ifndef RIPPLE_NODESTORE_BASE_H_INCLUDED +#define RIPPLE_NODESTORE_BASE_H_INCLUDED #include #include diff --git a/src/ripple/peerfinder/impl/PrivateTypes.h b/src/ripple/peerfinder/impl/PrivateTypes.h index 16e8704f5e..b0ac33023c 100644 --- a/src/ripple/peerfinder/impl/PrivateTypes.h +++ b/src/ripple/peerfinder/impl/PrivateTypes.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PEERFINDER_PRIVATE_TYPES_H_INCLUDED -#define RIPPLE_PEERFINDER_PRIVATE_TYPES_H_INCLUDED +#ifndef RIPPLE_PEERFINDER_PRIVATETYPES_H_INCLUDED +#define RIPPLE_PEERFINDER_PRIVATETYPES_H_INCLUDED namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/iosformat.h b/src/ripple/peerfinder/impl/iosformat.h index d4f0c4b8ae..27a10e9f8a 100644 --- a/src/ripple/peerfinder/impl/iosformat.h +++ b/src/ripple/peerfinder/impl/iosformat.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_IOSFORMAT_H_INCLUDED -#define BEAST_IOSFORMAT_H_INCLUDED +#ifndef RIPPLE_PEERFINDER_IOSFORMAT_H_INCLUDED +#define RIPPLE_PEERFINDER_IOSFORMAT_H_INCLUDED #include #include diff --git a/src/ripple/peerfinder/sim/sync_timer.h b/src/ripple/peerfinder/sim/sync_timer.h index 2d9bc6772f..7819d6fb4f 100644 --- a/src/ripple/peerfinder/sim/sync_timer.h +++ b/src/ripple/peerfinder/sim/sync_timer.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEASTSYNC_SYNC_DEADLINE_TIMER_H_INCLUDED -#define BEASTSYNC_SYNC_DEADLINE_TIMER_H_INCLUDED +#ifndef RIPPLE_PEERFINDER_SIM_SYNC_TIMER_H_INCLUDED +#define RIPPLE_PEERFINDER_SIM_SYNC_TIMER_H_INCLUDED //#include diff --git a/src/ripple/protocol/Blob.h b/src/ripple/protocol/Blob.h index 9951f33f80..5ca7d13097 100644 --- a/src/ripple/protocol/Blob.h +++ b/src/ripple/protocol/Blob.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_TYPES_BLOB_H_INCLUDED -#define RIPPLE_TYPES_BLOB_H_INCLUDED +#ifndef RIPPLE_PROTOCOL_BLOB_H_INCLUDED +#define RIPPLE_PROTOCOL_BLOB_H_INCLUDED #include diff --git a/src/ripple/protocol/Issue.h b/src/ripple/protocol/Issue.h index 7d107920cf..2de3530b8b 100644 --- a/src/ripple/protocol/Issue.h +++ b/src/ripple/protocol/Issue.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PROTOCOL_ISSUE_INCLUDED -#define RIPPLE_PROTOCOL_ISSUE_INCLUDED +#ifndef RIPPLE_PROTOCOL_ISSUE_H_INCLUDED +#define RIPPLE_PROTOCOL_ISSUE_H_INCLUDED #include #include diff --git a/src/ripple/protocol/SField.h b/src/ripple/protocol/SField.h index 622ef6616d..8dcf0337b5 100644 --- a/src/ripple/protocol/SField.h +++ b/src/ripple/protocol/SField.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PROTOCOL_FIELDNAMES_H_INCLUDED -#define RIPPLE_PROTOCOL_FIELDNAMES_H_INCLUDED +#ifndef RIPPLE_PROTOCOL_SFIELD_H_INCLUDED +#define RIPPLE_PROTOCOL_SFIELD_H_INCLUDED #include #include diff --git a/src/ripple/protocol/STBitString.h b/src/ripple/protocol/STBitString.h index f1c04bcf66..ff2f3604c1 100644 --- a/src/ripple/protocol/STBitString.h +++ b/src/ripple/protocol/STBitString.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PROTOCOL_STBITS_H_INCLUDED -#define RIPPLE_PROTOCOL_STBITS_H_INCLUDED +#ifndef RIPPLE_PROTOCOL_STBITSTRING_H_INCLUDED +#define RIPPLE_PROTOCOL_STBITSTRING_H_INCLUDED #include diff --git a/src/ripple/protocol/STPathSet.h b/src/ripple/protocol/STPathSet.h index c86b92ec83..43211d93a8 100644 --- a/src/ripple/protocol/STPathSet.h +++ b/src/ripple/protocol/STPathSet.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PROTOCOL_STPATHELEMENT_H_INCLUDED -#define RIPPLE_PROTOCOL_STPATHELEMENT_H_INCLUDED +#ifndef RIPPLE_PROTOCOL_STPATHSET_H_INCLUDED +#define RIPPLE_PROTOCOL_STPATHSET_H_INCLUDED #include #include diff --git a/src/ripple/protocol/STTx.h b/src/ripple/protocol/STTx.h index b33235014b..df9c9f5b18 100644 --- a/src/ripple/protocol/STTx.h +++ b/src/ripple/protocol/STTx.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_SERIALIZEDTRANSACTION_H -#define RIPPLE_SERIALIZEDTRANSACTION_H +#ifndef RIPPLE_PROTOCOL_STTX_H_INCLUDED +#define RIPPLE_PROTOCOL_STTX_H_INCLUDED #include #include diff --git a/src/ripple/protocol/STVector256.h b/src/ripple/protocol/STVector256.h index 554fa1c0bf..20c83d2646 100644 --- a/src/ripple/protocol/STVector256.h +++ b/src/ripple/protocol/STVector256.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PROTOCOL_SERIALIZEDTYPES_H_INCLUDED -#define RIPPLE_PROTOCOL_SERIALIZEDTYPES_H_INCLUDED +#ifndef RIPPLE_PROTOCOL_STVECTOR256_H_INCLUDED +#define RIPPLE_PROTOCOL_STVECTOR256_H_INCLUDED #include #include diff --git a/src/ripple/protocol/SystemParameters.h b/src/ripple/protocol/SystemParameters.h index 036046214d..cace661727 100644 --- a/src/ripple/protocol/SystemParameters.h +++ b/src/ripple/protocol/SystemParameters.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CORE_SYSTEMPARAMETERS_H_INCLUDED -#define RIPPLE_CORE_SYSTEMPARAMETERS_H_INCLUDED +#ifndef RIPPLE_PROTOCOL_SYSTEMPARAMETERS_H_INCLUDED +#define RIPPLE_PROTOCOL_SYSTEMPARAMETERS_H_INCLUDED #include #include diff --git a/src/ripple/protocol/TER.h b/src/ripple/protocol/TER.h index c641925091..849ab5ebdb 100644 --- a/src/ripple/protocol/TER.h +++ b/src/ripple/protocol/TER.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PROTOCOL_TER_H -#define RIPPLE_PROTOCOL_TER_H +#ifndef RIPPLE_PROTOCOL_TER_H_INCLUDED +#define RIPPLE_PROTOCOL_TER_H_INCLUDED #include diff --git a/src/ripple/protocol/UintTypes.h b/src/ripple/protocol/UintTypes.h index 867192a4f2..e2ea198f70 100644 --- a/src/ripple/protocol/UintTypes.h +++ b/src/ripple/protocol/UintTypes.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PROTOCOL_BASICS -#define RIPPLE_PROTOCOL_BASICS +#ifndef RIPPLE_PROTOCOL_UINTTYPES_H_INCLUDED +#define RIPPLE_PROTOCOL_UINTTYPES_H_INCLUDED #include #include diff --git a/src/ripple/rpc/Context.h b/src/ripple/rpc/Context.h index 5cba92b3dc..159c6cb137 100644 --- a/src/ripple/rpc/Context.h +++ b/src/ripple/rpc/Context.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_RPC_CONTEXT -#define RIPPLE_RPC_CONTEXT +#ifndef RIPPLE_RPC_CONTEXT_H_INCLUDED +#define RIPPLE_RPC_CONTEXT_H_INCLUDED #include #include diff --git a/src/ripple/rpc/Coroutine.h b/src/ripple/rpc/Coroutine.h index b0c0136a9f..7a8784b5b0 100644 --- a/src/ripple/rpc/Coroutine.h +++ b/src/ripple/rpc/Coroutine.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_RPC_COROUTINE_H -#define RIPPLED_RIPPLE_RPC_COROUTINE_H +#ifndef RIPPLE_RPC_COROUTINE_H_INCLUDED +#define RIPPLE_RPC_COROUTINE_H_INCLUDED #include diff --git a/src/ripple/rpc/InternalHandler.h b/src/ripple/rpc/InternalHandler.h index 665e0e8588..703a409d78 100644 --- a/src/ripple/rpc/InternalHandler.h +++ b/src/ripple/rpc/InternalHandler.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_RPC_INTERNAL_HANDLER -#define RIPPLE_APP_RPC_INTERNAL_HANDLER +#ifndef RIPPLE_RPC_INTERNALHANDLER_H_INCLUDED +#define RIPPLE_RPC_INTERNALHANDLER_H_INCLUDED namespace ripple { namespace RPC { diff --git a/src/ripple/rpc/RPCHandler.h b/src/ripple/rpc/RPCHandler.h index 059b4fe18f..32f2293557 100644 --- a/src/ripple/rpc/RPCHandler.h +++ b/src/ripple/rpc/RPCHandler.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_RPC_HANDLER -#define RIPPLE_APP_RPC_HANDLER +#ifndef RIPPLE_RPC_RPCHANDLER_H_INCLUDED +#define RIPPLE_RPC_RPCHANDLER_H_INCLUDED #include #include diff --git a/src/ripple/rpc/Status.h b/src/ripple/rpc/Status.h index cb3fb6c22c..94df3eb883 100644 --- a/src/ripple/rpc/Status.h +++ b/src/ripple/rpc/Status.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_STATUS_H -#define RIPPLE_STATUS_H +#ifndef RIPPLE_RPC_STATUS_H_INCLUDED +#define RIPPLE_RPC_STATUS_H_INCLUDED #include #include diff --git a/src/ripple/rpc/Yield.h b/src/ripple/rpc/Yield.h index 40f99cc400..8c4f8c4db7 100644 --- a/src/ripple/rpc/Yield.h +++ b/src/ripple/rpc/Yield.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_RPC_YIELD_H -#define RIPPLED_RIPPLE_RPC_YIELD_H +#ifndef RIPPLE_RPC_YIELD_H_INCLUDED +#define RIPPLE_RPC_YIELD_H_INCLUDED #include #include diff --git a/src/ripple/rpc/handlers/Handlers.h b/src/ripple/rpc/handlers/Handlers.h index c39ebd920c..fbac3665c3 100644 --- a/src/ripple/rpc/handlers/Handlers.h +++ b/src/ripple/rpc/handlers/Handlers.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_HANDLER_HANDLERS -#define RIPPLE_HANDLER_HANDLERS +#ifndef RIPPLE_RPC_HANDLERS_HANDLERS_H_INCLUDED +#define RIPPLE_RPC_HANDLERS_HANDLERS_H_INCLUDED namespace ripple { diff --git a/src/ripple/rpc/handlers/Ledger.h b/src/ripple/rpc/handlers/Ledger.h index bb35cd8a76..ff75b5c37e 100644 --- a/src/ripple/rpc/handlers/Ledger.h +++ b/src/ripple/rpc/handlers/Ledger.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_RPC_HANDLERS_LEDGER_H -#define RIPPLED_RIPPLE_RPC_HANDLERS_LEDGER_H +#ifndef RIPPLE_RPC_HANDLERS_LEDGER_H_INCLUDED +#define RIPPLE_RPC_HANDLERS_LEDGER_H_INCLUDED #include #include diff --git a/src/ripple/rpc/impl/DoPrint.h b/src/ripple/rpc/impl/DoPrint.h index b943e6715d..b0e7dfa2ec 100644 --- a/src/ripple/rpc/impl/DoPrint.h +++ b/src/ripple/rpc/impl/DoPrint.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_RPC_PRINT_H_INCLUDED -#define RIPPLE_RPC_PRINT_H_INCLUDED +#ifndef RIPPLE_RPC_DOPRINT_H_INCLUDED +#define RIPPLE_RPC_DOPRINT_H_INCLUDED #include #include diff --git a/src/ripple/rpc/impl/Handler.h b/src/ripple/rpc/impl/Handler.h index c3bf002cc7..2f80d494c4 100644 --- a/src/ripple/rpc/impl/Handler.h +++ b/src/ripple/rpc/impl/Handler.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_RPC_HANDLER -#define RIPPLE_RPC_HANDLER +#ifndef RIPPLE_RPC_HANDLER_H_INCLUDED +#define RIPPLE_RPC_HANDLER_H_INCLUDED #include #include diff --git a/src/ripple/rpc/impl/JsonObject.h b/src/ripple/rpc/impl/JsonObject.h index 246c45183d..977350eb19 100644 --- a/src/ripple/rpc/impl/JsonObject.h +++ b/src/ripple/rpc/impl/JsonObject.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_RPC_IMPL_JSONCOLLECTIONS_H -#define RIPPLED_RIPPLE_RPC_IMPL_JSONCOLLECTIONS_H +#ifndef RIPPLE_RPC_JSONOBJECT_H_INCLUDED +#define RIPPLE_RPC_JSONOBJECT_H_INCLUDED #include diff --git a/src/ripple/rpc/impl/JsonWriter.h b/src/ripple/rpc/impl/JsonWriter.h index d945c70ae1..e9a8118846 100644 --- a/src/ripple/rpc/impl/JsonWriter.h +++ b/src/ripple/rpc/impl/JsonWriter.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_BASICS_TYPES_JSONWRITER_H -#define RIPPLED_RIPPLE_BASICS_TYPES_JSONWRITER_H +#ifndef RIPPLE_RPC_JSONWRITER_H_INCLUDED +#define RIPPLE_RPC_JSONWRITER_H_INCLUDED #include #include diff --git a/src/ripple/rpc/impl/WriteJson.h b/src/ripple/rpc/impl/WriteJson.h index 28344d4010..ec31fd4f2f 100644 --- a/src/ripple/rpc/impl/WriteJson.h +++ b/src/ripple/rpc/impl/WriteJson.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLED_RIPPLE_RPC_IMPL_WRITELEGACYJSON_H -#define RIPPLED_RIPPLE_RPC_IMPL_WRITELEGACYJSON_H +#ifndef RIPPLE_RPC_WRITEJSON_H_INCLUDED +#define RIPPLE_RPC_WRITEJSON_H_INCLUDED namespace ripple { namespace RPC { diff --git a/src/ripple/shamap/SHAMapAddNode.h b/src/ripple/shamap/SHAMapAddNode.h index 0c335a6040..d8f1e5fd50 100644 --- a/src/ripple/shamap/SHAMapAddNode.h +++ b/src/ripple/shamap/SHAMapAddNode.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_SHAMAPADDNODE_H -#define RIPPLE_SHAMAPADDNODE_H +#ifndef RIPPLE_SHAMAP_SHAMAPADDNODE_H_INCLUDED +#define RIPPLE_SHAMAP_SHAMAPADDNODE_H_INCLUDED #include diff --git a/src/ripple/shamap/SHAMapItem.h b/src/ripple/shamap/SHAMapItem.h index 51a17628d6..ad17c273d7 100644 --- a/src/ripple/shamap/SHAMapItem.h +++ b/src/ripple/shamap/SHAMapItem.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_SHAMAPITEM_H -#define RIPPLE_SHAMAPITEM_H +#ifndef RIPPLE_SHAMAP_SHAMAPITEM_H_INCLUDED +#define RIPPLE_SHAMAP_SHAMAPITEM_H_INCLUDED #include #include diff --git a/src/ripple/shamap/SHAMapMissingNode.h b/src/ripple/shamap/SHAMapMissingNode.h index 714bd0a482..6b632406d5 100644 --- a/src/ripple/shamap/SHAMapMissingNode.h +++ b/src/ripple/shamap/SHAMapMissingNode.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_SHAMAPMISSINGNODE_H -#define RIPPLE_SHAMAPMISSINGNODE_H +#ifndef RIPPLE_SHAMAP_SHAMAPMISSINGNODE_H_INCLUDED +#define RIPPLE_SHAMAP_SHAMAPMISSINGNODE_H_INCLUDED #include diff --git a/src/ripple/shamap/SHAMapNodeID.h b/src/ripple/shamap/SHAMapNodeID.h index f81070a708..e978abfeb6 100644 --- a/src/ripple/shamap/SHAMapNodeID.h +++ b/src/ripple/shamap/SHAMapNodeID.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_SHAMAPNODEID_H -#define RIPPLE_SHAMAPNODEID_H +#ifndef RIPPLE_SHAMAP_SHAMAPNODEID_H_INCLUDED +#define RIPPLE_SHAMAP_SHAMAPNODEID_H_INCLUDED #include #include diff --git a/src/ripple/shamap/SHAMapSyncFilter.h b/src/ripple/shamap/SHAMapSyncFilter.h index b3b6ff17e0..7774662ca8 100644 --- a/src/ripple/shamap/SHAMapSyncFilter.h +++ b/src/ripple/shamap/SHAMapSyncFilter.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_SHAMAPSYNCFILTER_H -#define RIPPLE_SHAMAPSYNCFILTER_H +#ifndef RIPPLE_SHAMAP_SHAMAPSYNCFILTER_H_INCLUDED +#define RIPPLE_SHAMAP_SHAMAPSYNCFILTER_H_INCLUDED #include diff --git a/src/ripple/shamap/SHAMapTreeNode.h b/src/ripple/shamap/SHAMapTreeNode.h index 397544a868..04b8622642 100644 --- a/src/ripple/shamap/SHAMapTreeNode.h +++ b/src/ripple/shamap/SHAMapTreeNode.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_SHAMAP_SHAMAPTREENODE_H -#define RIPPLE_SHAMAP_SHAMAPTREENODE_H +#ifndef RIPPLE_SHAMAP_SHAMAPTREENODE_H_INCLUDED +#define RIPPLE_SHAMAP_SHAMAPTREENODE_H_INCLUDED #include #include diff --git a/src/ripple/shamap/TreeNodeCache.h b/src/ripple/shamap/TreeNodeCache.h index c223f2a39e..c9b8eafa13 100644 --- a/src/ripple/shamap/TreeNodeCache.h +++ b/src/ripple/shamap/TreeNodeCache.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_APP_SHAMAP_TREENODECACHE_H_INCLUDED -#define RIPPLE_APP_SHAMAP_TREENODECACHE_H_INCLUDED +#ifndef RIPPLE_SHAMAP_TREENODECACHE_H_INCLUDED +#define RIPPLE_SHAMAP_TREENODECACHE_H_INCLUDED #include diff --git a/src/ripple/unity/git_id.h b/src/ripple/unity/git_id.h index ec383ef262..1772f64057 100644 --- a/src/ripple/unity/git_id.h +++ b/src/ripple/unity/git_id.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_GIT_TAG_H_INCLUDED -#define RIPPLE_GIT_TAG_H_INCLUDED +#ifndef RIPPLE_UNITY_GIT_ID_H_INCLUDED +#define RIPPLE_UNITY_GIT_ID_H_INCLUDED #include diff --git a/src/ripple/unity/hyperleveldb.h b/src/ripple/unity/hyperleveldb.h index 28be45195c..bdcf3a4c07 100644 --- a/src/ripple/unity/hyperleveldb.h +++ b/src/ripple/unity/hyperleveldb.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_HYPERLEVELDB_H_INCLUDED -#define RIPPLE_HYPERLEVELDB_H_INCLUDED +#ifndef RIPPLE_UNITY_HYPERLEVELDB_H_INCLUDED +#define RIPPLE_UNITY_HYPERLEVELDB_H_INCLUDED #include diff --git a/src/ripple/unity/leveldb.h b/src/ripple/unity/leveldb.h index 74f722b1e8..e44f51b6db 100644 --- a/src/ripple/unity/leveldb.h +++ b/src/ripple/unity/leveldb.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_LEVELDB_H_INCLUDED -#define RIPPLE_LEVELDB_H_INCLUDED +#ifndef RIPPLE_UNITY_LEVELDB_H_INCLUDED +#define RIPPLE_UNITY_LEVELDB_H_INCLUDED #ifndef RIPPLE_LEVELDB_AVAILABLE # define RIPPLE_LEVELDB_AVAILABLE 1 diff --git a/src/ripple/unity/rocksdb.h b/src/ripple/unity/rocksdb.h index d014879b1b..baa9f43d0b 100644 --- a/src/ripple/unity/rocksdb.h +++ b/src/ripple/unity/rocksdb.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_ROCKSDB_H_INCLUDED -#define RIPPLE_ROCKSDB_H_INCLUDED +#ifndef RIPPLE_UNITY_ROCKSDB_H_INCLUDED +#define RIPPLE_UNITY_ROCKSDB_H_INCLUDED #include diff --git a/src/ripple/unity/websocket.h b/src/ripple/unity/websocket.h index 80537e05b6..84d359bd5c 100644 --- a/src/ripple/unity/websocket.h +++ b/src/ripple/unity/websocket.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_WEBSOCKET_H_INCLUDED -#define RIPPLE_WEBSOCKET_H_INCLUDED +#ifndef RIPPLE_UNITY_WEBSOCKET_H_INCLUDED +#define RIPPLE_UNITY_WEBSOCKET_H_INCLUDED // needed before inclusion of stdint.h for INT32_MIN/INT32_MAX macros #ifndef __STDC_LIMIT_MACROS diff --git a/src/ripple/websocket/autosocket/AutoSocket.h b/src/ripple/websocket/autosocket/AutoSocket.h index 75fa330d13..decff24cd5 100644 --- a/src/ripple/websocket/autosocket/AutoSocket.h +++ b/src/ripple/websocket/autosocket/AutoSocket.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_WEBSOCKET_AUTOSOCKET_H_INCLUDED -#define RIPPLE_WEBSOCKET_AUTOSOCKET_H_INCLUDED +#ifndef RIPPLE_WEBSOCKET_AUTOSOCKET_AUTOSOCKET_H_INCLUDED +#define RIPPLE_WEBSOCKET_AUTOSOCKET_AUTOSOCKET_H_INCLUDED #include #include