admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename used namespace for C++ to m_lib

Browse Source
This commit is contained in:
Patrick Pelissier committed 2021-01-10 08:48:46 +01:00
1 parent a03b2e80c6
commit eabc867c2a
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

m-string.h
+4 -4
View File
@@ -1731,7 +1731,7 @@ string_utf8_p(string_t str)
((const string_t){{.u.heap = { .size = sizeof(s)-1, .alloc = sizeof(s) } , \ ((const string_t){{.u.heap = { .size = sizeof(s)-1, .alloc = sizeof(s) } , \
.ptr = ((struct { long long _n; char _d[sizeof (s)]; }){ 0, s })._d }}) .ptr = ((struct { long long _n; char _d[sizeof (s)]; }){ 0, s })._d }})
#else #else
namespace m_string { namespace m_lib {
template <unsigned int N> template <unsigned int N>
struct m_aligned_string { struct m_aligned_string {
string_t string; string_t string;
@@ -1750,7 +1750,7 @@ namespace m_string {
} }
/* Initialize a constant string with the given C string (C++ mode) */ /* Initialize a constant string with the given C string (C++ mode) */
#define STRING_CTE(s) \ #define STRING_CTE(s) \
m_string::m_aligned_string<sizeof (s)>(s).string m_lib::m_aligned_string<sizeof (s)>(s).string
#endif #endif
/* Initialize and set a string to the given formatted value. */ /* Initialize and set a string to the given formatted value. */
@@ -2296,7 +2296,7 @@ namespace m_string {
#define BOUNDED_STRING_CTE(name, string) \ #define BOUNDED_STRING_CTE(name, string) \
((const struct M_C(name, _s) *)((M_C(name, _array_t)){string})) ((const struct M_C(name, _s) *)((M_C(name, _array_t)){string}))
#else #else
namespace m_string { namespace m_lib {
template <unsigned int N> template <unsigned int N>
struct m_bounded_string { struct m_bounded_string {
char s[N]; char s[N];
@@ -2308,7 +2308,7 @@ namespace m_string {
}; };
} }
#define BOUNDED_STRING_CTE(name, string) \ #define BOUNDED_STRING_CTE(name, string) \
((const struct M_C(name, _s) *)(m_string::m_bounded_string<sizeof (M_C(name, _t))>(string).s)) ((const struct M_C(name, _s) *)(m_lib::m_bounded_string<sizeof (M_C(name, _t))>(string).s))
#endif #endif
m-tuple.h
+2 -2
View File
@@ -66,7 +66,7 @@
( (const int[]) {M_MAP2_C(TUPLEI_ORDER_CONVERT, name, __VA_ARGS__), 0}) ( (const int[]) {M_MAP2_C(TUPLEI_ORDER_CONVERT, name, __VA_ARGS__), 0})
#else #else
#include <initializer_list> #include <initializer_list>
namespace m_tuple { namespace m_lib {
template <unsigned int N> template <unsigned int N>
struct m_int_array { struct m_int_array {
int data[N]; int data[N];
@@ -79,7 +79,7 @@ namespace m_tuple {
}; };
} }
#define TUPLE_ORDER(name, ...) \ #define TUPLE_ORDER(name, ...) \
(m_tuple::m_int_array<M_NARGS(__VA_ARGS__,0)>({M_MAP2_C(TUPLEI_ORDER_CONVERT, name, __VA_ARGS__), 0}).data) (m_lib::m_int_array<M_NARGS(__VA_ARGS__,0)>({M_MAP2_C(TUPLEI_ORDER_CONVERT, name, __VA_ARGS__), 0}).data)
#endif #endif