Merge branch 'master' into int64support

2016-07-17 21:37:39 -07:00
parent 1889c3e679 098bd1f17a
commit 536a4cde37
4 changed files with 20 additions and 10 deletions
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -1987,10 +1987,12 @@ struct LongFitsIntoSizeTMinusOne {
 };

 template <>
-bool LongFitsIntoSizeTMinusOne<false>::Fits( unsigned long /*value*/ )
-{
-    return true;
-}
+struct LongFitsIntoSizeTMinusOne<false> {
+    static bool Fits( unsigned long )
+    {
+        return true;
+    }
+};

 XMLError XMLDocument::LoadFile( FILE* fp )
 {