Skip to content

Commit 958641d

Browse files
committed
Remove last reference to nonstd::basic_string_view
1 parent c4c1617 commit 958641d

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

gframe/Base64.h

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
https://renenyffenegger.ch/notes/development/Base64/Encoding-and-decoding-base-64-with-cpp
1010
Version: 2.rc.04 (release candidate)
1111
Copyright (C) 2004-2017, 2020 Rene Nyffenegger
12-
Copyright (C) 2021 Edoardo Lolletti
12+
Copyright (C) 2021-2024 Edoardo Lolletti
1313
This source code is provided 'as-is', without any express or implied
1414
warranty. In no event will the author be held liable for any damages
1515
arising from the use of this software.
@@ -27,21 +27,13 @@
2727
*/
2828
#ifndef BASE64_H
2929
#define BASE64_H
30-
#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1)
31-
#include <string_view>
32-
#else
33-
#include "nonstd/string_view.hpp"
34-
#endif
3530
#include <string>
3631
#include <algorithm>
3732
#include <vector>
33+
#include "text_types.h"
34+
3835
namespace B64 {
39-
template<typename T>
40-
#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1)
41-
using basic_string_view = std::basic_string_view<T>;
42-
#else
43-
using basic_string_view = nonstd::basic_string_view<T>;
44-
#endif
36+
using epro::basic_string_view;
4537
}
4638

4739
static const char* base64_chars[2] = {
@@ -240,4 +232,4 @@ R base64_decode(const T* encoded_string, bool remove_linebreaks = false, bool ab
240232
B64::basic_string_view<T> tmp{ encoded_string };
241233
return base64_decode<R, T>(tmp.data(), tmp.size(), remove_linebreaks, abort_on_invalid);
242234
}
243-
#endif //BASE64_H
235+
#endif //BASE64_H

0 commit comments

Comments
 (0)