[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61384] trunk/lib/ darwin-9.x.universal: OSX: update osl/llvm/oiio complex: remove llvm 3.1

[jens verwiebe]

Revision: 61384
          https://developer.blender.org/rBL61384
Author:   jensverwiebe
Date:     2014-07-25 08:20:17 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
OSX: update osl/llvm/oiio complex: remove llvm 3.1

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/README
    trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitiveWithFaceVertexCount.h

Removed Paths:
-------------
    trunk/lib/darwin-9.x.universal/llvm/

Modified: trunk/lib/darwin-9.x.universal/README
===================================================================
--- trunk/lib/darwin-9.x.universal/README	2014-07-25 08:16:06 UTC (rev 61383)
+++ trunk/lib/darwin-9.x.universal/README	2014-07-25 08:20:17 UTC (rev 61384)
@@ -223,7 +223,7 @@
 export FFLAGS=-ff2c
 export CXX=clang++
 export CC=clang
-CXXFLAGS=-mmacosx-version-min=10.6
+export CXXFLAGS=-mmacosx-version-min=10.6
 export CFLAGS=-mmacosx-version-min=10.6
 export LDFLAGS=-mmacosx-version-min=10.6
 python3 setup.py build

Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitiveWithFaceVertexCount.h	2014-07-25 08:16:06 UTC (rev 61383)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitiveWithFaceVertexCount.h	2014-07-25 08:20:17 UTC (rev 61384)
@@ -6,18 +6,18 @@
     Licensed under the MIT Open Source License, 
     for details please see LICENSE file or the website
     http://www.opensource.org/licenses/mit-license.php
-*/
-
-#ifndef __COLLADAFW_MESHPRIMITIVEWITHFACEVERTEXCOUNT_H__
-#define __COLLADAFW_MESHPRIMITIVEWITHFACEVERTEXCOUNT_H__
-
-#include "COLLADAFWPrerequisites.h"
-#include "COLLADAFWMeshPrimitive.h"
-
-namespace COLLADAFW
-{
-
-    /**
+*/
+
+#ifndef __COLLADAFW_MESHPRIMITIVEWITHFACEVERTEXCOUNT_H__
+#define __COLLADAFW_MESHPRIMITIVEWITHFACEVERTEXCOUNT_H__
+
+#include "COLLADAFWPrerequisites.h"
+#include "COLLADAFWMeshPrimitive.h"
+
+namespace COLLADAFW
+{
+
+    /**
     Geometric primitives, which assemble values from the inputs into vertex attribute data. 
     Can be any combination of any primitive types in any order. 
 
@@ -30,56 +30,56 @@
     For texture coordinates, COLLADA\x92s right-handed coordinate system applies; therefore, an ST 
     texture coordinate of [0,0] maps to the lower-left texel of a texture image, when loaded in a 
     professional 2-D texture viewer/editor.
-    */
-	template<class VertexCountType>
-	class MeshPrimitiveWithFaceVertexCount : public MeshPrimitive
-    {
-
-    public:
-		typedef ArrayPrimitiveType<VertexCountType> VertexCountArray;
-
-    private:
+    */
+	template<class VertexCountType>
+	class MeshPrimitiveWithFaceVertexCount : public MeshPrimitive
+    {
+
+    public:
+		typedef ArrayPrimitiveType<VertexCountType> VertexCountArray;
+
+    private:
         /**
          * Contains a list of integers, each specifying the number of vertices for one 
          * - polygon face 
-         * - hole
-         * - tristrip or trifan
-         * element.
-         */
-        VertexCountArray mGroupedVerticesVertexCountArray;
-
+         * - hole
+         * - tristrip or trifan
+         * element.
+         */
+        VertexCountArray mGroupedVerticesVertexCountArray;
+
     protected:
 
-        /**
-        * Constructor.
-        */
+        /**
+        * Constructor.
+        */
 		MeshPrimitiveWithFaceVertexCount ( const UniqueId& uniqueId, PrimitiveType primitiveType ) 
             : MeshPrimitive ( uniqueId, primitiveType )
      		, mGroupedVerticesVertexCountArray(VertexCountArray::OWNER) 
         {}
-
-	public:	
 
-        /**
-        * Destructor.
-        */
-        virtual ~MeshPrimitiveWithFaceVertexCount() {}
-
+	public:	
+
         /**
+        * Destructor.
+        */
+        virtual ~MeshPrimitiveWithFaceVertexCount() {}
+
+        /**
         * Contains a list of integers, each specifying the number of vertices for one polygon face.
-        */
+        */
         VertexCountArray& getGroupedVerticesVertexCountArray () { return mGroupedVerticesVertexCountArray; }
 
         /**
         * Contains a list of integers, each specifying the number of vertices for one polygon face.
-        */
+        */
         const VertexCountArray& getGroupedVerticesVertexCountArray () const { return mGroupedVerticesVertexCountArray; }
 
         /**
         * Contains a list of integers, each specifying the number of vertices for one polygon face.
-        */
+        */
         void setGroupedVerticesVertexCountArray ( const VertexCountArray& FaceVertexCountArray ) { mGroupedVerticesVertexCountArray = FaceVertexCountArray; }
-
+
         /*
         *	Returns the vertex count of the face on the specified index position.
         */
@@ -88,7 +88,7 @@
             if ( faceIndex >= mGroupedVerticesVertexCountArray.getCount () ) 
             {
                 std::cerr << "Face index out of range: " << faceIndex << std::endl;
-				COLLADABU_ASSERT ( "Face index out of range: " + faceIndex );
+				COLLADABU_ASSERT ( &"Face index out of range: " [ faceIndex ] );
                 return -1;
             }
 
@@ -95,9 +95,9 @@
             return mGroupedVerticesVertexCountArray [ faceIndex ];
         }
 
-    };
-
-
-}
-
-#endif // __COLLADAFW_MESHPRIMITIVEWITHFACEVERTEXCOUNT_H__
+    };
+
+
+}
+
+#endif // __COLLADAFW_MESHPRIMITIVEWITHFACEVERTEXCOUNT_H__