Skip to content

Commit d9804ec

Browse files
authored
Revert "Tinyxml2 fix leaking consts (#122)" (#123)
This reverts commit ac4e25f.
1 parent ac4e25f commit d9804ec

File tree

2 files changed

+0
-29
lines changed

2 files changed

+0
-29
lines changed

External/tinyxml2.README.md

-25
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,6 @@ The following files have been copied to `External/tinyxml2`:
1414
- `LICENSE.txt`
1515
- `readme.txt`
1616

17-
### Applied the following patch to hide leaking consts
18-
19-
```
20-
diff --git a/External/tinyxml2/tinyxml2.cpp b/External/tinyxml2/tinyxml2.cpp
21-
index 083f54b..db7b53b 100644
22-
--- a/External/tinyxml2/tinyxml2.cpp
23-
+++ b/External/tinyxml2/tinyxml2.cpp
24-
@@ -119,6 +119,8 @@ distribution.
25-
#define TIXML_FTELL ftell
26-
#endif
27-
28-
+namespace
29-
+{
30-
31-
static const char LINE_FEED = static_cast<char>(0x0a); // all line endings are normalized to LF
32-
static const char LF = LINE_FEED;
33-
@@ -135,6 +137,8 @@ static const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
34-
static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
35-
static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
36-
37-
+}
38-
+
39-
namespace tinyxml2
40-
{
41-
```
4217
## Usage
4318
`tinyxml2` is referenced by source and built together with the target.
4419

External/tinyxml2/tinyxml2.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ distribution.
119119
#define TIXML_FTELL ftell
120120
#endif
121121

122-
namespace
123-
{
124122

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

140-
}
141-
142138
namespace tinyxml2
143139
{
144140

0 commit comments

Comments
 (0)