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

Merge tag 'v0.21.17'

Browse Source 
release v0.21.17
This commit is contained in:
Max Kellermann
2019-12-16 23:43:51 +01:00
parent b449627265 5680a3a4b7
commit 683d5848f4
18 changed files with 94 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/StringBuffer.hxx
View File

@@ -35,14 +35,14 @@
/**
* A statically allocated string buffer.
*/
template<typename T, size_t CAPACITY>
template<typename T, std::size_t CAPACITY>
class BasicStringBuffer {
public:
typedef T value_type;
typedef T &reference;
typedef T *pointer;
typedef const T *const_pointer;
typedef size_t size_type;
typedef std::size_t size_type;
static constexpr value_type SENTINEL = '\0';
@@ -104,7 +104,7 @@ public:
}
};
template<size_t CAPACITY>
template<std::size_t CAPACITY>
class StringBuffer : public BasicStringBuffer<char, CAPACITY> {};
#endif

6
src/util/StringFormat.hxx
View File

@@ -36,13 +36,13 @@
template<typename... Args>
static inline void
StringFormat(char *buffer, size_t size,
StringFormat(char *buffer, std::size_t size,
const char *fmt, Args&&... args) noexcept
{
snprintf(buffer, size, fmt, args...);
}
template<size_t CAPACITY, typename... Args>
template<std::size_t CAPACITY, typename... Args>
static inline void
StringFormat(StringBuffer<CAPACITY> &buffer,
const char *fmt, Args&&... args) noexcept
@@ -50,7 +50,7 @@ StringFormat(StringBuffer<CAPACITY> &buffer,
StringFormat(buffer.data(), buffer.capacity(), fmt, args...);
}
template<size_t CAPACITY, typename... Args>
template<std::size_t CAPACITY, typename... Args>
static inline StringBuffer<CAPACITY>
StringFormat(const char *fmt, Args&&... args) noexcept
{