From b902df7b38f6c2a6e88f0d926aaed763fba63f10 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sat, 11 May 2013 19:07:08 -0700 Subject: [PATCH] Workaround DR106. --- src/cpp/ripple/OrderBookDB.cpp | 6 ++---- src/cpp/ripple/OrderBookDB.h | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/cpp/ripple/OrderBookDB.cpp b/src/cpp/ripple/OrderBookDB.cpp index 9bfcd25ed..0a7be2783 100644 --- a/src/cpp/ripple/OrderBookDB.cpp +++ b/src/cpp/ripple/OrderBookDB.cpp @@ -55,10 +55,8 @@ void OrderBookDB::setup(Ledger::ref ledger) OrderBook::pointer book = boost::make_shared(boost::cref(index), boost::cref(ci), boost::cref(co), boost::cref(ii), boost::cref(io)); - mSourceMap[currencyIssuer_ct(boost::reference_wrapper(ci), - boost::reference_wrapper(ii))].push_back(book); - mDestMap[currencyIssuer_ct(boost::reference_wrapper(co), - boost::reference_wrapper(io))].push_back(book); + mSourceMap[currencyIssuer_ct(ci, ii)].push_back(book); + mDestMap[currencyIssuer_ct(co, io)].push_back(book); } } diff --git a/src/cpp/ripple/OrderBookDB.h b/src/cpp/ripple/OrderBookDB.h index e90f37768..f7dbd0fa8 100644 --- a/src/cpp/ripple/OrderBookDB.h +++ b/src/cpp/ripple/OrderBookDB.h @@ -16,7 +16,12 @@ // typedef std::pair currencyIssuer_t; + +#ifdef C11X typedef std::pair currencyIssuer_ct; +#else +typedef std::pair currencyIssuer_ct; // C++ defect 106 +#endif class BookListeners {