Skip to content

Commit b044530

Browse files
author
Sebastiano Merlino
committed
Avoid double-call to copy constructor
1 parent 4c18ce7 commit b044530

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎examples/benchmark.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const http_response hello_world_resource::render(const http_request& req)
4444
{
4545
//it is possible to send a response initializing an http_string_response
4646
//that reads the content to send in response from a string.
47-
return http_response(http_response_builder(PAGE, 200).string_response());
47+
return http_response_builder(PAGE, 200).string_response();
4848
}
4949

5050
int main()

‎examples/comet.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ class comet_send_resource : public http_resource {
3131
public:
3232
const http_response render(const http_request& req)
3333
{
34-
return http_response(http_response_builder("Hi", 200).long_polling_send_response(topics_array[0]));
34+
return http_response_builder("Hi", 200).long_polling_send_response(topics_array[0]);
3535
}
3636
};
3737

3838
class comet_listen_resource : public http_resource {
3939
public:
4040
const http_response render(const http_request& req)
4141
{
42-
return http_response(http_response_builder("OK", 200).long_polling_receive_response(topics));
42+
return http_response_builder("OK", 200).long_polling_receive_response(topics);
4343
}
4444
};
4545

‎examples/hello_world.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const http_response hello_world_resource::render(const http_request& req)
4242

4343
//it is possible to send a response initializing an http_string_response
4444
//that reads the content to send in response from a string.
45-
return http_response(http_response_builder("Hello World!!!", 200).string_response());
45+
return http_response_builder("Hello World!!!", 200).string_response();
4646
}
4747

4848
int main()

‎src/webserver.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ const http_response webserver::not_found_page(details::modded_request* mr) const
615615
}
616616
else
617617
{
618-
return http_response(http_response_builder(NOT_FOUND_ERROR, http_utils::http_not_found).string_response());
618+
return http_response_builder(NOT_FOUND_ERROR, http_utils::http_not_found).string_response();
619619
}
620620
}
621621

@@ -627,7 +627,7 @@ const http_response webserver::method_not_allowed_page(details::modded_request*
627627
}
628628
else
629629
{
630-
return http_response(http_response_builder(METHOD_ERROR, http_utils::http_method_not_allowed).string_response());
630+
return http_response_builder(METHOD_ERROR, http_utils::http_method_not_allowed).string_response();
631631
}
632632
}
633633

@@ -636,7 +636,7 @@ const http_response webserver::internal_error_page(details::modded_request* mr,
636636
if(internal_error_resource != 0x0 && !force_our)
637637
return internal_error_resource(*mr->dhr);
638638
else
639-
return http_response(http_response_builder(GENERIC_ERROR, http_utils::http_internal_server_error).string_response());
639+
return http_response_builder(GENERIC_ERROR, http_utils::http_internal_server_error).string_response();
640640
}
641641

642642
int webserver::bodyless_requests_answer(

‎test/integ/basic.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ class simple_resource : public http_resource
5050
public:
5151
const http_response render_GET(const http_request& req)
5252
{
53-
return http_response(http_response_builder("OK", 200, "text/plain").string_response());
53+
return http_response_builder("OK", 200, "text/plain").string_response();
5454
}
5555
const http_response render_POST(const http_request& req)
5656
{
57-
return http_response(http_response_builder(req.get_arg("arg1")+req.get_arg("arg2"), 200, "text/plain").string_response());
57+
return http_response_builder(req.get_arg("arg1")+req.get_arg("arg2"), 200, "text/plain").string_response();
5858
}
5959
};
6060

@@ -63,7 +63,7 @@ class long_content_resource : public http_resource
6363
public:
6464
const http_response render_GET(const http_request& req)
6565
{
66-
return http_response(http_response_builder(lorem_ipsum, 200, "text/plain").string_response());
66+
return http_response_builder(lorem_ipsum, 200, "text/plain").string_response();
6767
}
6868
};
6969

@@ -74,7 +74,7 @@ class header_test_resource : public http_resource
7474
{
7575
http_response_builder hrb("OK", 200, "text/plain");
7676
hrb.with_header("KEY", "VALUE");
77-
return http_response(hrb.string_response());
77+
return http_response(hrb.string_response();
7878
}
7979
};
8080

@@ -83,23 +83,23 @@ class complete_test_resource : public http_resource
8383
public:
8484
const http_response render_GET(const http_request& req)
8585
{
86-
return http_response(http_response_builder("OK", 200, "text/plain").string_response());
86+
return http_response_builder("OK", 200, "text/plain").string_response();
8787
}
8888
const http_response render_POST(const http_request& req)
8989
{
90-
return http_response(http_response_builder("OK", 200, "text/plain").string_response());
90+
return http_response_builder("OK", 200, "text/plain").string_response();
9191
}
9292
const http_response render_PUT(const http_request& req)
9393
{
94-
return http_response(http_response_builder("OK", 200, "text/plain").string_response());
94+
return http_response_builder("OK", 200, "text/plain").string_response();
9595
}
9696
const http_response render_DELETE(const http_request& req)
9797
{
98-
return http_response(http_response_builder("OK", 200, "text/plain").string_response());
98+
return http_response_builder("OK", 200, "text/plain").string_response();
9999
}
100100
const http_response render_CONNECT(const http_request& req)
101101
{
102-
return http_response(http_response_builder("OK", 200, "text/plain").string_response());
102+
return http_response_builder("OK", 200, "text/plain").string_response();
103103
}
104104
};
105105

@@ -108,7 +108,7 @@ class only_render_resource : public http_resource
108108
public:
109109
const http_response render(const http_request& req)
110110
{
111-
return http_response(http_response_builder("OK", 200, "text/plain").string_response());
111+
return http_response_builder("OK", 200, "text/plain").string_response();
112112
}
113113
};
114114

@@ -117,7 +117,7 @@ class ok_resource : public http_resource
117117
public:
118118
const http_response render_GET(const http_request& req)
119119
{
120-
return http_response(http_response_builder("OK", 200, "text/plain").string_response());
120+
return http_response_builder("OK", 200, "text/plain").string_response();
121121
}
122122
};
123123

@@ -126,7 +126,7 @@ class nok_resource : public http_resource
126126
public:
127127
const http_response render_GET(const http_request& req)
128128
{
129-
return http_response(http_response_builder("NOK", 200, "text/plain").string_response());
129+
return http_response_builder("NOK", 200, "text/plain").string_response();
130130
}
131131
};
132132

‎test/integ/threaded.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ok_resource : public http_resource
3232
public:
3333
const http_response render_GET(const http_request& req)
3434
{
35-
return http_response(http_response_builder("OK", 200, "text/plain").string_response());
35+
return http_response_builder("OK", 200, "text/plain").string_response();
3636
}
3737
};
3838

0 commit comments

Comments
 (0)