Revision: 26451
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26451
Author: damien78
Date: 2010-01-30 20:41:32 +0100 (Sat, 30 Jan 2010)
Log Message:
-----------
OSX 10.5: update OpenCollada libs to rev 721
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=721
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/README
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABU.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUHashFunctions.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUURI.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUUtils.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/Math/COLLADABUMathVector3.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFW.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWAnimation.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWArray.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWCamera.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWColorOrTexture.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWEdge.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWEffect.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFormula.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWGeometry.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWILoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWImage.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceCamera.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceController.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceGeometry.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceLight.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceNode.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceSceneGraph.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceVisualScene.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWJoint.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWKinematicsController.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWKinematicsModel.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWLibraryNodes.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWLight.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWLinestrips.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMaterial.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitive.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMorphController.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWNode.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWObject.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWPolygons.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWRoot.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWSampler.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWScene.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWSkinControllerData.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWTexture.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWTriangles.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWTrifans.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWTristrips.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWTypes.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWUniqueId.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWVisualScene.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLDocumentProcessor.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLFileLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLFilePartLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLFormulasLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLGeometryLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLIFilePartLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLIParserImpl.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLInputUnshared.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLJointsLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLKinematicsIntermediateData.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLKinematicsSceneCreator.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryAnimationsLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryArticulatedSystemsLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryCamerasLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryControllersLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryEffectsLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryImagesLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryJointsLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryKinematicsModelsLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryLightsLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryMaterialsLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryNodesLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLMeshLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLNodeLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLRootParser14.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLRootParser15.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLSaxFWLError.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLSceneLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLSource.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLTypes.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLVersionParser.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLVertices.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLVisualSceneLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/generated14/COLLADASaxFWLColladaParserAutoGen14Private.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWEffectProfile.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWExtraTechnique.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWInstanceMaterial.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWLibraryGeometries.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWLibraryMaterials.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWStreamWriter.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWTechnique.h
trunk/lib/darwin-9.x.universal/opencollada/lib/libGeneratedSaxParser.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libMathMLSolver.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADABaseUtils.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAFramework.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAStreamWriter.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libUTF.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libpcre.a
Added Paths:
-----------
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceBase.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceBindingBase.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMaterialBinding.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWTextureCoordinateBinding.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLExtraDataElementHandler.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLExtraDataLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLIExtraDataCallbackHandler.h
trunk/lib/darwin-9.x.universal/opencollada/lib/libbuffer.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libftoa.a
Removed Paths:
-------------
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUHashMap.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWExtraData.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWExtraKeys.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWCharacterBuffer.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWFWriteBufferFlusher.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWIBufferFlusher.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWStreamWriter.h.orig
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWStreamWriter.h.rej
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWdtoa.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWftoa.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWitoa.h
Modified: trunk/lib/darwin-9.x.universal/README
===================================================================
--- trunk/lib/darwin-9.x.universal/README 2010-01-30 19:29:24 UTC (rev
26450)
+++ trunk/lib/darwin-9.x.universal/README 2010-01-30 19:41:32 UTC (rev
26451)
@@ -12,7 +12,6 @@
python (release3.1-maint)
release (python_??.zip)
tiff (version 3.9.1)
-opencollada (svn rev 641)
ppc64 missing:
openexr (version 1.4.0a)
@@ -23,8 +22,8 @@
lame (version 3.97)
xvidcore (version 1.2.2)
x264 (version 20090331)
+opencollada (svn rev 721)
-
The following configuration parameters were used to build the libs:
Tiff:
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABU.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABU.h
2010-01-30 19:29:24 UTC (rev 26450)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABU.h
2010-01-30 19:41:32 UTC (rev 26451)
@@ -17,7 +17,7 @@
#include "COLLADABU.h"
#include "COLLADABUException.h"
#include "COLLADABUHashFunctions.h"
-#include "COLLADABUHashMap.h"
+#include "COLLADABUhash_map.h"
#include "COLLADABUIDList.h"
#include "COLLADABUNativeString.h"
#include "COLLADABUPcreCompiledPattern.h"
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUHashFunctions.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUHashFunctions.h
2010-01-30 19:29:24 UTC (rev 26450)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUHashFunctions.h
2010-01-30 19:41:32 UTC (rev 26451)
@@ -1,34 +1,74 @@
-/*
- Copyright (c) 2008-2009 NetAllied Systems GmbH
-
- This file is part of COLLADABaseUtils.
-
- 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 __COLLADABU_HASHFUNCTIONS_H__
-#define __COLLADABU_HASHFUNCTIONS_H__
-
-#include "COLLADABUPrerequisites.h"
-
-
-
-namespace COLLADABU
-{
- class URI;
-
-
- unsigned long calculateHash(const String& str);
-
- unsigned long calculateHash(const char* str);
-
- unsigned long calculateHash(const URI& uri);
-
-
-
-
-} // namespace COLLADABU
-
-#endif // __COLLADABU_HASHFUNCTIONS_H__
+/*
+ Copyright (c) 2008-2009 NetAllied Systems GmbH
+
+ This file is part of COLLADABaseUtils.
+
+ 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 __COLLADABU_HASHFUNCTIONS_H__
+#define __COLLADABU_HASHFUNCTIONS_H__
+
+#include "COLLADABUPrerequisites.h"
+#include "COLLADABUhash_map.h"
+
+#ifdef COLLADABU_HAVE_TR1_UNORDERED_MAP
+//# include
+#else
+# ifdef COLLADABU_OS_LINUX
+# include <ext/hash_fun.h>
+# include "COLLADABUURI.h"
+# elif (defined COLLADABU_OS_MAC)
+# include <ext/hash_fun.h>
+# include "COLLADABUURI.h"
+# endif
+#endif
+
+namespace COLLADABU
+{
+ class URI;
+
+
+ size_t calculateHash(const String& str);
+
+ size_t calculateHash(const char* str);
+
+ size_t calculateHash(const URI& uri);
+ inline size_t calculateHashU(const URI& uri){
+ return calculateHash(uri);
+ }
+
+} // namespace COLLADABU
+
+#if defined(COLLADABU_HAVE_TR1_UNORDERED_MAP) || defined(COLLADABU_OS_LINUX)
|| defined(COLLADABU_OS_MAC)
+#if defined(COLLADABU_HAVE_TR1_UNORDERED_MAP)
+namespace std { namespace tr1
+#else
+namespace __gnu_cxx
+#endif
+{
+ template<>
+ struct hash<COLLADABU::URI>
+ {
+ size_t
+ operator()(const COLLADABU::URI& uri) const
+ { return COLLADABU::calculateHash(uri); }
+ };
+/*
+ template<>
+ struct hash<COLLADAFW::UniqueId>
+ {
+ size_t
+ operator()(const COLLADAFW::UniqueId& uniqueId) const {
return uniqueId; }
+ };
+*/
+#if defined(COLLADABU_HAVE_TR1_UNORDERED_MAP)
+}
+#endif
+} // namespace __gnu_cxx
+#endif
+
+
+#endif // __COLLADABU_HASHFUNCTIONS_H__
Deleted:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUHashMap.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUHashMap.h
2010-01-30 19:29:24 UTC (rev 26450)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUHashMap.h
2010-01-30 19:41:32 UTC (rev 26451)
@@ -1,119 +0,0 @@
-/*
- Copyright (c) 2008-2009 NetAllied Systems GmbH
-
- This file is part of COLLADABaseUtils.
-
- 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 __COLLADABU_HASHMAP_H__
-#define __COLLADABU_HASHMAP_H__
-
-#include "COLLADABUPrerequisites.h"
-
-#include <map>
-
-namespace COLLADABU
-{
- template<class KeyType, class ValueType, class HashType, HashType
(*calculateHash)(const KeyType& key)>
- class HashMap
- {
- private:
- struct HashValuePair
- {
- HashValuePair(const HashType& _hash, const KeyType&
_key ) : hash(_hash), key(_key){}
- HashType hash;
- KeyType key;
-
- bool operator<( const HashValuePair& rhs)const
- {
- if ( hash < rhs.hash )
- return true;
-
- if ( rhs.hash < hash )
- return false;
-
- if ( key < rhs.key )
- return true;
-
- if ( rhs.key < key )
- return false;
- return false;
- }
- };
-
-
- private:
-
- typedef std::map<HashValuePair, ValueType> Map;
-
- Map mMap;
-
-
- public:
- class const_iterator;
- class iterator
- {
- private:
- typename Map::iterator mIt;
- friend class const_iterator;
- public:
- iterator(typename Map::iterator it):mIt(it){}
- KeyType& first() { return mIt->first.key; }
- ValueType& second() { return mIt->second; }
-
- bool operator==(iterator other)const { return mIt ==
other.mIt; }
- bool operator==(const_iterator other)const { return mIt
== other.mIt; }
- };
-
- // typedef const iterator const_iterator;
-
- class const_iterator
- {
- private:
- typename Map::const_iterator mIt;
- friend class iterator;
- public:
- const_iterator(typename Map::const_iterator
it):mIt(it){}
- const KeyType& first() const { return mIt->first.key; }
- const ValueType& second() const { return mIt->second; }
- bool operator==(const_iterator other)const { return mIt
== other.mIt; }
- bool operator==(iterator other)const { return mIt ==
other.mIt; }
- };
- private:
- // HashMap(){}
- // virtual ~HashMap(){}
- public:
-
- ValueType& operator[](const KeyType& key);
-
- const ValueType& operator[](const KeyType& key)const;
-
- iterator find(const KeyType& key) {return
iterator(mMap.find(HashValuePair(calculateHash(key), key)) ); }
-
- const_iterator find(const KeyType& key) const{return
iterator(mMap.find(HashValuePair(calculateHash(key), key)) ); }
-
- const_iterator end()const { return const_iterator(mMap.end()); }
-
- };
-
- template<class KeyType, class ValueType, class HashType, HashType
(*calculateHash)(const KeyType& key)>
- ValueType& HashMap<KeyType, ValueType, HashType,
calculateHash>::operator[]( const KeyType& key )
- {
- return mMap[HashValuePair(calculateHash(key), key)];
- }
-
-
- template<class KeyType, class ValueType, class HashType, HashType
(*calculateHash)(const KeyType& key)>
- const ValueType& HashMap<KeyType, ValueType, HashType,
calculateHash>::operator[]( const KeyType& key ) const
- {
- return mMap[HashValuePair(calculateHash(key), key)];
- }
-
-
-
-} // namespace COLLADABU
-
-#endif // __COLLADABU_HASHMAP_H__
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUURI.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUURI.h
2010-01-30 19:29:24 UTC (rev 26450)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUURI.h
2010-01-30 19:41:32 UTC (rev 26451)
@@ -348,6 +348,9 @@
/* Comparison operator for use in maps.*/
bool operator<(const URI& rhs)const;
+ /** Conversion to size_t for usage in a hash map.*/
+ operator size_t() const;
+
private:
/**
Modified:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUUtils.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUUtils.h
2010-01-30 19:29:24 UTC (rev 26450)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUUtils.h
2010-01-30 19:41:32 UTC (rev 26451)
@@ -166,7 +166,7 @@
* @param String & separators
* @param std::vector<String> & words
*/
- static void split ( String& text, String& separators,
std::vector<String>& words );
+ static void split ( const String& text, const String& separators,
std::vector<String>& words );
};
Added:
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
===================================================================
---
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
(rev 0)
+++
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
2010-01-30 19:41:32 UTC (rev 26451)
@@ -0,0 +1,71 @@
+/*
+ Copyright (c) 2008-2009 NetAllied Systems GmbH
+
+ This file is part of COLLADABaseUtils.
+
+ 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 __COLLADABU_HASH_MAP_H__
+#define __COLLADABU_HASH_MAP_H__
+
+#include "COLLADABUPrerequisites.h"
+#include "COLLADABUPlatform.h"
+#define COLLADABU_HAVE_TR1_UNORDERED_MAP
+#ifndef WIN32
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+#undef COLLADABU_HAVE_TR1_UNORDERED_MAP
+#else
+ #include <tr1/unordered_map>
+ #include <tr1/unordered_set>
+#endif
+#else
+# undef COLLADABU_HAVE_TR1_UNORDERED_MAP
+# if defined(_MSC_VER) && (_MSC_VER >= 1500) \
+ && defined(_MSC_FULL_VER) && \
+ !defined(__SGI_STL_PORT) && \
+ !defined(_STLPORT_VERSION) && \
+ !defined(_RWSTD_VER_STR) && \
+ !defined(_RWSTD_VER)
+# define COLLADABU_HAVE_TR1_UNORDERED_MAP
+# include <unordered_map>
+# include <unordered_set>
+# endif
+#endif
+#ifndef COLLADABU_HAVE_TR1_UNORDERED_MAP
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
