Merge pull request #1269 from johnhaddon/randomShuffleWoes

Avoid `std::random_shuffle()`

Author: johnhaddon

.github/workflows/main.yml

@@ -156,11 +156,14 @@ jobs:
 
     - name: Build
       run: |
-       scons -j 2 install BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} CXXSTD=c++14 BUILD_CACHEDIR=sconsCache
+       scons -j 2 install BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} BUILD_CACHEDIR=sconsCache
+       # Copy the config log for use in the "Debug Failures" step, because it
+       # gets clobbered by the `scons test*` call below.
+       cp config.log buildConfig.log
 
     - name: Test
       run: |
-        scons ${{ matrix.tests }} BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} CXXSTD=c++14 BUILD_CACHEDIR=sconsCache
+        scons ${{ matrix.tests }} BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} BUILD_CACHEDIR=sconsCache
       env:
         IECORE_RTLD_GLOBAL: 0
 
@@ -185,3 +188,17 @@ jobs:
 
     - name: Limit cache size
       run: python ./.github/workflows/main/limitCacheSize.py
+
+    - name: Debug Failures
+      run: |
+        # Give MacOS crash reporter time to do its thing
+        sleep 20
+        # Print SCons logs and MacOS crash logs
+        shopt -s nullglob
+        for logFile in buildConfig.log ~/Library/Logs/DiagnosticReports/*.crash
+        do
+         echo $logFile
+         cat $logFile
+        done
+      shell: bash
+      if: failure()

SConstruct

@@ -93,7 +93,7 @@ o.Add(
 o.Add(
 	"CXXSTD",
 	"The C++ standard to build against.",
-	"c++11"
+	"c++17"
 )
 
 o.Add(

include/IECore/DataConversion.h

@@ -38,14 +38,12 @@
 #include "boost/static_assert.hpp"
 #include "boost/type_traits/integral_constant.hpp"
 
-#include <functional>
-
 namespace IECore
 {
 
 /// Base class for data conversions
 template<typename F, typename T>
-struct DataConversion : public std::unary_function<F, T>
+struct DataConversion
 {
 	typedef F FromType;
 	typedef T ToType;

include/IECore/IECore.h

@@ -81,7 +81,7 @@ IECORE_API bool withFreeType();
 /// getting their elements. This allows coding compatible with both the Imath types
 /// and other 3rd party math types. The VectorOps.h and MatrixOps.h files then
 /// provide common operations on top of this lower level access, allowing classes
-/// such as \link IECore::KDTree KDTree \endlink and \link IECore::PerlinNoise PerlinNoise \endlink to operate both on native IECore types and
+/// such as \link IECore::KDTree KDTree \endlink to operate both on native IECore types and
 /// application specific types such as the Maya MPoint and MVector classes.
 ///
 /// The VectorOps.h and MatrixOps.h code provides a pretty ugly c-style function
@@ -217,8 +217,6 @@ IECORE_API bool withFreeType();
 /// \link IECore::KDTree KDTree \endlink and \link IECore::BoundedKDTree BoundedKDTree \endlink
 /// structures allow for fast spatial queries on large data sets.
 ///
-/// \link IECore::PerlinNoise PerlinNoise \endlink implements the classic noise function for arbitrary dimensions.
-///
 /// Fast closest point and ray intersection queries can be performed on some of the classes derived
 /// from \link IECore::Primitive Primitive \endlink, using an instance of a
 /// \link IECore::PrimitiveEvaluator PrimitiveEvaluator \endlink.