Skip to content

Revert "Tinyxml2 fix leaking consts" #123

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

Merged
merged 1 commit into from
Feb 21, 2025
Merged

Revert "Tinyxml2 fix leaking consts" #123

Show file tree
Hide file tree
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
25 changes: 0 additions & 25 deletions External/tinyxml2.README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,6 @@ The following files have been copied to `External/tinyxml2`:
- `LICENSE.txt`
- `readme.txt`

### Applied the following patch to hide leaking consts

```
diff --git a/External/tinyxml2/tinyxml2.cpp b/External/tinyxml2/tinyxml2.cpp
index 083f54b..db7b53b 100644
--- a/External/tinyxml2/tinyxml2.cpp
+++ b/External/tinyxml2/tinyxml2.cpp
@@ -119,6 +119,8 @@ distribution.
#define TIXML_FTELL ftell
#endif

+namespace
+{

static const char LINE_FEED = static_cast<char>(0x0a); // all line endings are normalized to LF
static const char LF = LINE_FEED;
@@ -135,6 +137,8 @@ static const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;

+}
+
namespace tinyxml2
{
```
## Usage
`tinyxml2` is referenced by source and built together with the target.

Expand Down
4 changes: 0 additions & 4 deletions External/tinyxml2/tinyxml2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@ distribution.
#define TIXML_FTELL ftell
#endif

namespace
{

static const char LINE_FEED = static_cast<char>(0x0a); // all line endings are normalized to LF
static const char LF = LINE_FEED;
Expand All @@ -137,8 +135,6 @@ static const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;

}

namespace tinyxml2
{

Expand Down
Loading