Fix build when using WITH_TBB=OFF after recent changes

And wrap tbb::parallel_sort in blender namespace similar to other TBB
functionality.

1 files changed, 32 insertions, 0 deletions

diff --git a/source/blender/blenlib/BLI_sort.hh b/source/blender/blenlib/BLI_sort.hh
new file mode 100644
index 00000000000..411e6a0c4df
--- /dev/null
+++ b/source/blender/blenlib/BLI_sort.hh
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+/** \file
+ * \ingroup bli
+ */
+
+#ifdef WITH_TBB
+#  include <tbb/parallel_sort.h>
+#else
+#  include <algorithm>
+#endif
+
+namespace blender {
+
+#ifdef WITH_TBB
+using tbb::parallel_sort;
+#else
+template<typename RandomAccessIterator>
+void parallel_sort(RandomAccessIterator begin, RandomAccessIterator end)
+{
+  std::sort<RandomAccessIterator>(begin, end);
+}
+template<typename RandomAccessIterator, typename Compare>
+void parallel_sort(RandomAccessIterator begin, RandomAccessIterator end, const Compare &comp)
+{
+  std::sort<RandomAccessIterator, Compare>(begin, end, comp);
+}
+#endif
+
+}  // namespace blender