Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/common/api/api_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Impl::Impl(std::chrono::milliseconds file_flush_interval_msec)

Filesystem::FileSharedPtr Impl::createFile(const std::string& path, Event::Dispatcher& dispatcher,
Thread::BasicLockable& lock, Stats::Store& stats_store) {
return Filesystem::FileSharedPtr{new Filesystem::FileImpl(
path, dispatcher, lock, *os_sys_calls_, stats_store, file_flush_interval_msec_)};
return std::make_shared<Filesystem::FileImpl>(path, dispatcher, lock, *os_sys_calls_, stats_store,
file_flush_interval_msec_);
}

bool Impl::fileExists(const std::string& path) { return Filesystem::fileExists(path); }
Expand Down
8 changes: 4 additions & 4 deletions source/common/http/date_provider_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ TlsCachingDateProviderImpl::TlsCachingDateProviderImpl(Event::Dispatcher& dispat

void TlsCachingDateProviderImpl::onRefreshDate() {
std::string new_date_string = date_formatter_.now();
tls_.set(
tls_slot_, [new_date_string](Event::Dispatcher&) -> ThreadLocal::ThreadLocalObjectSharedPtr {
return ThreadLocal::ThreadLocalObjectSharedPtr{new ThreadLocalCachedDate(new_date_string)};
});
tls_.set(tls_slot_,
[new_date_string](Event::Dispatcher&) -> ThreadLocal::ThreadLocalObjectSharedPtr {
return std::make_shared<ThreadLocalCachedDate>(new_date_string);
});

refresh_timer_->enableTimer(std::chrono::milliseconds(500));
}
Expand Down
2 changes: 1 addition & 1 deletion source/common/router/rds_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ RdsRouteConfigProviderImpl::RdsRouteConfigProviderImpl(
ConfigConstSharedPtr initial_config(new NullConfigImpl());
tls_.set(tls_slot_,
[initial_config](Event::Dispatcher&) -> ThreadLocal::ThreadLocalObjectSharedPtr {
return ThreadLocal::ThreadLocalObjectSharedPtr{new ThreadLocalConfig(initial_config)};
return std::make_shared<ThreadLocalConfig>(initial_config);
});
}

Expand Down
2 changes: 1 addition & 1 deletion source/common/stats/statsd.cc
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ TcpStatsdSink::TcpStatsdSink(const LocalInfo::LocalInfo& local_info,

tls.set(tls_slot_,
[this](Event::Dispatcher& dispatcher) -> ThreadLocal::ThreadLocalObjectSharedPtr {
return ThreadLocal::ThreadLocalObjectSharedPtr{new TlsSink(*this, dispatcher)};
return std::make_shared<TlsSink>(*this, dispatcher);
});
}

Expand Down
2 changes: 1 addition & 1 deletion source/common/stats/thread_local_store.cc
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void ThreadLocalStoreImpl::initializeThreading(Event::Dispatcher& main_thread_di
tls_ = &tls;
tls_slot_ = tls_->allocateSlot();
tls_->set(tls_slot_, [](Event::Dispatcher&) -> ThreadLocal::ThreadLocalObjectSharedPtr {
return ThreadLocal::ThreadLocalObjectSharedPtr{new TlsCache()};
return std::make_shared<TlsCache>();
});
}

Expand Down
2 changes: 1 addition & 1 deletion source/common/upstream/logical_dns_cluster.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ LogicalDnsCluster::LogicalDnsCluster(const Json::Object& config, Runtime::Loader
// This must come before startResolve(), since the resolve callback relies on
// tls_slot_ being initialized.
tls.set(tls_slot_, [](Event::Dispatcher&) -> ThreadLocal::ThreadLocalObjectSharedPtr {
return ThreadLocal::ThreadLocalObjectSharedPtr{new PerThreadCurrentHostData()};
return std::make_shared<PerThreadCurrentHostData>();
});

startResolve();
Expand Down
2 changes: 1 addition & 1 deletion test/common/upstream/ring_hash_lb_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Upstream {

static HostSharedPtr newTestHost(Upstream::ClusterInfoConstSharedPtr cluster,
const std::string& url) {
return HostSharedPtr{new HostImpl(cluster, "", Network::Utility::resolveUrl(url), false, 1, "")};
return std::make_shared<HostImpl>(cluster, "", Network::Utility::resolveUrl(url), false, 1, "");
}

class TestLoadBalancerContext : public LoadBalancerContext {
Expand Down