Skip to content

Commit

Permalink
add C++20 module
Browse files Browse the repository at this point in the history
  • Loading branch information
Arthapz committed Oct 28, 2024
1 parent 374292e commit 623e108
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 4 deletions.
69 changes: 69 additions & 0 deletions tinyxml2.cppm
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*
Original code by Lee Thomason (www.grinninglizard.com)
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any
damages arising from the use of this software.
Permission is granted to anyone to use this software for any
purpose, including commercial applications, and to alter it and
redistribute it freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must
not claim that you wrote the original software. If you use this
software in a product, an acknowledgment in the product documentation
would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and
must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
*/

module;

#include <tinyxml2.h>

export module tinyxml2;

export using ::TIXML2_MAJOR_VERSION;
export using ::TIXML2_MINOR_VERSION;
export using ::TIXML2_PATCH_VERSION;

#pragma push_macro("TINYXML2_MAJOR_VERSION")
#undef TINYXML2_MAJOR_VERSION
export inline constexpr auto TINYXML2_MAJOR_VERSION =
#pragma pop_macro("TINYXML2_MAJOR_VERSION")
TINYXML2_MAJOR_VERSION;

#pragma push_macro("TINYXML2_MINOR_VERSION")
#undef TINYXML2_MINOR_VERSION
export inline constexpr auto TINYXML2_MINOR_VERSION =
#pragma pop_macro("TINYXML2_MINOR_VERSION")
TINYXML2_MINOR_VERSION;

#pragma push_macro("TINYXML2_PATCH_VERSION")
#undef TINYXML2_PATCH_VERSION
export inline constexpr auto TINYXML2_PATCH_VERSION =
#pragma pop_macro("TINYXML2_PATCH_VERSION")
TINYXML2_PATCH_VERSION;

export namespace tinyxml2 {
using tinyxml2::Whitespace;
using tinyxml2::XMLAttribute;
using tinyxml2::XMLComment;
using tinyxml2::XMLConstHandle;
using tinyxml2::XMLDeclaration;
using tinyxml2::XMLDocument;
using tinyxml2::XMLElement;
using tinyxml2::XMLError;
using tinyxml2::XMLHandle;
using tinyxml2::XMLNode;
using tinyxml2::XMLPrinter;
using tinyxml2::XMLText;
using tinyxml2::XMLUnknown;
using tinyxml2::XMLUtil;
using tinyxml2::XMLVisitor;
using tinyxml2::DynArray;
} // namespace tinyxml2
17 changes: 13 additions & 4 deletions tinyxml2.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,21 @@ distribution.
#endif
#endif

#if defined(__cplusplus) && __cplusplus >= 201703L
#define TINYXML2_CPP17_CONSTANT inline constexpr
#elif defined(__cplusplus) && __cplusplus >= 201103L
#define TINYXML2_CPP17_CONSTANT static constexpr
#else
#define TINYXML2_CPP17_CONSTANT static const
#endif


/* Versioning, past 1.0.14:
http://semver.org/
*/
static const int TIXML2_MAJOR_VERSION = 10;
static const int TIXML2_MINOR_VERSION = 0;
static const int TIXML2_PATCH_VERSION = 0;
TINYXML2_CPP17_CONSTANT int TIXML2_MAJOR_VERSION = 10;
TINYXML2_CPP17_CONSTANT int TIXML2_MINOR_VERSION = 0;
TINYXML2_CPP17_CONSTANT int TIXML2_PATCH_VERSION = 0;

#define TINYXML2_MAJOR_VERSION 10
#define TINYXML2_MINOR_VERSION 0
Expand All @@ -109,7 +118,7 @@ static const int TIXML2_PATCH_VERSION = 0;
// system, and the capacity of the stack. On the other hand, it's a trivial
// attack that can result from ill, malicious, or even correctly formed XML,
// so there needs to be a limit in place.
static const int TINYXML2_MAX_ELEMENT_DEPTH = 500;
TINYXML2_CPP17_CONSTANT int TINYXML2_MAX_ELEMENT_DEPTH = 500;

namespace tinyxml2
{
Expand Down

0 comments on commit 623e108

Please sign in to comment.