Merge from core

CMakeLists.txt

@@ -321,10 +321,8 @@ if(YAML_CPP_BUILD_TOOLS)
 endif()
 
 ### Formatting
-if(${CMAKE_BUILD_TOOL} MATCHES make OR ${CMAKE_BUILD_TOOL} MATCHES gmake)
 get_property(all_sources GLOBAL PROPERTY SRCS_LIST)
 add_custom_target(format
 	COMMAND clang-format --style=file -i ${all_sources}
 	COMMENT "Running clang-format"
 	VERBATIM)
-endif()

src/scanscalar.cpp

@@ -1,6 +1,9 @@
+#include "scanscalar.h"
+
+#include <algorithm>
+
 #include "exp.h"
 #include "regeximpl.h"
-#include "scanscalar.h"
 #include "stream.h"
 #include "yaml-cpp/exceptions.h"  // IWYU pragma: keep