Skip to content

Commit 6e077ae

Browse files
authored
Merge pull request #678 from evoskuil/master
Revert "Use make_shared()."
2 parents 655e8d1 + 6783dc0 commit 6e077ae

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

include/bitcoin/database/impl/query/objects.ipp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ typename CLASS::inputs_ptr CLASS::get_inputs(
5353
if (fks.empty())
5454
return {};
5555

56-
const auto inputs = make_shared<chain::input_cptrs>();
56+
const auto inputs = to_shared<chain::input_cptrs>();
5757
inputs->reserve(fks.size());
5858

5959
for (const auto& fk: fks)
@@ -73,7 +73,7 @@ typename CLASS::outputs_ptr CLASS::get_outputs(
7373
if (fks.empty())
7474
return {};
7575

76-
const auto outputs = make_shared<chain::output_cptrs>();
76+
const auto outputs = to_shared<chain::output_cptrs>();
7777
outputs->reserve(fks.size());
7878

7979
for (const auto& fk: fks)
@@ -93,7 +93,7 @@ typename CLASS::transactions_ptr CLASS::get_transactions(
9393
if (txs.empty())
9494
return {};
9595

96-
const auto transactions = make_shared<chain::transaction_cptrs>();
96+
const auto transactions = to_shared<chain::transaction_cptrs>();
9797
transactions->reserve(txs.size());
9898

9999
for (const auto& tx_fk: txs)
@@ -165,8 +165,8 @@ typename CLASS::transaction::cptr CLASS::get_transaction(const tx_link& link,
165165
if (!store_.outs.get(tx.outs_fk, outs))
166166
return {};
167167

168-
const auto inputs = make_shared<chain::input_cptrs>();
169-
const auto outputs = make_shared<chain::output_cptrs>();
168+
const auto inputs = to_shared<chain::input_cptrs>();
169+
const auto outputs = to_shared<chain::output_cptrs>();
170170
inputs->reserve(tx.ins_count);
171171
outputs->reserve(tx.outs_count);
172172

@@ -209,11 +209,11 @@ typename CLASS::point::cptr CLASS::make_point(hash_digest&& hash,
209209
uint32_t index) NOEXCEPT
210210
{
211211
// Share null point instances to reduce memory consumption.
212-
static const auto null_point = system::make_shared<const point>();
212+
static const auto null_point = system::to_shared<const point>();
213213
if (index == point::null_index)
214214
return null_point;
215215

216-
return system::make_shared<point>(std::move(hash), index);
216+
return system::to_shared<point>(std::move(hash), index);
217217
}
218218

219219
TEMPLATE
@@ -259,7 +259,7 @@ typename CLASS::inputs_ptr CLASS::get_spenders(
259259
{
260260
using namespace system;
261261
const auto point_fks = to_spenders(link);
262-
const auto inputs = make_shared<chain::input_cptrs>();
262+
const auto inputs = to_shared<chain::input_cptrs>();
263263
inputs->reserve(point_fks.size());
264264

265265
// TODO: eliminate shared memory pointer reallocation.

0 commit comments

Comments
 (0)