sync dependencies with upstream

This commit is contained in:
2019-09-30 20:20:41 +02:00
parent c7a8b733ed
commit 31991f7bb0
6 changed files with 2457 additions and 1121 deletions

View File

@@ -14,19 +14,19 @@ namespace sqlite {
> { };
template <
typename ClassType,
typename ReturnType,
typename ClassType,
typename ReturnType,
typename... Arguments
>
struct function_traits<
ReturnType(ClassType::*)(Arguments...) const
> : function_traits<ReturnType(*)(Arguments...)> { };
/* support the non-const operator ()
* this will work with user defined functors */
/* support the non-const operator ()
* this will work with user defined functors */
template <
typename ClassType,
typename ReturnType,
typename ClassType,
typename ReturnType,
typename... Arguments
>
struct function_traits<
@@ -34,7 +34,7 @@ namespace sqlite {
> : function_traits<ReturnType(*)(Arguments...)> { };
template <
typename ReturnType,
typename ReturnType,
typename... Arguments
>
struct function_traits<

View File

@@ -18,8 +18,8 @@ namespace sqlite {
while(true) {
char *used_output;
switch(codecvt.out(state, remaining_input, &input[input.size()],
remaining_input, &result[produced_output],
&result[result.size() - 1] + 1, used_output)) {
remaining_input, &result[produced_output],
&result[result.size() - 1] + 1, used_output)) {
case std::codecvt_base::ok:
result.resize(used_output - result.data());
return result;
@@ -34,7 +34,7 @@ namespace sqlite {
result.resize(
result.size()
+ (std::max)((&input[input.size()] - remaining_input) * 3 / 2,
std::ptrdiff_t(4)));
std::ptrdiff_t(4)));
}
}
}