oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/TemplateString: use std::size_t

Browse Source
This commit is contained in:
Max Kellermann 2020-10-23 11:23:55 +02:00 committed by Max Kellermann
parent 0dda4c06b1
commit de58bfbb7f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/TemplateString.hxx
View File

@ -40,7 +40,7 @@ namespace TemplateString {
template<char... _value> template<char... _value>
struct Construct { struct Construct {
static constexpr char value[] = {_value..., 0}; static constexpr char value[] = {_value..., 0};
static constexpr size_t size = sizeof...(_value); static constexpr std::size_t size = sizeof...(_value);
}; };
template<char... _value> template<char... _value>
@ -62,14 +62,14 @@ struct CharAsString : Construct<ch> {};
* as variadic arguments. * as variadic arguments.
*/ */
template<template<char...> class F, template<template<char...> class F,
const char *src, size_t length, size_t i, const char *src, std::size_t length, std::size_t i,
char... _value> char... _value>
struct VariadicChars : VariadicChars<F, src, length - 1, i + 1, _value..., src[i]> { struct VariadicChars : VariadicChars<F, src, length - 1, i + 1, _value..., src[i]> {
static_assert(length > 0, "Wrong length"); static_assert(length > 0, "Wrong length");
}; };
template<template<char...> class F, template<template<char...> class F,
const char *src, size_t length, const char *src, std::size_t length,
char... _value> char... _value>
struct VariadicChars<F, src, 0, length, _value...> : F<_value...> {}; struct VariadicChars<F, src, 0, length, _value...> : F<_value...> {};
@ -77,7 +77,7 @@ struct VariadicChars<F, src, 0, length, _value...> : F<_value...> {};
* Like #VariadicChars, but pass an additional argument to #F. * Like #VariadicChars, but pass an additional argument to #F.
*/ */
template<template<typename Arg, char...> class F, typename Arg, template<template<typename Arg, char...> class F, typename Arg,
const char *src, size_t length, size_t i, const char *src, std::size_t length, std::size_t i,
char... _value> char... _value>
struct VariadicChars1 : VariadicChars1<F, Arg, struct VariadicChars1 : VariadicChars1<F, Arg,
src, length - 1, i + 1, _value..., src[i]> { src, length - 1, i + 1, _value..., src[i]> {
@ -85,11 +85,11 @@ struct VariadicChars1 : VariadicChars1<F, Arg,
}; };
template<template<typename Arg, char...> class F, typename Arg, template<template<typename Arg, char...> class F, typename Arg,
const char *src, size_t length, const char *src, std::size_t length,
char... _value> char... _value>
struct VariadicChars1<F, Arg, src, 0, length, _value...> : F<Arg, _value...> {}; struct VariadicChars1<F, Arg, src, 0, length, _value...> : F<Arg, _value...> {};
template<const char *src, size_t length, char... value> template<const char *src, std::size_t length, char... value>
struct _BuildString : VariadicChars<Construct, src, length, 0, struct _BuildString : VariadicChars<Construct, src, length, 0,
value...> {}; value...> {};