potok/tinyxml2
1
0
Fork 0
Code Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into manydecs

Browse Source
This commit is contained in:
Lee Thomason
2018-08-05 17:33:11 -07:00
parent db13a82e62 baf8bc93a7
commit 92506ca698
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -29,7 +29,7 @@ set(GENERIC_LIB_SOVERSION "6")
################################ ################################
# Add targets # Add targets
# By Default shared libray is being built # By Default shared library is being built
# To build static libs also - Do cmake . -DBUILD_STATIC_LIBS:BOOL=ON # To build static libs also - Do cmake . -DBUILD_STATIC_LIBS:BOOL=ON
# User can choose not to build shared library by using cmake -DBUILD_SHARED_LIBS:BOOL=OFF # User can choose not to build shared library by using cmake -DBUILD_SHARED_LIBS:BOOL=OFF
# To build only static libs use cmake . -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_STATIC_LIBS:BOOL=ON # To build only static libs use cmake . -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_STATIC_LIBS:BOOL=ON

2
tinyxml2.h
View File

@@ -1833,7 +1833,7 @@ public:
/// A (trivial) utility function that prints the ErrorStr() to stdout. /// A (trivial) utility function that prints the ErrorStr() to stdout.
void PrintError() const; void PrintError() const;
/// Return the line where the error occured, or zero if unknown. /// Return the line where the error occurred, or zero if unknown.
int ErrorLineNum() const int ErrorLineNum() const
{ {
return _errorLineNum; return _errorLineNum;

2
xmltest.cpp
View File

@@ -1967,7 +1967,7 @@ int main( int argc, const char ** argv )
{ {
// No matter - before or after successfully parsing a text - // No matter - before or after successfully parsing a text -
// calling XMLDocument::Value() used to cause an assert in debug. // calling XMLDocument::Value() used to cause an assert in debug.
// Null must be retured. // Null must be returned.
const char* validXml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" const char* validXml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"
"<first />" "<first />"
"<second />"; "<second />";