Skip to content

Commit e444ca4

Browse files
committed
Fixing up a bug caused by working around missing magic statics in VS2013. Avoiding a static initialization order fiasco issue.
1 parent 01a1dc1 commit e444ca4

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

Release/src/http/common/http_helpers.cpp

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,14 @@ bool is_content_type_one_of(const utility::string_t *first, const utility::strin
4949

5050
// Remove once VS 2013 is no longer supported.
5151
#if defined(_WIN32) && _MSC_VER < 1900
52+
// Not referring to mime_types to avoid static initialization order fiasco.
5253
static const utility::string_t textual_types [] = {
53-
mime_types::message_http,
54-
mime_types::application_json,
55-
mime_types::application_xml,
56-
mime_types::application_atom_xml,
57-
mime_types::application_http,
58-
mime_types::application_x_www_form_urlencoded
54+
U("message/http"),
55+
U("application/json"),
56+
U("application/xml"),
57+
U("application/atom+xml"),
58+
U("application/http"),
59+
U("application/x-www-form-urlencoded")
5960
};
6061
#endif
6162
bool is_content_type_textual(const utility::string_t &content_type)
@@ -80,15 +81,16 @@ bool is_content_type_textual(const utility::string_t &content_type)
8081

8182
// Remove once VS 2013 is no longer supported.
8283
#if defined(_WIN32) && _MSC_VER < 1900
84+
// Not referring to mime_types to avoid static initialization order fiasco.
8385
static const utility::string_t json_types [] = {
84-
mime_types::application_json,
85-
mime_types::application_xjson,
86-
mime_types::text_json,
87-
mime_types::text_xjson,
88-
mime_types::text_javascript,
89-
mime_types::text_xjavascript,
90-
mime_types::application_javascript,
91-
mime_types::application_xjavascript
86+
U("application/json"),
87+
U("application/x-json"),
88+
U("text/json"),
89+
U("text/x-json"),
90+
U("text/javascript"),
91+
U("text/x-javascript"),
92+
U("application/javascript"),
93+
U("application/x-javascript")
9294
};
9395
#endif
9496
bool is_content_type_json(const utility::string_t &content_type)

0 commit comments

Comments
 (0)