Merge pull request #1344 from johnhaddon/stdOptional

johnhaddon · web-flow · commit 09d344bc359f · 2023-03-21T10:10:09.000Z
Replace `boost::optional` with `std::optional`
diff --git a/Changes b/Changes
@@ -1,3 +1,11 @@
+10.x.x.x (relative to 10.4.x.x)
+========
+
+Breaking Changes
+----------------
+
+- Primitive : Changed `variableIndexedView()` return type from `boost::optional` to `std::optional`.
+
 10.4.6.0 (relative to 10.4.5.0)
 ========
 
diff --git a/include/IECore/StreamIndexedIO.h b/include/IECore/StreamIndexedIO.h
@@ -41,7 +41,6 @@
 #include "IECore/VectorTypedData.h"
 
 #include "boost/iostreams/filtering_stream.hpp"
-#include "boost/optional.hpp"
 
 #include <fstream>
 #include <iostream>
diff --git a/include/IECoreScene/Primitive.h b/include/IECoreScene/Primitive.h
@@ -42,7 +42,7 @@
 #include "IECore/Canceller.h"
 #include "IECore/MessageHandler.h"
 
-#include "boost/optional.hpp"
+#include <optional>
 
 namespace IECoreScene
 {
@@ -73,7 +73,7 @@ class IECORESCENE_API Primitive : public VisibleRenderable
 		/// If the required interpolation & datatype do not match then an empty optional is returned unless throwIfInvalid is true.
 		/// The returned IndexedView lifetime must be bound by the primitive variable data it is viewing.
 		template<typename T>
-		boost::optional<PrimitiveVariable::IndexedView<typename T::ValueType::value_type>> variableIndexedView(
+		std::optional<PrimitiveVariable::IndexedView<typename T::ValueType::value_type>> variableIndexedView(
 			const std::string &name,
 			PrimitiveVariable::Interpolation requiredInterpolation = PrimitiveVariable::Invalid,
 			bool throwIfInvalid = false
diff --git a/include/IECoreScene/Primitive.inl b/include/IECoreScene/Primitive.inl
@@ -38,7 +38,7 @@
 namespace IECoreScene
 {
 
-template<typename T> boost::optional<PrimitiveVariable::IndexedView < typename T::ValueType::value_type> >
+template<typename T> std::optional<PrimitiveVariable::IndexedView<typename T::ValueType::value_type>>
 Primitive::variableIndexedView( const std::string &name, PrimitiveVariable::Interpolation requiredInterpolation, bool throwIfInvalid ) const
 {
 	PrimitiveVariableMap::const_iterator it = variables.find( name );
@@ -50,7 +50,7 @@ Primitive::variableIndexedView( const std::string &name, PrimitiveVariable::Inte
 		}
 		else
 		{
-			return boost::none;
+			return std::nullopt;
 		}
 	}
 
@@ -68,7 +68,7 @@ Primitive::variableIndexedView( const std::string &name, PrimitiveVariable::Inte
 		}
 		else
 		{
-			return boost::none;
+			return std::nullopt;
 		}
 	}
 
@@ -93,7 +93,7 @@ Primitive::variableIndexedView( const std::string &name, PrimitiveVariable::Inte
 	}
 	else
 	{
-		return boost::none;
+		return std::nullopt;
 	}
 }
 
diff --git a/src/IECore/StreamIndexedIO.cpp b/src/IECore/StreamIndexedIO.cpp
@@ -53,14 +53,14 @@
 #include "boost/iostreams/filtering_stream.hpp"
 #include "boost/iostreams/filtering_streambuf.hpp"
 #include "boost/iostreams/stream.hpp"
-#include "boost/optional.hpp"
 #include "boost/tokenizer.hpp"
 
 #include <algorithm>
 #include <cassert>
 #include <iostream>
 #include <list>
 #include <map>
+#include <optional>
 #include <set>
 
 #include <fcntl.h>
@@ -415,11 +415,11 @@ size_t compress(
 	int compressionLevel,
 	const std::string &compressor,
 	int threadCount,
-	boost::optional<size_t> maxBlockSize = boost::optional<size_t>(),
+	std::optional<size_t> maxBlockSize = std::optional<size_t>(),
 	size_t minCompressedBlockSize = 1024U
 )
 {
-	size_t maxCompressedBlockSize = maxBlockSize ? maxBlockSize.get() : BLOSC_MAX_BUFFERSIZE;
+	const size_t maxCompressedBlockSize = maxBlockSize.value_or( BLOSC_MAX_BUFFERSIZE );
 
 	if( size < minCompressedBlockSize )
 	{
@@ -765,7 +765,7 @@ class DirectoryNode : public NodeBase
 		typedef std::vector< NodeBase* > ChildMap;
 
 		// regular constructor
-		DirectoryNode(IndexedIO::EntryID name, boost::optional<uint32_t> numChildren = boost::optional<uint32_t>()) : NodeBase( NodeBase::Directory, name ),
+		DirectoryNode(IndexedIO::EntryID name, std::optional<uint32_t> numChildren = std::optional<uint32_t>()) : NodeBase( NodeBase::Directory, name ),
 			m_subindex( NoSubIndex ),
 			m_sortedChildren( false ),
 			m_subindexChildren( false ),
@@ -774,7 +774,7 @@ class DirectoryNode : public NodeBase
 		{
 			if ( numChildren )
 			{
-				m_children.reserve( numChildren.get() );
+				m_children.reserve( *numChildren );
 			}
 
 		}
@@ -1124,7 +1124,7 @@ class StreamIndexedIO::Index : public RefCounted
 		int m_compressionLevel;
 		int m_compressionThreadCount;
 		int m_decompressionThreadCount;
-		boost::optional<size_t> m_maxCompressedBlockSize;
+		std::optional<size_t> m_maxCompressedBlockSize;
 		std::string m_compressor;
 
 		struct FreePage
diff --git a/src/IECoreScene/MeshAlgoDistributePoints.cpp b/src/IECoreScene/MeshAlgoDistributePoints.cpp
@@ -160,7 +160,7 @@ struct Generator
 				size_t v2I = v1I + 1;
 
 				Imath::V2f uv0, uv1, uv2;
-			
+
 				if( m_faceVaryingUVs )
 				{
 					uv0 = m_uvs[v0I];
@@ -232,7 +232,7 @@ PointsPrimitivePtr MeshAlgo::distributePoints( const MeshPrimitive *mesh, float
 	MeshPrimitiveEvaluatorPtr meshEvaluator = new MeshPrimitiveEvaluator( updatedMesh );
 
 	bool faceVaryingUVs = true;
-	boost::optional<PrimitiveVariable::IndexedView<V2f> > uvView = updatedMesh->variableIndexedView<V2fVectorData>( uvSet, PrimitiveVariable::FaceVarying, /* throwOnInvalid */ false );
+	std::optional<PrimitiveVariable::IndexedView<V2f>> uvView = updatedMesh->variableIndexedView<V2fVectorData>( uvSet, PrimitiveVariable::FaceVarying, /* throwOnInvalid */ false );
 	if( !uvView )
 	{
 		faceVaryingUVs = false;
diff --git a/src/IECoreScene/MeshAlgoFaceArea.cpp b/src/IECoreScene/MeshAlgoFaceArea.cpp
@@ -97,7 +97,7 @@ PrimitiveVariable MeshAlgo::calculateFaceArea( const MeshPrimitive *mesh, const
 PrimitiveVariable MeshAlgo::calculateFaceTextureArea( const MeshPrimitive *mesh, const std::string &uvSet, const std::string &position, const Canceller *canceller )
 {
 	PrimitiveVariable::Interpolation uvInterpolation = PrimitiveVariable::Vertex;
-	boost::optional<PrimitiveVariable::IndexedView<V2f> > uvView = mesh->variableIndexedView<V2fVectorData>( uvSet, PrimitiveVariable::Vertex, false );
+	std::optional<PrimitiveVariable::IndexedView<V2f>> uvView = mesh->variableIndexedView<V2fVectorData>( uvSet, PrimitiveVariable::Vertex, false );
 	if( !uvView )
 	{
 		uvView = mesh->variableIndexedView<V2fVectorData>( uvSet, PrimitiveVariable::FaceVarying, false );
diff --git a/src/IECoreScene/bindings/PrimitiveBinding.cpp b/src/IECoreScene/bindings/PrimitiveBinding.cpp
@@ -74,7 +74,7 @@ void testVariableIndexedView()
 
 	// check we get an view if type & interpolation are compatible
 	{
-		boost::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(
+		std::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(
 			"P", IECoreScene::PrimitiveVariable::Interpolation::Vertex
 		);
 
@@ -92,7 +92,7 @@ void testVariableIndexedView()
 		}
 
 		// If requiredInterpolation = Invalid matches any interpolation
-		boost::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView2 = primitive->variableIndexedView<IECore::V3fVectorData>(
+		std::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView2 = primitive->variableIndexedView<IECore::V3fVectorData>(
 			"P", IECoreScene::PrimitiveVariable::Interpolation::Invalid
 		);
 
@@ -113,7 +113,7 @@ void testVariableIndexedView()
 	// missing primvar
 	{
 		{
-			boost::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(
+			std::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(
 				"MISSING", IECoreScene::PrimitiveVariable::Interpolation::Vertex
 			);
 
@@ -123,7 +123,7 @@ void testVariableIndexedView()
 		bool exceptionRaised = false;
 		try
 		{
-			boost::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(
+			primitive->variableIndexedView<IECore::V3fVectorData>(
 				"MISSING", IECoreScene::PrimitiveVariable::Interpolation::Vertex, true /* throwIfInvalid */
 			);
 		}
@@ -139,7 +139,7 @@ void testVariableIndexedView()
 	// invalid interpolation
 	{
 		{
-			boost::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(
+			std::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(
 				"P", IECoreScene::PrimitiveVariable::Interpolation::FaceVarying
 			);
 
@@ -149,7 +149,7 @@ void testVariableIndexedView()
 		bool exceptionRaised = false;
 		try
 		{
-			boost::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(
+			primitive->variableIndexedView<IECore::V3fVectorData>(
 				"P", IECoreScene::PrimitiveVariable::Interpolation::FaceVarying, true /* throwIfInvalid */
 			);
 		}
@@ -168,7 +168,7 @@ void testVariableIndexedView()
 	// invalid type
 	{
 		{
-			boost::optional<PrimitiveVariable::IndexedView<Imath::V2f>> optionalIndexedView = primitive->variableIndexedView<IECore::V2fVectorData>(
+			std::optional<PrimitiveVariable::IndexedView<Imath::V2f>> optionalIndexedView = primitive->variableIndexedView<IECore::V2fVectorData>(
 				"P", IECoreScene::PrimitiveVariable::Interpolation::Vertex
 			);
 
@@ -178,7 +178,7 @@ void testVariableIndexedView()
 		bool exceptionRaised = false;
 		try
 		{
-			boost::optional<PrimitiveVariable::IndexedView<Imath::V2f>> optionalIndexedView = primitive->variableIndexedView<IECore::V2fVectorData>(
+			primitive->variableIndexedView<IECore::V2fVectorData>(
 				"P", IECoreScene::PrimitiveVariable::Interpolation::Vertex, true /* throwIfInvalid */
 			);
 		}

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`namespace IECoreScene`
`39`	`39`	`{`
`40`	`40`
`41`		`-template<typename T> boost::optional<PrimitiveVariable::IndexedView < typename T::ValueType::value_type> >`
	`41`	`+template<typename T> std::optional<PrimitiveVariable::IndexedView<typename T::ValueType::value_type>>`
`42`	`42`	`Primitive::variableIndexedView( const std::string &name, PrimitiveVariable::Interpolation requiredInterpolation, bool throwIfInvalid ) const`
`43`	`43`	`{`
`44`	`44`	`PrimitiveVariableMap::const_iterator it = variables.find( name );`
`@@ -50,7 +50,7 @@ Primitive::variableIndexedView( const std::string &name, PrimitiveVariable::Inte`
`50`	`50`	`}`
`51`	`51`	`else`
`52`	`52`	`{`
`53`		`- return boost::none;`
	`53`	`+ return std::nullopt;`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`@@ -68,7 +68,7 @@ Primitive::variableIndexedView( const std::string &name, PrimitiveVariable::Inte`
`68`	`68`	`}`
`69`	`69`	`else`
`70`	`70`	`{`
`71`		`- return boost::none;`
	`71`	`+ return std::nullopt;`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`@@ -93,7 +93,7 @@ Primitive::variableIndexedView( const std::string &name, PrimitiveVariable::Inte`
`93`	`93`	`}`
`94`	`94`	`else`
`95`	`95`	`{`
`96`		`- return boost::none;`
	`96`	`+ return std::nullopt;`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ PrimitiveVariable MeshAlgo::calculateFaceArea( const MeshPrimitive *mesh, const`
`97`	`97`	`PrimitiveVariable MeshAlgo::calculateFaceTextureArea( const MeshPrimitive mesh, const std::string &uvSet, const std::string &position, const Canceller canceller )`
`98`	`98`	`{`
`99`	`99`	`PrimitiveVariable::Interpolation uvInterpolation = PrimitiveVariable::Vertex;`
`100`		`- boost::optional<PrimitiveVariable::IndexedView<V2f> > uvView = mesh->variableIndexedView<V2fVectorData>( uvSet, PrimitiveVariable::Vertex, false );`
	`100`	`+ std::optional<PrimitiveVariable::IndexedView<V2f>> uvView = mesh->variableIndexedView<V2fVectorData>( uvSet, PrimitiveVariable::Vertex, false );`
`101`	`101`	`if( !uvView )`
`102`	`102`	`{`
`103`	`103`	`uvView = mesh->variableIndexedView<V2fVectorData>( uvSet, PrimitiveVariable::FaceVarying, false );`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ void testVariableIndexedView()`
`74`	`74`
`75`	`75`	`// check we get an view if type & interpolation are compatible`
`76`	`76`	`{`
`77`		`- boost::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(`
	`77`	`+ std::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(`
`78`	`78`	`"P", IECoreScene::PrimitiveVariable::Interpolation::Vertex`
`79`	`79`	`);`
`80`	`80`
`@@ -92,7 +92,7 @@ void testVariableIndexedView()`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`// If requiredInterpolation = Invalid matches any interpolation`
`95`		`- boost::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView2 = primitive->variableIndexedView<IECore::V3fVectorData>(`
	`95`	`+ std::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView2 = primitive->variableIndexedView<IECore::V3fVectorData>(`
`96`	`96`	`"P", IECoreScene::PrimitiveVariable::Interpolation::Invalid`
`97`	`97`	`);`
`98`	`98`
`@@ -113,7 +113,7 @@ void testVariableIndexedView()`
`113`	`113`	`// missing primvar`
`114`	`114`	`{`
`115`	`115`	`{`
`116`		`- boost::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(`
	`116`	`+ std::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(`
`117`	`117`	`"MISSING", IECoreScene::PrimitiveVariable::Interpolation::Vertex`
`118`	`118`	`);`
`119`	`119`
`@@ -123,7 +123,7 @@ void testVariableIndexedView()`
`123`	`123`	`bool exceptionRaised = false;`
`124`	`124`	`try`
`125`	`125`	`{`
`126`		`- boost::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(`
	`126`	`+ primitive->variableIndexedView<IECore::V3fVectorData>(`
`127`	`127`	`"MISSING", IECoreScene::PrimitiveVariable::Interpolation::Vertex, true /* throwIfInvalid */`
`128`	`128`	`);`
`129`	`129`	`}`
`@@ -139,7 +139,7 @@ void testVariableIndexedView()`
`139`	`139`	`// invalid interpolation`
`140`	`140`	`{`
`141`	`141`	`{`
`142`		`- boost::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(`
	`142`	`+ std::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(`
`143`	`143`	`"P", IECoreScene::PrimitiveVariable::Interpolation::FaceVarying`
`144`	`144`	`);`
`145`	`145`
`@@ -149,7 +149,7 @@ void testVariableIndexedView()`
`149`	`149`	`bool exceptionRaised = false;`
`150`	`150`	`try`
`151`	`151`	`{`
`152`		`- boost::optional<PrimitiveVariable::IndexedView<Imath::V3f>> optionalIndexedView = primitive->variableIndexedView<IECore::V3fVectorData>(`
	`152`	`+ primitive->variableIndexedView<IECore::V3fVectorData>(`
`153`	`153`	`"P", IECoreScene::PrimitiveVariable::Interpolation::FaceVarying, true /* throwIfInvalid */`
`154`	`154`	`);`
`155`	`155`	`}`
`@@ -168,7 +168,7 @@ void testVariableIndexedView()`
`168`	`168`	`// invalid type`
`169`	`169`	`{`
`170`	`170`	`{`
`171`		`- boost::optional<PrimitiveVariable::IndexedView<Imath::V2f>> optionalIndexedView = primitive->variableIndexedView<IECore::V2fVectorData>(`
	`171`	`+ std::optional<PrimitiveVariable::IndexedView<Imath::V2f>> optionalIndexedView = primitive->variableIndexedView<IECore::V2fVectorData>(`
`172`	`172`	`"P", IECoreScene::PrimitiveVariable::Interpolation::Vertex`
`173`	`173`	`);`
`174`	`174`
`@@ -178,7 +178,7 @@ void testVariableIndexedView()`
`178`	`178`	`bool exceptionRaised = false;`
`179`	`179`	`try`
`180`	`180`	`{`
`181`		`- boost::optional<PrimitiveVariable::IndexedView<Imath::V2f>> optionalIndexedView = primitive->variableIndexedView<IECore::V2fVectorData>(`
	`181`	`+ primitive->variableIndexedView<IECore::V2fVectorData>(`
`182`	`182`	`"P", IECoreScene::PrimitiveVariable::Interpolation::Vertex, true /* throwIfInvalid */`
`183`	`183`	`);`
`184`	`184`	`}`