feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

More Oracle fixes.

Browse Source
This commit is contained in:
Howard Hinnant
2017-08-05 20:27:15 -04:00
parent 9c181a1440
commit c4dcd5eb78
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
date.h
View File

@@ -6724,7 +6724,8 @@ parse(const CharT* format, Parsable& tp,
namespace detail namespace detail
{ {
#if __cplusplus >= 201402 && (!defined(__EDG_VERSION__) || __EDG_VERSION__ > 411) #if __cplusplus >= 201402 && (!defined(__EDG_VERSION__) || __EDG_VERSION__ > 411) \
&& (!defined(__SUNPRO_CC) || __SUNPRO_CC > 0x5150)
template <class CharT, std::size_t N> template <class CharT, std::size_t N>
class string_literal class string_literal

17
tz.cpp
View File

@@ -2617,15 +2617,26 @@ curl_global()
return 0; return 0;
} }
static const auto curl_delete = [](CURL* p) {::curl_easy_cleanup(p);}; namespace
{
struct curl_deleter
{
void operator()(CURL* p) const
{
::curl_easy_cleanup(p);
}
};
} // unnamed namespace
static static
std::unique_ptr<CURL, decltype(curl_delete)> std::unique_ptr<CURL, curl_deleter>
curl_init() curl_init()
{ {
static const auto curl_is_now_initiailized = curl_global(); static const auto curl_is_now_initiailized = curl_global();
(void)curl_is_now_initiailized; (void)curl_is_now_initiailized;
return std::unique_ptr<CURL, decltype(curl_delete)>{::curl_easy_init(), curl_delete}; return std::unique_ptr<CURL, curl_deleter>{::curl_easy_init()};
} }
static static