Skip to content

Mark project constants depending on C++ version #1056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −4
Open

Mark project constants depending on C++ version #1056

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions tinyxml2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,20 @@ distribution.
#endif
#endif

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

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

#define TINYXML2_MAJOR_VERSION 11
#define TINYXML2_MINOR_VERSION 0
Expand All @@ -109,7 +117,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_CONSTANT int TINYXML2_MAX_ELEMENT_DEPTH = 500;

namespace tinyxml2
{
Expand Down