commit 93a8fb18ea548e879d8963c834c0690ada532297
author Lee Thomason <leethomason@gmail.com> Fri Jun 29 15:53:32 2018 -0700
committer Lee Thomason <leethomason@gmail.com> Fri Jun 29 15:53:32 2018 -0700
tree 903e135ac35bc5796d03696f2fc9efaed4b216bd
parent 9f14aca07f4e3ac04f2e32929a169f39441d6f68
parent 92fc089e174bdcad8f0e67865d8365e96551487f

Merge branch 'issue647'

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1bba29..c40cc15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,5 +122,5 @@
         ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake

         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})

 

-install(EXPORT ${CMAKE_PROJECT_NAME}Targets

+install(EXPORT ${CMAKE_PROJECT_NAME}Targets NAMESPACE tinyxml2::

         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})

tinyxml2.h

diff --git a/tinyxml2.h b/tinyxml2.h
index 2a0e0bf..950c2da 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -1624,11 +1624,7 @@
     XMLElement( const XMLElement& );	// not supported

     void operator=( const XMLElement& );	// not supported

 

-    XMLAttribute* FindAttribute( const char* name ) {

-        return const_cast<XMLAttribute*>(const_cast<const XMLElement*>(this)->FindAttribute( name ));

-    }

     XMLAttribute* FindOrCreateAttribute( const char* name );

-    //void LinkAttribute( XMLAttribute* attrib );

     char* ParseAttributes( char* p, int* curLineNumPtr );

     static void DeleteAttribute( XMLAttribute* attribute );

     XMLAttribute* CreateAttribute();