[simspark-cvs] simspark/spark/utility/tinyxml Makefile.am, 1.2, 1.3 xmlfunctions.cpp, 1.1, 1.2

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/utility/tinyxml
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/utility/tinyxml

Modified Files:
	Makefile.am xmlfunctions.cpp 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/utility/tinyxml/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	18 Feb 2006 19:33:59 -0000	1.2
--- Makefile.am	15 Mar 2007 07:26:30 -0000	1.3
***************
*** 2,10 ****
  
  libtinyxml_la_SOURCES = \
! 	tinystr.cpp\
! 	tinyxml.cpp\
! 	tinyxmlerror.cpp\
! 	tinyxmlparser.cpp\
! 	xmlfunctions.cpp
  
  
--- 2,13 ----
  
  libtinyxml_la_SOURCES = \
! 	tinystr.cpp \
! 	tinyxml.cpp \
! 	tinyxmlerror.cpp \
! 	tinyxmlparser.cpp \
! 	xmlfunctions.cpp \
! 	tinystr.h \
! 	tinyxml.h \
! 	xmlfunctions.h
  
  

Index: xmlfunctions.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/utility/tinyxml/xmlfunctions.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xmlfunctions.cpp	18 Feb 2006 19:33:59 -0000	1.1
--- xmlfunctions.cpp	15 Mar 2007 07:26:30 -0000	1.2
***************
*** 70,74 ****
      double d;
      bool ok = GetXMLAttribute(element, attrName, d);
!     f = d;
      return ok;
  }
--- 70,74 ----
      double d;
      bool ok = GetXMLAttribute(element, attrName, d);
!     f = static_cast<float>(d);
      return ok;
  }