Description: Update for new 3.2 version of libcerces-c Author: William Blough Last-Update: 2018-10-18 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,7 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") elseif (NOT CMAKE_VERSION VERSION_LESS "3.1") set (CMAKE_C_STANDARD_REQUIRED TRUE) set (CMAKE_C_STANDARD "99") --- a/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp +++ b/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp @@ -130,7 +130,7 @@ processElement(childNode->ToElement()); break; case TiXmlNode::CEGUI_TINYXML_TEXT: - if (childNode->ToText()->Value() != '\0') + if (childNode->ToText()->Value() != nullptr) d_handler->text((encoded_char*)childNode->ToText()->Value()); break; --- a/cegui/src/XMLParserModules/RapidXML/XMLParser.cpp +++ b/cegui/src/XMLParserModules/RapidXML/XMLParser.cpp @@ -144,7 +144,7 @@ break; case rapidxml::node_data: - if (childNode->value() != '\0') + if (childNode->value() != nullptr) d_handler->text( reinterpret_cast(childNode->value()));