Fixing headers to fit new guidelines

include/gp/allocator/aggregator.hpp

@@ -1,7 +1,8 @@
 #pragma once
-#include <stddef.h>
 #include "gp/ring_list.hpp"
 
+#include <stddef.h>
+
 namespace gp {
 	class aggregator {
 		struct virtual_allocator

include/gp/allocator/arena.hpp

@@ -1,10 +1,12 @@
 #pragma once
 #include "gp_config.hpp"
+
+#include "gp/algorithm/min_max.hpp"
+#include "gp/algorithm/tmp_manip.hpp"
 #include "gp/buffer.hpp"
-#include <type_traits>
-#include <gp/algorithm/tmp_manip.hpp>
 #include "gp/math/integer_math.hpp"
-#include "gp/algorithm/min_max.hpp"
+
+#include <type_traits>
 
 namespace gp {
 	template<typename page_allocator = int>

include/gp/allocator/buddy.hpp

@@ -1,12 +1,14 @@
 #pragma once
 #include "gp_config.hpp"
-#include "gp/buffer.hpp"
+
+#include "gp/algorithm/modifiers.hpp"
+#include "gp/algorithm/tmp_manip.hpp"
+#include "gp/allocator/dummy.hpp"
 #include "gp/array.hpp"
+#include "gp/buffer.hpp"
 #include "gp/math/integer_math.hpp"
+
 #include <type_traits>
-#include <gp/algorithm/tmp_manip.hpp>
-#include <gp/algorithm/modifiers.hpp>
-#include <gp/allocator/dummy.hpp>
 
 
 namespace gp{

include/gp/array.hpp

@@ -1,7 +1,8 @@
 #pragma once
-#include <initializer_list>
 #include <gp/buffer.hpp>
 
+#include <initializer_list>
+
 namespace gp{
 	template<typename T, std::size_t sz>
 	class array{

include/gp/bitops.hpp

@@ -1,6 +1,6 @@
 #pragma once
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 namespace gp{
 	namespace _impl{

include/gp/bloomfilter.hpp

@@ -1,9 +1,10 @@
 #pragma once
-#include <stdint.h>
-#include <atomic>
-#include <gp/array.hpp>
 #include <gp/algorithm/tmp_manip.hpp>
+#include <gp/array.hpp>
 
+#include <atomic>
+
+#include <stdint.h>
 
 namespace gp {
 	template<typename hash_type = uint64_t, uint8_t magnitude = 19, bool threading = false>

include/gp/buffer.hpp

@@ -1,11 +1,12 @@
 #pragma once
-#include <cstddef>
-#include <cstdint>
-#include <gp/optional.hpp>
-#include <gp/iterator.hpp>
+#include <gp/algorithm/move.hpp>
 #include <gp/function.hpp>
 #include <gp/exception.hpp>
-#include <gp/algorithm/move.hpp>
+#include <gp/iterator.hpp>
+#include <gp/optional.hpp>
+
+#include <cstddef>
+#include <cstdint>
 
 namespace gp{
 

include/gp/flat_tree.hpp

@@ -1,7 +1,7 @@
 #pragma one
 #include <gp/array.hpp>
-#include <gp/iterator.hpp>
 #include <gp/integer_math.hpp>
+#include <gp/iterator.hpp>
 // UNIMPLEMENTED: see filename
 
 template<typename T, size_t depth>

include/gp/function.hpp

@@ -1,8 +1,8 @@
 #pragma once
 #include "gp/exception.hpp"
-#include "gp/algorithm/tmp_manip.hpp"
-#include "gp/algorithm/move.hpp"
 #include "gp/algorithm/modifiers.hpp"
+#include "gp/algorithm/move.hpp"
+#include "gp/algorithm/tmp_manip.hpp"
 
 namespace gp{
 	template <typename fn, typename allocator, bool copy_allocator = false>

include/gp/indexed_array.hpp

@@ -1,9 +1,11 @@
 #pragma once
-#include <stddef.h>
 #include "gp_config.hpp"
+
 #include "gp/algorithm/move.hpp"
-#include "gp/iterator.hpp"
 #include "gp/array.hpp"
+#include "gp/iterator.hpp"
+
+#include <stddef.h>
 
 namespace gp{
 	template<typename T, size_t _capacity>

include/gp/math.hpp

@@ -1,12 +1,13 @@
 #pragma once
 #include "gp_config.hpp"
+
+#include "gp/algorithm/min_max.hpp"
+#include "gp/algorithm/repeat.hpp"
 #include "gp/math/integer_math.hpp"
-#include "gp/math/q_math.hpp"
 #if !defined(NO_FP_MATH)
 #	include "gp/math/fp_math.hpp"
 #endif
-#include "gp/algorithm/repeat.hpp"
-#include "gp/algorithm/min_max.hpp"
+#include "gp/math/q_math.hpp"
 
 namespace gp {
 	template<typename T>

include/gp/math/fp_math.hpp

@@ -1,8 +1,10 @@
 #pragma once
+#include "gp/algorithm/repeat.hpp"
+
+#include <limits>
+
 #include <stddef.h>
 #include <stdint.h>
-#include <limits>
-#include "gp/algorithm/repeat.hpp"
 
 namespace gp{
 

include/gp/memory.hpp

@@ -1,6 +1,8 @@
 #pragma once
 #include "gp_config.hpp"
+
 #include "gp/exception.hpp"
+
 #include <type_traits>
 // XXX: THIS FILE SHOULD BE REMOVED, AS SHOULD ALL DEPENDENCIES ON THE C-ALLOCATOR AS IS
 

include/gp/optional.hpp

@@ -1,9 +1,11 @@
 #pragma once
-#include <type_traits>
 #include "gp_config.hpp"
-#include "gp/exception.hpp"
-#include "gp/algorithm/move.hpp"
+
 #include "gp/algorithm/modifiers.hpp"
+#include "gp/algorithm/move.hpp"
+#include "gp/exception.hpp"
+
+#include <type_traits>
 
 namespace gp{
 	struct nullopt_t{};

include/gp/quotient_filter.hpp

@@ -1,10 +1,11 @@
 #pragma once
-#include <stdint.h>
-#include <atomic>
-#include <gp/array.hpp>
 #include <gp/algorithm/tmp_manip.hpp>
+#include <gp/array.hpp>
 #include <gp/exception.hpp>
 
+#include <atomic>
+
+#include <stdint.h>
 
 namespace gp {
 

include/gp/rendering/bmp_viewport.hpp

@@ -1,9 +1,9 @@
 #pragma once
-#include "gp/function.hpp"
+#include "gp/algorithm/tmp_manip.hpp"
+#include "gp/bitops.hpp"
 #include "gp/buffer.hpp"
+#include "gp/function.hpp"
 #include "gp/math.hpp"
-#include "gp/bitops.hpp"
-#include "gp/algorithm/tmp_manip.hpp"
 
 
 #include <iostream>

include/gp/rendering/renderer.hpp

@@ -1,10 +1,11 @@
 #pragma once
 #include "gp_config.hpp"
-#include "gp/math.hpp"
-#include "gp/function.hpp"
+
 #include "gp/algorithm/min_of.hpp"
-#include "gp/indexed_array.hpp"
 #include "gp/allocator/buddy.hpp"
+#include "gp/function.hpp"
+#include "gp/indexed_array.hpp"
+#include "gp/math.hpp"
 
 using vec2 = gp::vec2_g<>;
 using vec3 = gp::vec3_g<>;

include/gp/ring_list.hpp

@@ -1,9 +1,11 @@
 #pragma once
-#include <stddef.h>
-#include "gp/algorithm/tmp_manip.hpp"
-#include "gp/algorithm/modifiers.hpp"
 #include "gp_config.hpp"
 
+#include "gp/algorithm/modifiers.hpp"
+#include "gp/algorithm/tmp_manip.hpp"
+
+#include <stddef.h>
+
 namespace gp {
 	template<typename T, typename allocator, bool copy_allocator = false, bool may_contain_self = false>
 	class ring_list{

include/gp/subtree_iterator.hpp

@@ -1,7 +1,8 @@
 #pragma once
+#include <gp/buffer.hpp>
+
 #include <stddef.h>
 #include <stdint.h>
-#include <gp/buffer.hpp>
 // UNIMPLEMENTED: see filename
 
 template<typename T>

include/gp/variant.hpp

@@ -1,12 +1,14 @@
 #pragma once
-#include <gp/algorithm/tmp_manip.hpp>
-#include <type_traits>
-#include <new>
 #include "gp_config.hpp"
-#include "gp/exception.hpp"
+
+#include <gp/algorithm/tmp_manip.hpp>
 #include "gp/allocator/dummy.hpp"
-#include "gp/memory.hpp"
+#include "gp/exception.hpp"
 #include "gp/function.hpp"
+#include "gp/memory.hpp"
+
+#include <type_traits>
+#include <new>
 
 
 namespace gp{

include/gp/vfs/channel_fs.hpp

@@ -1,8 +1,8 @@
 #pragma once
-#include "gp/array.hpp"
 #include "gp/algorithm/move.hpp"
-#include "gp/vfs/fs_types.hpp"
 #include "gp/allocator/aggregator.hpp"
+#include "gp/array.hpp"
+#include "gp/vfs/fs_types.hpp"
 
 namespace gp {
 	template<typename error_function, typename pop_function>

include/gp/vfs/fs_types.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include "gp_config.hpp"
+
 #include "gp/buffer.hpp"
 #include "gp/variant.hpp"
 

include/gp/vfs/vfs.hpp

@@ -1,11 +1,13 @@
 #pragma once
-#include <stddef.h>
 #include "gp_config.hpp"
-#include "gp/variant.hpp"
-#include "gp/optional.hpp"
+
+#include "gp/allocator/aggregator.hpp"
 #include "gp/buffer.hpp"
+#include "gp/optional.hpp"
+#include "gp/variant.hpp"
 #include "gp/vfs/fs_types.hpp"
-#include "gp/allocator/aggregator.hpp"
+
+#include <stddef.h>
 
 namespace gp {
 	class vfs {

include/gp_config.hpp

@@ -1,8 +1,9 @@
 #pragma once
-#include <cstdint>
+#include <type_traits>
+
 #include <cstddef>
+#include <cstdint>
 #include <cstdlib>
-#include <type_traits>
 
 #ifdef GP_TESTS
 	class static_mapper;

tests.cpp

@@ -1,13 +1,13 @@
 #include "gp_config.hpp"
 
-#include "test_scaffold.h"
 #include "allocator.hpp"
-#include "meta_test.cpp"
-#include "gp_test.cpp"
 #include "bloomfilter.cpp"
-#include "quotient_filter.cpp"
+#include "gp_test.cpp"
 #include "math.cpp"
+#include "meta_test.cpp"
 #include "pair_test.cpp"
+#include "quotient_filter.cpp"
+#include "test_scaffold.h"
 
 #include <iostream>
 

tests/bloomfilter.cpp

@@ -1,9 +1,10 @@
+#include "gp/algorithm/repeat.hpp"
+#include "gp/bloomfilter.hpp"
 #include "test_scaffold.h"
+
 #include <random>
 #include <string>
 
-#include "gp/bloomfilter.hpp"
-#include "gp/algorithm/repeat.hpp"
 
 typedef std::mt19937_64 cheap_rand;
 typedef std::mt19937_64 cheap_rand_bis;

tests/gp_test.cpp

@@ -1,28 +1,27 @@
-#include "test_scaffold.h"
 #include "allocator.hpp"
-#include "gp/array.hpp"
-#include "gp/indexed_array.hpp"
+#include "gp/algorithm/repeat.hpp"
+#include "gp/algorithm/rotate.hpp"
+#include "gp/algorithm/move.hpp"
 #include "gp/allocator/aggregator.hpp"
 #include "gp/allocator/arena.hpp"
 #include "gp/allocator/buddy.hpp"
 #include "gp/allocator/dummy.hpp"
-#include "gp/algorithm/repeat.hpp"
-#include "gp/algorithm/rotate.hpp"
-#include "gp/algorithm/move.hpp"
-#include "gp/ring_list.hpp"
+#include "gp/array.hpp"
 #include "gp/bitops.hpp"
-#include <thread>;
-#include <chrono>;
-#include <set>;
-#include <stack>
-#include <numeric>
+#include "gp/indexed_array.hpp"
+#include "gp/ring_list.hpp"
+#include &#34;test_scaffold.h";
+
+#include <algorithm>
 #include <chrono>
-#include <random>
+#include <fstream> 
 #include <iomanip>
 #include <iostream>
-#include <fstream> 
-#include <algorithm>
-#include "gp/vfs/vfs.hpp"
+#include <numeric>
+#include <random>
+#include <set>
+#include <stack>
+#include <thread>
 
 
 

tests/math.cpp

@@ -3,11 +3,12 @@
 #include "gp/math.hpp"
 #include "gp/rendering/renderer.hpp"
 #include "gp/rendering/bmp_viewport.hpp"
+
+#include <chrono>
 #include <cmath>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <chrono>
 
 
 struct sin_test : public test_scaffold {

tests/pair_test.cpp

@@ -1,7 +1,8 @@
+#include "gp/pair.hpp"
 #include "test_scaffold.h"
+
 #include <random>
 #include <string>
-#include "gp/pair.hpp"
 
 typedef std::mt19937_64 cheap_rand;
 

tests/quotient_filter.cpp

@@ -1,9 +1,9 @@
+#include "gp/quotient_filter.hpp"
 #include "test_scaffold.h"
+
 #include <random>
 #include <string>
 
-#include "gp/quotient_filter.hpp"
-
 typedef std::mt19937_64 cheap_rand;
 typedef std::mt19937_64 cheap_rand_bis;
 

tests/test_scaffold.h

@@ -1,8 +1,8 @@
 #pragma once
+#include <chrono>
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>
-#include <chrono>
 
 #ifndef NO_BENCH
 #define NO_BENCH 1