zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-12-16 03:08:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add inline namespace

Browse Source
This commit is contained in:
Franz Pöschel
2025-05-16 15:03:29 +02:00
parent a01fe3b4c1
commit 5b3d75e2db
51 changed files with 289 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/toml11/compat.hpp
View File

@@ -63,6 +63,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
@@ -81,6 +83,7 @@ std::unique_ptr<T> make_unique(Ts&& ... args)
#endif // TOML11_HAS_STD_MAKE_UNIQUE
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
// ---------------------------------------------------------------------------
@@ -95,6 +98,8 @@ std::unique_ptr<T> make_unique(Ts&& ... args)
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
# if defined(TOML11_HAS_STD_MAKE_REVERSE_ITERATOR)
@@ -112,6 +117,7 @@ std::reverse_iterator<Iterator> make_reverse_iterator(Iterator iter)
#endif // TOML11_HAS_STD_MAKE_REVERSE_ITERATOR
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
// ---------------------------------------------------------------------------
@@ -126,6 +132,8 @@ std::reverse_iterator<Iterator> make_reverse_iterator(Iterator iter)
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
#if defined(TOML11_HAS_STD_CLAMP)
@@ -144,6 +152,7 @@ T clamp(const T& x, const T& low, const T& high) noexcept
#endif // TOML11_HAS_STD_CLAMP
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
// ---------------------------------------------------------------------------
@@ -158,6 +167,8 @@ T clamp(const T& x, const T& low, const T& high) noexcept
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
#if defined(TOML11_HAS_STD_BIT_CAST)
@@ -183,6 +194,7 @@ U bit_cast(const T& x) noexcept
#endif // TOML11_HAS_STD_BIT_CAST
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
// ---------------------------------------------------------------------------
@@ -198,6 +210,8 @@ U bit_cast(const T& x) noexcept
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
#if defined(TOML11_HAS_STD_REMOVE_CVREF)
@@ -220,6 +234,7 @@ using remove_cvref_t = typename remove_cvref<T>::type;
#endif // TOML11_HAS_STD_REMOVE_CVREF
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
// ---------------------------------------------------------------------------
@@ -235,6 +250,8 @@ using remove_cvref_t = typename remove_cvref<T>::type;
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
#if defined(TOML11_HAS_STD_CONJUNCTION)
@@ -265,6 +282,7 @@ struct negation : std::integral_constant<bool, !static_cast<bool>(T::value)>{};
#endif // TOML11_HAS_STD_CONJUNCTION
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
// ---------------------------------------------------------------------------
@@ -280,6 +298,8 @@ struct negation : std::integral_constant<bool, !static_cast<bool>(T::value)>{};
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
#if defined(TOML11_HAS_STD_INTEGER_SEQUENCE)
@@ -324,6 +344,7 @@ using make_index_sequence = typename index_sequence_maker<N>::type;
#endif // TOML11_HAS_STD_INTEGER_SEQUENCE
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
// ---------------------------------------------------------------------------
@@ -339,6 +360,8 @@ using make_index_sequence = typename index_sequence_maker<N>::type;
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
#if defined(TOML11_HAS_STD_ENABLE_IF_T)
@@ -353,6 +376,7 @@ using enable_if_t = typename std::enable_if<B, T>::type;
#endif // TOML11_HAS_STD_ENABLE_IF_T
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
// ---------------------------------------------------------------------------
@@ -368,6 +392,8 @@ using enable_if_t = typename std::enable_if<B, T>::type;
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
#if defined(TOML11_HAS_STD_INVOKE_RESULT)
@@ -384,6 +410,7 @@ using return_type_of_t = typename std::result_of<F(Args...)>::type;
#endif // TOML11_HAS_STD_INVOKE_RESULT
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
// ---------------------------------------------------------------------------
@@ -399,6 +426,8 @@ using return_type_of_t = typename std::result_of<F(Args...)>::type;
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
#if defined(TOML11_HAS_STD_VOID_T)
@@ -413,6 +442,7 @@ using void_t = void;
#endif // TOML11_HAS_STD_VOID_T
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
// ----------------------------------------------------------------------------
@@ -457,6 +487,8 @@ using void_t = void;
#include <source_location>
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
using source_location = std::source_location;
@@ -477,11 +509,14 @@ inline std::string to_string(const source_location& loc)
}
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#elif defined(TOML11_HAS_EXPERIMENTAL_SOURCE_LOCATION)
#include <experimental/source_location>
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
using source_location = std::experimental::source_location;
@@ -502,10 +537,13 @@ inline std::string to_string(const source_location& loc)
}
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#elif defined(TOML11_HAS_BUILTIN_FILE_LINE)
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
struct source_location
@@ -546,10 +584,13 @@ inline std::string to_string(const source_location& loc)
}
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#else // no builtin
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
struct source_location
@@ -562,6 +603,7 @@ inline std::string to_string(const source_location&)
return std::string("");
}
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_HAS_STD_SOURCE_LOCATION
@@ -586,6 +628,8 @@ inline std::string to_string(const source_location&)
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
using std::optional;
@@ -601,12 +645,15 @@ operator<<(std::basic_ostream<charT, traitsT>& os, const std::nullopt_t&)
}
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#else // TOML11_HAS_STD_OPTIONAL
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace cxx
{
@@ -804,6 +851,7 @@ class optional
};
};
} // cxx
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_HAS_STD_OPTIONAL

6
include/toml11/context.hpp
View File

@@ -8,6 +8,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -50,11 +52,14 @@ class context
};
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#if defined(TOML11_COMPILE_SOURCES)
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
struct type_config;
struct ordered_type_config;
namespace detail
@@ -62,6 +67,7 @@ namespace detail
extern template class context<::toml::type_config>;
extern template class context<::toml::ordered_type_config>;
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_COMPILE_SOURCES

9
include/toml11/conversion.hpp
View File

@@ -4,6 +4,7 @@
#include "find.hpp"
#include "from.hpp" // IWYU pragma: keep
#include "into.hpp" // IWYU pragma: keep
#include "version.hpp"
#if defined(TOML11_HAS_OPTIONAL)
@@ -11,6 +12,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -57,12 +60,15 @@ void assign_member_variable_to_value(const T& obj, basic_value<TC>& v, const cha
}
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#else
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -79,6 +85,7 @@ void assign_member_variable_to_value(const T& obj, basic_value<TC>& v, const cha
}
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // optional
@@ -174,6 +181,7 @@ void assign_member_variable_to_value(const T& obj, basic_value<TC>& v, const cha
#define TOML11_DEFINE_CONVERSION_NON_INTRUSIVE(NAME, ...)\
namespace toml { \
namespace TOML11_INLINE_VERSION_NAMESPACE { \
template<> \
struct from<NAME> \
{ \
@@ -196,6 +204,7 @@ void assign_member_variable_to_value(const T& obj, basic_value<TC>& v, const cha
return v; \
} \
}; \
} /* TOML11_INLINE_VERSION_NAMESPACE */ \
} /* toml */
#endif// TOML11_WITHOUT_DEFINE_NON_INTRUSIVE

5
include/toml11/exception.hpp
View File

@@ -3,8 +3,12 @@
#include <exception>
#include "version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
struct exception : public std::exception
{
@@ -13,5 +17,6 @@ struct exception : public std::exception
virtual const char* what() const noexcept override {return "";}
};
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOMl11_EXCEPTION_HPP

4
include/toml11/find.hpp
View File

@@ -5,6 +5,7 @@
#include "get.hpp"
#include "value.hpp"
#include "version.hpp"
#if defined(TOML11_HAS_STRING_VIEW)
#include <string_view>
@@ -12,6 +13,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
// ----------------------------------------------------------------------------
// find<T>(value, key);
@@ -584,5 +587,6 @@ find_or_default(const basic_value<TC>& v, K1&& k1, Ks&& ... keys) noexcept(std::
}
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_FIND_HPP

4
include/toml11/from.hpp
View File

@@ -1,8 +1,11 @@
#ifndef TOML11_FROM_HPP
#define TOML11_FROM_HPP
#include "version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
template<typename T>
struct from;
@@ -13,5 +16,6 @@ struct from;
// }
// };
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_FROM_HPP

5
include/toml11/fwd/color_fwd.hpp
View File

@@ -3,6 +3,8 @@
#include <iosfwd>
#include "../version.hpp"
#ifdef TOML11_COLORIZE_ERROR_MESSAGE
#define TOML11_ERROR_MESSAGE_COLORIZED true
#else
@@ -17,6 +19,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace color
{
// put ANSI escape sequence to ostream
@@ -84,5 +88,6 @@ inline bool should_color()
}
} // color
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_COLOR_FWD_HPP

3
include/toml11/fwd/comments_fwd.hpp
View File

@@ -23,6 +23,8 @@
// error whenever you access to the element.
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
class discard_comments; // forward decl
class preserve_comments
@@ -447,5 +449,6 @@ inline void swap(const discard_comments&, const discard_comments&) noexcept {ret
inline std::ostream& operator<<(std::ostream& os, const discard_comments&) {return os;}
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml11
#endif // TOML11_COMMENTS_FWD_HPP

7
include/toml11/fwd/datetime_fwd.hpp
View File

@@ -9,8 +9,12 @@
#include <cstdlib>
#include <ctime>
#include "../version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
enum class month_t : std::uint8_t
{
@@ -257,5 +261,6 @@ std::ostream& operator<<(std::ostream& os, const offset_datetime& dt);
std::string to_string(const offset_datetime& dt);
}//toml
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_DATETIME_FWD_HPP

4
include/toml11/fwd/error_info_fwd.hpp
View File

@@ -3,9 +3,12 @@
#include "../source_location.hpp"
#include "../utility.hpp"
#include "../version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
// error info returned from parser.
struct error_info
@@ -93,5 +96,6 @@ std::string format_error(std::string title,
std::ostream& operator<<(std::ostream& os, const error_info& e);
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_ERROR_INFO_FWD_HPP

5
include/toml11/fwd/format_fwd.hpp
View File

@@ -8,8 +8,12 @@
#include <cstddef>
#include <cstdint>
#include "../version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
// toml types with serialization info
@@ -246,5 +250,6 @@ struct value_with_format
};
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#endif // TOML11_FORMAT_FWD_HPP

3
include/toml11/fwd/literal_fwd.hpp
View File

@@ -7,6 +7,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -29,5 +31,6 @@ inline namespace toml_literals
} // toml_literals
} // literals
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_LITERAL_FWD_HPP

4
include/toml11/fwd/location_fwd.hpp
View File

@@ -2,6 +2,7 @@
#define TOML11_LOCATION_FWD_HPP
#include "../result.hpp"
#include "../version.hpp"
#include <memory>
#include <string>
@@ -9,6 +10,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -145,5 +148,6 @@ std::size_t count(const location& first, const location& last,
const location::char_type& c);
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_LOCATION_FWD_HPP

4
include/toml11/fwd/region_fwd.hpp
View File

@@ -2,6 +2,7 @@
#define TOML11_REGION_FWD_HPP
#include "../location.hpp"
#include "../version.hpp"
#include <string>
#include <vector>
@@ -10,6 +11,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -106,5 +109,6 @@ class region
};
} // namespace detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#endif // TOML11_REGION_FWD_HPP

4
include/toml11/fwd/scanner_fwd.hpp
View File

@@ -2,6 +2,7 @@
#define TOML11_SCANNER_FWD_HPP
#include "../region.hpp"
#include "../version.hpp"
#include <memory>
#include <string>
@@ -14,6 +15,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -362,5 +365,6 @@ class maybe final: public scanner_base
};
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_SCANNER_FWD_HPP

4
include/toml11/fwd/source_location_fwd.hpp
View File

@@ -2,6 +2,7 @@
#define TOML11_SOURCE_LOCATION_FWD_HPP
#include "../region.hpp"
#include "../version.hpp"
#include <sstream>
#include <string>
@@ -9,6 +10,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
//
// A struct to contain location in a toml file.
@@ -144,5 +147,6 @@ std::string format_location(
return detail::format_location_rec(lnw, f, loc, msg, tail...);
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_SOURCE_LOCATION_FWD_HPP

4
include/toml11/fwd/syntax_fwd.hpp
View File

@@ -3,9 +3,12 @@
#include "../scanner.hpp"
#include "../spec.hpp"
#include "../version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
namespace syntax
@@ -411,5 +414,6 @@ literal const& null_value(const spec&);
} // namespace syntax
} // namespace detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#endif // TOML11_SYNTAX_FWD_HPP

4
include/toml11/fwd/value_t_fwd.hpp
View File

@@ -3,6 +3,7 @@
#include "../compat.hpp"
#include "../format.hpp"
#include "../version.hpp"
#include <iosfwd>
#include <string>
@@ -12,6 +13,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
// forward decl
template<typename TypeConfig>
@@ -113,5 +116,6 @@ template<typename T, typename V> struct is_exact_toml_type: is_exact_toml_type0<
template<typename T, typename V> struct is_not_toml_type : cxx::negation<is_exact_toml_type<T, V>> {};
} // namespace detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#endif // TOML11_VALUE_T_FWD_HPP

4
include/toml11/get.hpp
View File

@@ -6,6 +6,7 @@
#include "from.hpp"
#include "types.hpp"
#include "value.hpp"
#include "version.hpp"
#if defined(TOML11_HAS_STRING_VIEW)
#include <string_view>
@@ -13,6 +14,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
// ============================================================================
// T is toml::value; identity transformation.
@@ -647,5 +650,6 @@ get_or(const basic_value<TC>& v, T&& opt)
}
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_GET_HPP

3
include/toml11/impl/color_impl.hpp
View File

@@ -8,6 +8,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace color
{
// put ANSI escape sequence to ostream
@@ -72,5 +74,6 @@ TOML11_INLINE std::ostream& white (std::ostream& os)
} // ansi
} // color
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_COLOR_IMPL_HPP

4
include/toml11/impl/comments_impl.hpp
View File

@@ -2,9 +2,12 @@
#define TOML11_COMMENTS_IMPL_HPP
#include "../fwd/comments_fwd.hpp" // IWYU pragma: keep
#include "../version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
TOML11_INLINE bool operator==(const preserve_comments& lhs, const preserve_comments& rhs) {return lhs.comments == rhs.comments;}
TOML11_INLINE bool operator!=(const preserve_comments& lhs, const preserve_comments& rhs) {return lhs.comments != rhs.comments;}
@@ -42,5 +45,6 @@ TOML11_INLINE std::ostream& operator<<(std::ostream& os, const preserve_comments
return os;
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml11
#endif // TOML11_COMMENTS_IMPL_HPP

5
include/toml11/impl/datetime_impl.hpp
View File

@@ -15,6 +15,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
// To avoid non-threadsafe std::localtime. In C11 (not C++11!), localtime_s is
// provided in the absolutely same purpose, but C++11 is actually not compatible
@@ -514,5 +516,6 @@ TOML11_INLINE std::string to_string(const offset_datetime& dt)
return oss.str();
}
}//toml
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_DATETIME_IMPL_HPP

4
include/toml11/impl/error_info_impl.hpp
View File

@@ -3,11 +3,14 @@
#include "../fwd/error_info_fwd.hpp"
#include "../fwd/color_fwd.hpp"
#include "../version.hpp"
#include <sstream>
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
TOML11_INLINE std::string format_error(const std::string& errkind, const error_info& err)
{
@@ -71,5 +74,6 @@ TOML11_INLINE std::ostream& operator<<(std::ostream& os, const error_info& e)
return os;
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_ERROR_INFO_IMPL_HPP

3
include/toml11/impl/format_impl.hpp
View File

@@ -9,6 +9,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
// toml types with serialization info
@@ -293,5 +295,6 @@ TOML11_INLINE bool operator!=(const table_format_info& lhs, const table_format_i
return !(lhs == rhs);
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#endif // TOML11_FORMAT_IMPL_HPP

4
include/toml11/impl/literal_impl.hpp
View File

@@ -4,9 +4,12 @@
#include "../fwd/literal_fwd.hpp"
#include "../parser.hpp"
#include "../syntax.hpp"
#include "../version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -170,5 +173,6 @@ operator"" _toml(const char8_t* str, std::size_t len)
} // toml_literals
} // literals
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_LITERAL_IMPL_HPP

3
include/toml11/impl/location_impl.hpp
View File

@@ -7,6 +7,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -205,5 +207,6 @@ count(const location& first, const location& last, const location::char_type& c)
}
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_LOCATION_HPP

4
include/toml11/impl/region_impl.hpp
View File

@@ -3,6 +3,7 @@
#include "../fwd/region_fwd.hpp"
#include "../utility.hpp"
#include "../version.hpp"
#include <algorithm>
#include <iterator>
@@ -13,6 +14,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -242,5 +245,6 @@ TOML11_INLINE std::vector<std::pair<std::string, std::size_t>> region::as_lines(
}
} // namespace detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#endif // TOML11_REGION_IMPL_HPP

4
include/toml11/impl/scanner_impl.hpp
View File

@@ -3,9 +3,12 @@
#include "../fwd/scanner_fwd.hpp"
#include "../utility.hpp"
#include "../version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -468,5 +471,6 @@ TOML11_INLINE std::string maybe::name() const
}
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_SCANNER_IMPL_HPP

4
include/toml11/impl/source_location_impl.hpp
View File

@@ -5,6 +5,7 @@
#include "../color.hpp"
#include "../utility.hpp"
#include "../version.hpp"
#include <iomanip>
#include <sstream>
@@ -15,6 +16,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
TOML11_INLINE source_location::source_location(const detail::region& r)
: is_ok_(false),
@@ -207,5 +210,6 @@ TOML11_INLINE std::string format_location_impl(const std::size_t lnw,
}
} // namespace detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_SOURCE_LOCATION_IMPL_HPP

4
include/toml11/impl/syntax_impl.hpp
View File

@@ -4,9 +4,12 @@
#include "../fwd/syntax_fwd.hpp"
#include "../scanner.hpp"
#include "../spec.hpp"
#include "../version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
namespace syntax
@@ -885,5 +888,6 @@ TOML11_INLINE literal const& null_value(const spec&)
} // namespace syntax
} // namespace detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#endif // TOML11_SYNTAX_IMPL_HPP

4
include/toml11/impl/value_t_impl.hpp
View File

@@ -2,6 +2,7 @@
#define TOML11_VALUE_T_IMPL_HPP
#include "../fwd/value_t_fwd.hpp"
#include "../version.hpp"
#include <ostream>
#include <sstream>
@@ -9,6 +10,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
TOML11_INLINE std::ostream& operator<<(std::ostream& os, value_t t)
{
@@ -36,5 +39,6 @@ TOML11_INLINE std::string to_string(value_t t)
return oss.str();
}
} //TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#endif // TOML11_VALUE_T_IMPL_HPP

4
include/toml11/into.hpp
View File

@@ -1,8 +1,11 @@
#ifndef TOML11_INTO_HPP
#define TOML11_INTO_HPP
#include "version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
template<typename T>
struct into;
@@ -13,5 +16,6 @@ struct into;
// }
// };
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_INTO_HPP

5
include/toml11/ordered_map.hpp
View File

@@ -6,8 +6,12 @@
#include <utility>
#include <vector>
#include "version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -287,5 +291,6 @@ void swap(ordered_map<K,V,C,A>& lhs, ordered_map<K,V,C,A>& rhs)
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_ORDERED_MAP_HPP

7
include/toml11/parser.hpp
View File

@@ -10,6 +10,7 @@
#include "skip.hpp"
#include "syntax.hpp"
#include "value.hpp"
#include "version.hpp"
#include <fstream>
#include <sstream>
@@ -23,6 +24,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
struct syntax_error final : public ::toml::exception
{
@@ -3786,11 +3789,14 @@ parse(FILE* fp, std::string filename, spec s = spec::default_version())
}
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#if defined(TOML11_COMPILE_SOURCES)
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
struct type_config;
struct ordered_type_config;
@@ -3825,6 +3831,7 @@ extern template cxx::enable_if_t<std::is_same<std::filesystem::path, std::filesy
extern template cxx::enable_if_t<std::is_same<std::filesystem::path, std::filesystem::path>::value, basic_value<ordered_type_config> > parse <ordered_type_config, std::filesystem::path>(const std::filesystem::path&, spec);
#endif // filesystem
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_COMPILE_SOURCES

4
include/toml11/result.hpp
View File

@@ -3,6 +3,7 @@
#include "compat.hpp"
#include "exception.hpp"
#include "version.hpp"
#include <ostream>
#include <string>
@@ -13,6 +14,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
struct bad_result_access final : public ::toml::exception
{
@@ -482,5 +485,6 @@ inline failure<detail::none_t> err() noexcept
return failure<detail::none_t>(detail::none_t{});
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_RESULT_HPP

7
include/toml11/serializer.hpp
View File

@@ -10,6 +10,7 @@
#include "types.hpp"
#include "utility.hpp"
#include "value.hpp"
#include "version.hpp"
#include <iomanip>
#include <iterator>
@@ -20,6 +21,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
struct serialization_error final : public ::toml::exception
{
@@ -1233,11 +1236,14 @@ std::ostream& operator<<(std::ostream& os, const basic_value<TC>& v)
return os;
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#if defined(TOML11_COMPILE_SOURCES)
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
struct type_config;
struct ordered_type_config;
@@ -1268,6 +1274,7 @@ namespace detail
extern template class serializer<::toml::type_config>;
extern template class serializer<::toml::ordered_type_config>;
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_COMPILE_SOURCES

7
include/toml11/skip.hpp
View File

@@ -6,11 +6,14 @@
#include "scanner.hpp"
#include "syntax.hpp"
#include "types.hpp"
#include "version.hpp"
#include <cassert>
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -353,11 +356,14 @@ void skip_until_next_table(location& loc, const context<TC>& ctx)
}
} // namespace detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#if defined(TOML11_COMPILE_SOURCES)
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
struct type_config;
struct ordered_type_config;
@@ -386,6 +392,7 @@ extern template void skip_key_value_pair <ordered_type_config>(location&
extern template void skip_until_next_table <ordered_type_config>(location& loc, const context<ordered_type_config>&);
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_COMPILE_SOURCES

5
include/toml11/spec.hpp
View File

@@ -9,8 +9,12 @@
#include <cstdint>
#include "version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
struct semantic_version
{
@@ -165,5 +169,6 @@ inline bool operator>=(const spec& lhs, const spec& rhs) noexcept
return detail::to_tuple(lhs) >= detail::to_tuple(rhs);
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#endif // TOML11_SPEC_HPP

4
include/toml11/storage.hpp
View File

@@ -2,9 +2,12 @@
#define TOML11_STORAGE_HPP
#include "compat.hpp"
#include "version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -45,5 +48,6 @@ struct storage
};
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_STORAGE_HPP

6
include/toml11/traits.hpp
View File

@@ -4,6 +4,7 @@
#include "from.hpp"
#include "into.hpp"
#include "compat.hpp"
#include "version.hpp"
#include <array>
#include <chrono>
@@ -24,6 +25,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
template<typename TypeConcig>
class basic_value;
@@ -262,5 +265,6 @@ template<typename T>
using is_basic_value = is_basic_value_impl<cxx::remove_cvref_t<T>>;
}// detail
}//toml
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_TRAITS_HPP

7
include/toml11/types.hpp
View File

@@ -7,6 +7,7 @@
#include "format.hpp"
#include "ordered_map.hpp"
#include "value.hpp"
#include "version.hpp"
#include <ostream>
#include <sstream>
@@ -20,6 +21,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
// forward decl
template<typename TypeConfig>
@@ -361,13 +364,17 @@ using is_type_config = cxx::conjunction<
>;
} // namespace detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#if defined(TOML11_COMPILE_SOURCES)
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
extern template class basic_value<type_config>;
extern template class basic_value<ordered_type_config>;
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_COMPILE_SOURCES

4
include/toml11/utility.hpp
View File

@@ -3,6 +3,7 @@
#include "result.hpp"
#include "traits.hpp"
#include "version.hpp"
#include <array>
#include <sstream>
@@ -13,6 +14,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -166,5 +169,6 @@ string_conv(const char (&s)[N])
}
} // namespace detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#endif // TOML11_UTILITY_HPP

3
include/toml11/value.hpp
View File

@@ -25,6 +25,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
template<typename TypeConfig>
class basic_value;
@@ -2506,5 +2508,6 @@ void unset_access_flag_recursively(basic_value<TC>& v)
#endif
} // namespace detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // namespace toml
#endif // TOML11_VALUE_HPP

22
include/toml11/version.hpp
View File

@@ -9,6 +9,25 @@
# error "__cplusplus is not defined"
#endif
/*
* Defines a name for an inline namespace that includes the current version
* number. This becomes necessary if multiple software packages use toml11 as an
* internal build-time dependency, since multiple packages will in general not
* use the same version of toml11. An inline namespace with a version number
* ensures that the symbols emitted by compiling toml11 into downstream
* applications will be distinguished by the specific used version of toml11,
* making it possible to link multiple packages that internally use toml11 in
* different versions.
*/
#define TOML11_CONCAT(a, b, c, d, e, f) a##b##c##d##e##f
#define TOML11_GENERATE_INLINE_VERSION_NAMESPACE(major, minor, patch) \
TOML11_CONCAT(toml11_, major, _, minor, _, patch)
#define TOML11_INLINE_VERSION_NAMESPACE \
TOML11_GENERATE_INLINE_VERSION_NAMESPACE( \
TOML11_VERSION_MAJOR, TOML11_VERSION_MINOR, TOML11_VERSION_PATCH)
// Since MSVC does not define `__cplusplus` correctly unless you pass
// `/Zc:__cplusplus` when compiling, the workaround macros are added.
//
@@ -91,6 +110,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
inline const char* license_notice() noexcept
{
@@ -117,5 +138,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.)";
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_VERSION_HPP

4
include/toml11/visit.hpp
View File

@@ -4,9 +4,12 @@
#include "exception.hpp"
#include "traits.hpp"
#include "value.hpp"
#include "version.hpp"
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -132,5 +135,6 @@ visit(Visitor&& visitor, Args&& ... args)
return detail::visit_impl(std::forward<Visitor>(visitor), std::forward<Args>(args)...);
}
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif // TOML11_VISIT_HPP

3
include/toml_fwd.hpp
View File

@@ -19,6 +19,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
class discard_comments;
class preserve_comments;
@@ -84,5 +86,6 @@ using ordered_value = basic_value<ordered_type_config>;
enum class value_t : std::uint8_t;
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml
#endif// TOML11_TOML_HPP

4
src/context.cpp
View File

@@ -1,5 +1,6 @@
#include <toml11/context.hpp>
#include <toml11/types.hpp>
#include <toml11/version.hpp>
#if ! defined(TOML11_COMPILE_SOURCES)
#error "Define `TOML11_COMPILE_SOURCES` before compiling source code!"
@@ -7,9 +8,12 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
template class context<::toml::type_config>;
template class context<::toml::ordered_type_config>;
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml

4
src/parser.cpp
View File

@@ -1,5 +1,6 @@
#include <toml11/parser.hpp>
#include <toml11/types.hpp>
#include <toml11/version.hpp>
#if ! defined(TOML11_COMPILE_SOURCES)
#error "Define `TOML11_COMPILE_SOURCES` before compiling source code!"
@@ -7,6 +8,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
template result<basic_value<type_config>, std::vector<error_info>> try_parse<type_config>(std::vector<unsigned char>, std::string, spec);
template result<basic_value<type_config>, std::vector<error_info>> try_parse<type_config>(std::istream&, std::string, spec);
@@ -39,4 +42,5 @@ template cxx::enable_if_t<std::is_same<std::filesystem::path, std::filesystem::p
template cxx::enable_if_t<std::is_same<std::filesystem::path, std::filesystem::path>::value, basic_value<ordered_type_config> > parse <ordered_type_config, std::filesystem::path>(const std::filesystem::path&, spec);
#endif // filesystem
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml

4
src/serializer.cpp
View File

@@ -1,5 +1,6 @@
#include <toml11/serializer.hpp>
#include <toml11/types.hpp>
#include <toml11/version.hpp>
#if ! defined(TOML11_COMPILE_SOURCES)
#error "Define `TOML11_COMPILE_SOURCES` before compiling source code!"
@@ -7,6 +8,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
struct type_config;
struct ordered_type_config;
@@ -37,4 +40,5 @@ namespace detail
template class serializer<::toml::type_config>;
template class serializer<::toml::ordered_type_config>;
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml

4
src/skip.cpp
View File

@@ -1,6 +1,7 @@
#include <toml11/parser.hpp>
#include <toml11/skip.hpp>
#include <toml11/types.hpp>
#include <toml11/version.hpp>
#if ! defined(TOML11_COMPILE_SOURCES)
#error "Define `TOML11_COMPILE_SOURCES` before compiling source code!"
@@ -8,6 +9,8 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
namespace detail
{
@@ -34,4 +37,5 @@ template void skip_key_value_pair <ordered_type_config>(location& loc, co
template void skip_until_next_table <ordered_type_config>(location& loc, const context<ordered_type_config>&);
} // detail
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml

4
src/types.cpp
View File

@@ -1,5 +1,6 @@
#include <toml11/value.hpp>
#include <toml11/types.hpp>
#include <toml11/version.hpp>
#if ! defined(TOML11_COMPILE_SOURCES)
#error "Define `TOML11_COMPILE_SOURCES` before compiling source code!"
@@ -7,6 +8,9 @@
namespace toml
{
inline namespace TOML11_INLINE_VERSION_NAMESPACE
{
template class basic_value<type_config>;
template class basic_value<ordered_type_config>;
} // TOML11_INLINE_VERSION_NAMESPACE
} // toml