Fixed compiling on Linux Mint 16

scott-wilson · johnhaddon · commit 0b8ed20e54f2 · 2014-03-06T16:37:06.000Z
I had to delete a lot of code that was defined but not used, and
probably broke something in the process. I don't know exactly where to
begin testing to make sure I didn't break anything, so any feedback
would be appreciated. Otherwise, Cortex *seems* to compile fine on my
machine.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@ test/IECoreRI/resultsPython.txt
 test/IECoreMaya/resultsPython.txt
 test/IECoreNuke/resultsPython.txt
 test/IECoreHoudini/resultsPython.txt
+/.ubuntu
diff --git a/include/IECore/BoxOps.inl b/include/IECore/BoxOps.inl
@@ -218,7 +218,6 @@ bool boxIntersects(
 	const char middle = 2;
 
 	typedef typename BoxTraits<T>::BaseType Vec;
-	typedef typename VectorTraits<Vec>::BaseType Real;
 
 	Vec minB = BoxTraits<T>::min( box );
 	Vec maxB = BoxTraits<T>::max( box );
diff --git a/include/IECore/TriangleAlgo.inl b/include/IECore/TriangleAlgo.inl
@@ -330,8 +330,6 @@ Vec triangleClosestPoint( const Vec &v0, const Vec &v1, const Vec &v2, const Vec
 template<class Vec>
 int triangleBarycentricFeature( const Vec &barycentric, typename VectorTraits<Vec>::BaseType tolerance )
 {
-	typedef typename VectorTraits<Vec>::BaseType Real;
-
 	bool bx = VectorTraits<Vec>::get( barycentric, 0 ) > tolerance;
 	bool by = VectorTraits<Vec>::get( barycentric, 1 ) > tolerance;
 	bool bz = VectorTraits<Vec>::get( barycentric, 2 ) > tolerance;
diff --git a/include/IECorePython/VectorTypedDataBinding.inl b/include/IECorePython/VectorTypedDataBinding.inl
@@ -662,8 +662,6 @@ std::string str<TypedData<std::vector<TYPE> > >( TypedData<std::vector<TYPE> > &
 
 /// \todo Get rid of these macros
 #define BASIC_VECTOR_BINDING(ThisClass, Tname)																	\
-		typedef IECore::IntrusivePtr< ThisClass > ThisClassPtr;														\
-		typedef IECore::IntrusivePtr< const ThisClass > ThisConstClassPtr;											\
 		typedef VectorTypedDataFunctions< ThisClass > ThisBinder;												\
 																													\
 		RunTimeTypedClass<ThisClass>(																							\
diff --git a/src/IECore/CurveTangentsOp.cpp b/src/IECore/CurveTangentsOp.cpp
@@ -87,7 +87,6 @@ struct CurveTangentsOp::CalculateTangents
 	ReturnType operator()( T * data )
 	{
 		typedef typename T::ValueType VecContainer;
-		typedef typename VecContainer::value_type Vec;
 
 		const VecContainer &points = data->readable();
 		
diff --git a/src/IECore/FaceAreaOp.cpp b/src/IECore/FaceAreaOp.cpp
@@ -127,7 +127,6 @@ void FaceAreaOp::modifyTypedPrimitive( MeshPrimitive * mesh, const CompoundObjec
 		PolygonIterator faceEnd = mesh->faceEnd();
 		for( PolygonIterator pIt = mesh->faceBegin(); pIt!=faceEnd; pIt++ )
 		{
-			typedef vector<V3f> PointVector;
 			areas.push_back( polygonArea( pIt.vertexBegin( p.begin() ), pIt.vertexEnd( p.begin() ) ) );
 		}
 
diff --git a/src/IECore/ImagePremultiplyOp.cpp b/src/IECore/ImagePremultiplyOp.cpp
@@ -96,7 +96,6 @@ struct ImagePremultiplyOp::PremultFn
 	{
 		typedef typename T::ValueType Container;
 		typedef typename Container::value_type ValueType;
-		typedef typename Container::iterator Iterator;
 
 		ScaledDataConversion< ValueType, float > toFloat;
 		ScaledDataConversion< float, ValueType > fromFloat;
diff --git a/src/IECore/ImageUnpremultiplyOp.cpp b/src/IECore/ImageUnpremultiplyOp.cpp
@@ -96,7 +96,6 @@ struct ImageUnpremultiplyOp::UnpremultFn
 	{
 		typedef typename T::ValueType Container;
 		typedef typename Container::value_type ValueType;
-		typedef typename Container::iterator Iterator;
 
 		ScaledDataConversion< ValueType, float > toFloat;
 		ScaledDataConversion< float, ValueType > fromFloat;
diff --git a/src/IECore/MeshPrimitiveImplicitSurfaceOp.cpp b/src/IECore/MeshPrimitiveImplicitSurfaceOp.cpp
@@ -243,6 +243,10 @@ void MeshPrimitiveImplicitSurfaceOp::modifyTypedPrimitive( MeshPrimitive * typed
 
 
 	V3i resolution;
+	resolution.x = 0;
+	resolution.y = 0;
+	resolution.z = 0;
+
 	int gridMethod = m_gridMethodParameter->getNumericValue();
 	if ( gridMethod == Resolution )
 	{
diff --git a/src/IECore/SummedAreaOp.cpp b/src/IECore/SummedAreaOp.cpp
@@ -65,7 +65,6 @@ struct SummedAreaOp::SumArea
 	{
 		typedef typename T::ValueType Container;
 		typedef typename Container::value_type V;
-		typedef typename Container::iterator It;
 
 		Container &buffer = data->writable();
 
diff --git a/src/IECore/WarpOp.cpp b/src/IECore/WarpOp.cpp
@@ -157,7 +157,6 @@ struct WarpOp::Warp
 	{
 		typedef typename T::ValueType Container;
 		typedef typename Container::value_type V;
-		typedef typename Container::iterator It;
 		typename T::Ptr inData = data->copy();
 		const Container &inBuffer = inData->readable();
 		unsigned int outputWidth = m_outputDataWindow.size().x + 1;
diff --git a/src/IECorePython/InterpolatedCacheBinding.cpp b/src/IECorePython/InterpolatedCacheBinding.cpp
@@ -158,8 +158,6 @@ struct InterpolatedCacheHelper
 
 void bindInterpolatedCache()
 {
-	typedef class_< InterpolatedCache, InterpolatedCachePtr > InterpolatedCachePyClass;
-
 	RefCountedClass<InterpolatedCache, RefCounted> interpolatedCacheClass( "InterpolatedCache" );
 	{
 		// define enum before functions.
diff --git a/src/IECorePython/RadixSortBinding.cpp b/src/IECorePython/RadixSortBinding.cpp
@@ -60,8 +60,6 @@ struct RadixSortWrapper : public RadixSort
 
 void bindRadixSort()
 {
-	typedef class_< RadixSortWrapper, boost::noncopyable> MeshPrimitiveEvaluatorPyClass;
-
 	class_< RadixSortWrapper, boost::noncopyable>( "RadixSort", no_init )
 		.def( init<>() )
 		.def( "sort", &RadixSortWrapper::sort<int> )

Original file line number	Diff line number	Diff line change
`@@ -330,8 +330,6 @@ Vec triangleClosestPoint( const Vec &v0, const Vec &v1, const Vec &v2, const Vec`
`330`	`330`	`template<class Vec>`
`331`	`331`	`int triangleBarycentricFeature( const Vec &barycentric, typename VectorTraits<Vec>::BaseType tolerance )`
`332`	`332`	`{`
`333`		`- typedef typename VectorTraits<Vec>::BaseType Real;`
`334`		`-`
`335`	`333`	`bool bx = VectorTraits<Vec>::get( barycentric, 0 ) > tolerance;`
`336`	`334`	`bool by = VectorTraits<Vec>::get( barycentric, 1 ) > tolerance;`
`337`	`335`	`bool bz = VectorTraits<Vec>::get( barycentric, 2 ) > tolerance;`
Original file line number	Diff line number	Diff line change
`@@ -662,8 +662,6 @@ std::string str<TypedData<std::vector<TYPE> > >( TypedData<std::vector<TYPE> > &`
`662`	`662`
`663`	`663`	`/// \todo Get rid of these macros`
`664`	`664`	`#define BASIC_VECTOR_BINDING(ThisClass, Tname) \`
`665`		`- typedef IECore::IntrusivePtr< ThisClass > ThisClassPtr; \`
`666`		`- typedef IECore::IntrusivePtr< const ThisClass > ThisConstClassPtr; \`
`667`	`665`	`typedef VectorTypedDataFunctions< ThisClass > ThisBinder; \`
`668`	`666`	`\`
`669`	`667`	`RunTimeTypedClass<ThisClass>( \`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@ struct CurveTangentsOp::CalculateTangents`
`87`	`87`	`ReturnType operator()( T * data )`
`88`	`88`	`{`
`89`	`89`	`typedef typename T::ValueType VecContainer;`
`90`		`- typedef typename VecContainer::value_type Vec;`
`91`	`90`
`92`	`91`	`const VecContainer &points = data->readable();`
`93`	`92`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,6 @@ void FaceAreaOp::modifyTypedPrimitive( MeshPrimitive * mesh, const CompoundObjec`
`127`	`127`	`PolygonIterator faceEnd = mesh->faceEnd();`
`128`	`128`	`for( PolygonIterator pIt = mesh->faceBegin(); pIt!=faceEnd; pIt++ )`
`129`	`129`	`{`
`130`		`- typedef vector<V3f> PointVector;`
`131`	`130`	`areas.push_back( polygonArea( pIt.vertexBegin( p.begin() ), pIt.vertexEnd( p.begin() ) ) );`
`132`	`131`	`}`
`133`	`132`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ struct ImagePremultiplyOp::PremultFn`
`96`	`96`	`{`
`97`	`97`	`typedef typename T::ValueType Container;`
`98`	`98`	`typedef typename Container::value_type ValueType;`
`99`		`- typedef typename Container::iterator Iterator;`
`100`	`99`
`101`	`100`	`ScaledDataConversion< ValueType, float > toFloat;`
`102`	`101`	`ScaledDataConversion< float, ValueType > fromFloat;`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ struct ImageUnpremultiplyOp::UnpremultFn`
`96`	`96`	`{`
`97`	`97`	`typedef typename T::ValueType Container;`
`98`	`98`	`typedef typename Container::value_type ValueType;`
`99`		`- typedef typename Container::iterator Iterator;`
`100`	`99`
`101`	`100`	`ScaledDataConversion< ValueType, float > toFloat;`
`102`	`101`	`ScaledDataConversion< float, ValueType > fromFloat;`
Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,10 @@ void MeshPrimitiveImplicitSurfaceOp::modifyTypedPrimitive( MeshPrimitive * typed`
`243`	`243`
`244`	`244`
`245`	`245`	`V3i resolution;`
	`246`	`+ resolution.x = 0;`
	`247`	`+ resolution.y = 0;`
	`248`	`+ resolution.z = 0;`
	`249`	`+`
`246`	`250`	`int gridMethod = m_gridMethodParameter->getNumericValue();`
`247`	`251`	`if ( gridMethod == Resolution )`
`248`	`252`	`{`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ struct SummedAreaOp::SumArea`
`65`	`65`	`{`
`66`	`66`	`typedef typename T::ValueType Container;`
`67`	`67`	`typedef typename Container::value_type V;`
`68`		`- typedef typename Container::iterator It;`
`69`	`68`
`70`	`69`	`Container &buffer = data->writable();`
`71`	`70`