From 5ae4b34f52188dc9a9527b0c54242b242db9dc01 Mon Sep 17 00:00:00 2001 From: Martin Conte Mac Donell Date: Sat, 4 Feb 2017 00:49:34 -0800 Subject: [PATCH 1/2] Allow copy elision on returns and temporary args This change allows copy elision on unreferenced temporary objects --- test/common/http/conn_manager_impl_test.cc | 2 +- test/common/tracing/http_tracer_impl_test.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/common/http/conn_manager_impl_test.cc b/test/common/http/conn_manager_impl_test.cc index ee40a4d04c9a3..ba62bbebb3400 100644 --- a/test/common/http/conn_manager_impl_test.cc +++ b/test/common/http/conn_manager_impl_test.cc @@ -39,7 +39,7 @@ class HttpConnectionManagerImplTest : public Test, public ConnectionManagerConfi : access_log_path_("dummy_path"), access_logs_{Http::AccessLog::InstancePtr{new Http::AccessLog::InstanceImpl( access_log_path_, {}, - std::move(AccessLog::AccessLogFormatUtils::defaultAccessLogFormatter()), + AccessLog::AccessLogFormatUtils::defaultAccessLogFormatter(), log_manager_)}}, codec_(new NiceMock()), stats_{{ALL_HTTP_CONN_MAN_STATS(POOL_COUNTER(fake_stats_), POOL_GAUGE(fake_stats_), diff --git a/test/common/tracing/http_tracer_impl_test.cc b/test/common/tracing/http_tracer_impl_test.cc index aa0e2bccc4193..ec0e365a6470c 100644 --- a/test/common/tracing/http_tracer_impl_test.cc +++ b/test/common/tracing/http_tracer_impl_test.cc @@ -514,7 +514,7 @@ TEST_F(LightStepDriverTest, FlushSeveralSpans) { Http::MessagePtr msg(new Http::ResponseMessageImpl( Http::HeaderMapPtr{new Http::TestHeaderMapImpl{{":status", "200"}}})); - msg->trailers(std::move(Http::HeaderMapPtr{new Http::TestHeaderMapImpl{{"grpc-status", "0"}}})); + msg->trailers(Http::HeaderMapPtr{new Http::TestHeaderMapImpl{{"grpc-status", "0"}}}); callback->onSuccess(std::move(msg)); From f018ad9b2bc9bd60c0a1662da79d555092352e8a Mon Sep 17 00:00:00 2001 From: Martin Conte Mac Donell Date: Mon, 6 Feb 2017 14:21:50 -0800 Subject: [PATCH 2/2] Fix (old) formatting problems on conn_manager --- test/common/http/conn_manager_impl_test.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/common/http/conn_manager_impl_test.cc b/test/common/http/conn_manager_impl_test.cc index ba62bbebb3400..bdd845b56fdc0 100644 --- a/test/common/http/conn_manager_impl_test.cc +++ b/test/common/http/conn_manager_impl_test.cc @@ -38,8 +38,7 @@ class HttpConnectionManagerImplTest : public Test, public ConnectionManagerConfi HttpConnectionManagerImplTest() : access_log_path_("dummy_path"), access_logs_{Http::AccessLog::InstancePtr{new Http::AccessLog::InstanceImpl( - access_log_path_, {}, - AccessLog::AccessLogFormatUtils::defaultAccessLogFormatter(), + access_log_path_, {}, AccessLog::AccessLogFormatUtils::defaultAccessLogFormatter(), log_manager_)}}, codec_(new NiceMock()), stats_{{ALL_HTTP_CONN_MAN_STATS(POOL_COUNTER(fake_stats_), POOL_GAUGE(fake_stats_),