[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44885] trunk/lib/darwin-9.x.universal/ opencollada/include/COLLADAStreamWriter: compilefix in collada for gcc-4. 7 and CLANG

jens verwiebe info at jensverwiebe.de
Thu Mar 15 00:38:57 CET 2012


Revision: 44885
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44885
Author:   jensverwiebe
Date:     2012-03-14 23:38:57 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
compilefix in collada for gcc-4.7 and CLANG

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWAnnotation.h
    trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWParamTemplate.h

Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWAnnotation.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWAnnotation.h	2012-03-14 22:57:15 UTC (rev 44884)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWAnnotation.h	2012-03-14 23:38:57 UTC (rev 44885)
@@ -219,7 +219,7 @@
         void add ( 
             const String &name, 
             const ValueType::ColladaType &type, 
-            const T val ) const
+            const T val )
         {
             openAnnotation ( name );
             openValuesElement ( type );

Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWParamTemplate.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWParamTemplate.h	2012-03-14 22:57:15 UTC (rev 44884)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWParamTemplate.h	2012-03-14 23:38:57 UTC (rev 44885)
@@ -93,7 +93,7 @@
     private:
 
         /** Returns the modifier as string. */
-        String& getModifierString ( const Modifier& modifier )
+        const String& getModifierString ( const Modifier& modifier )
         {
             switch ( modifier )
             {




More information about the Bf-blender-cvs mailing list