From 34788756d2f2dc77ad29e0195efb5eb7061d298a Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Wed, 22 Nov 2017 16:49:37 +1100 Subject: [PATCH] build: don't use './' as an include prefix GCC produces ODR error when including paths of the form './foo' and 'foo' in the same binary. Rather than managing duplication we just universally pick the absolute form over the relative form. --- algo/sort.hpp | 2 +- alloc/affix.cpp | 2 +- alloc/allocator.cpp | 2 +- alloc/allocator.hpp | 2 +- alloc/arena.cpp | 2 +- alloc/arena.hpp | 2 +- alloc/fallback.cpp | 2 +- alloc/linear.cpp | 2 +- alloc/malloc.cpp | 2 +- alloc/null.cpp | 2 +- alloc/stack.cpp | 2 +- ascii.hpp | 2 +- backtrace_execinfo.cpp | 8 ++++---- backtrace_stackwalk.cpp | 8 ++++---- backtrace_win32.cpp | 8 ++++---- bezier.cpp | 10 +++++----- bezier1.cpp | 2 +- bezier2.cpp | 6 +++--- bezier3.cpp | 2 +- cast.hpp | 2 +- cmdopt.cpp | 6 +++--- cmdopt.ipp | 4 ++-- colour.cpp | 10 +++++----- coord/ops.hpp | 4 ++-- crypto/ice.cpp | 2 +- debug.hpp | 4 ++-- debug.ipp | 2 +- debug_posix.cpp | 6 +++--- debug_win32.cpp | 8 ++++---- except.cpp | 6 +++--- exe_linux.cpp | 6 +++--- exe_win32.cpp | 2 +- extent.cpp | 6 +++--- fixed.hpp | 6 +++--- fixup/experimental/filesystem | 2 +- fixup/experimental/filesystem.cpp | 2 +- format.ipp | 6 +++--- geom/aabb.cpp | 4 ++-- geom/iostream.cpp | 4 ++-- geom/iostream.hpp | 2 +- geom/ray.cpp | 6 +++--- hash/adler.cpp | 4 ++-- hash/adler.hpp | 2 +- hash/crc.cpp | 2 +- hash/fletcher.cpp | 2 +- hash/fwd.hpp | 6 +++--- hash/keccak.cpp | 2 +- hash/murmur.hpp | 6 +++--- hash/murmur/murmur2.hpp | 2 +- hash/ripemd.cpp | 2 +- hash/sha1.cpp | 2 +- hash/simple.cpp | 2 +- hash/xxhash.cpp | 8 ++++---- introspection.hpp | 4 ++-- io.hpp | 6 +++--- io_posix.cpp | 2 +- io_posix.ipp | 2 +- io_win32.cpp | 6 +++--- io_win32.hpp | 6 +++--- json/schema.cpp | 6 +++--- json/schema.hpp | 2 +- json/tree.cpp | 6 +++--- json/tree.hpp | 4 ++-- log.hpp | 4 ++-- maths.hpp | 4 ++-- matrix3.cpp | 2 +- memory/buffer/circular.cpp | 2 +- memory/buffer/paged.cpp | 2 +- memory/deleter.cpp | 2 +- memory/system.cpp | 2 +- point.cpp | 4 ++-- pool.ipp | 4 ++-- posix/dir.cpp | 2 +- posix/dir.hpp | 2 +- posix/fd.cpp | 2 +- posix/map.hpp | 2 +- quaternion.cpp | 6 +++--- quaternion.hpp | 2 +- rand/mwc64x.cpp | 2 +- rand/xorshift.cpp | 2 +- region.cpp | 6 +++--- sarray.cpp | 2 +- sarray.hpp | 2 +- string.cpp | 2 +- string.hpp | 2 +- strongdef.cpp | 2 +- term.cpp | 4 ++-- test/exe.cpp | 4 ++-- test/geom/ray.cpp | 8 ++++---- test/iterator.cpp | 4 ++-- test/pool.cpp | 4 ++-- test/stream.cpp | 4 ++-- test/typeidx.cpp | 4 ++-- time.cpp | 4 ++-- time.hpp | 5 +++-- time_posix.cpp | 4 ++-- typeidx.cpp | 2 +- vector.ipp | 2 +- view.cpp | 2 +- view.hpp | 4 ++-- view.ipp | 5 +++-- win32/handle.cpp | 2 +- 102 files changed, 189 insertions(+), 187 deletions(-) diff --git a/algo/sort.hpp b/algo/sort.hpp index 008a40c1..09c07037 100644 --- a/algo/sort.hpp +++ b/algo/sort.hpp @@ -44,6 +44,6 @@ namespace cruft::util::sort { soa (RandomIt key_first, RandomIt key_last, Comparator comp, Args ...values); } -#include "./sort.ipp" +#include "sort.ipp" #endif diff --git a/alloc/affix.cpp b/alloc/affix.cpp index 87f37ba4..26ebd72d 100644 --- a/alloc/affix.cpp +++ b/alloc/affix.cpp @@ -14,7 +14,7 @@ * Copyright 2015 Danny Robson */ -#include "./affix.hpp" +#include "affix.hpp" using util::alloc::affix; diff --git a/alloc/allocator.cpp b/alloc/allocator.cpp index 0747499b..6b898bc5 100644 --- a/alloc/allocator.cpp +++ b/alloc/allocator.cpp @@ -1 +1 @@ -#include "./allocator.hpp" +#include "allocator.hpp" diff --git a/alloc/allocator.hpp b/alloc/allocator.hpp index cca7cfc6..1b4babc0 100644 --- a/alloc/allocator.hpp +++ b/alloc/allocator.hpp @@ -38,6 +38,6 @@ namespace util::alloc { }; } -#include "./allocator.ipp" +#include "allocator.ipp" #endif diff --git a/alloc/arena.cpp b/alloc/arena.cpp index ca065a58..a29f7c79 100644 --- a/alloc/arena.cpp +++ b/alloc/arena.cpp @@ -1 +1 @@ -#include "./arena.hpp" +#include "arena.hpp" diff --git a/alloc/arena.hpp b/alloc/arena.hpp index a61939bb..ddfe9663 100644 --- a/alloc/arena.hpp +++ b/alloc/arena.hpp @@ -66,6 +66,6 @@ namespace util::alloc { }; } -#include "./arena.ipp" +#include "arena.ipp" #endif diff --git a/alloc/fallback.cpp b/alloc/fallback.cpp index 76435d99..fa2fe52e 100644 --- a/alloc/fallback.cpp +++ b/alloc/fallback.cpp @@ -1 +1 @@ -#include "./fallback.hpp" +#include "fallback.hpp" diff --git a/alloc/linear.cpp b/alloc/linear.cpp index cd61b5a3..07f03416 100644 --- a/alloc/linear.cpp +++ b/alloc/linear.cpp @@ -14,7 +14,7 @@ * Copyright 2015 Danny Robson */ -#include "./linear.hpp" +#include "linear.hpp" #include "../pointer.hpp" #include "../debug.hpp" diff --git a/alloc/malloc.cpp b/alloc/malloc.cpp index cc5afd1e..072b1892 100644 --- a/alloc/malloc.cpp +++ b/alloc/malloc.cpp @@ -14,7 +14,7 @@ * Copyright 2015 Danny Robson */ -#include "./malloc.hpp" +#include "malloc.hpp" #include "../debug.hpp" diff --git a/alloc/null.cpp b/alloc/null.cpp index 7e041fa6..4dc80c02 100644 --- a/alloc/null.cpp +++ b/alloc/null.cpp @@ -15,7 +15,7 @@ */ -#include "./null.hpp" +#include "null.hpp" #include "../debug.hpp" diff --git a/alloc/stack.cpp b/alloc/stack.cpp index 3956fd65..95f8a7c2 100644 --- a/alloc/stack.cpp +++ b/alloc/stack.cpp @@ -14,7 +14,7 @@ * Copyright 2015-2016 Danny Robson */ -#include "./stack.hpp" +#include "stack.hpp" #include "../debug.hpp" #include "../pointer.hpp" diff --git a/ascii.hpp b/ascii.hpp index 5f13b77f..61e16bcf 100644 --- a/ascii.hpp +++ b/ascii.hpp @@ -17,7 +17,7 @@ #ifndef __CRUFT_UTIL_ASCII_HPP #define __CRUFT_UTIL_ASCII_HPP -#include "./annotation.hpp" +#include "annotation.hpp" #include #include diff --git a/backtrace_execinfo.cpp b/backtrace_execinfo.cpp index 4bb0c8d4..0c93ecf8 100644 --- a/backtrace_execinfo.cpp +++ b/backtrace_execinfo.cpp @@ -17,10 +17,10 @@ #include "backtrace.hpp" -#include "./debug.hpp" -#include "./exe.hpp" -#include "./io.hpp" -#include "./cast.hpp" +#include "debug.hpp" +#include "exe.hpp" +#include "io.hpp" +#include "cast.hpp" #include #include diff --git a/backtrace_stackwalk.cpp b/backtrace_stackwalk.cpp index d744877e..2cd14020 100644 --- a/backtrace_stackwalk.cpp +++ b/backtrace_stackwalk.cpp @@ -14,11 +14,11 @@ * Copyright 2016 Danny Robson */ -#include "./backtrace.hpp" +#include "backtrace.hpp" -#include "./debug.hpp" -#include "./except.hpp" -#include "./types.hpp" +#include "debug.hpp" +#include "except.hpp" +#include "types.hpp" #include #include diff --git a/backtrace_win32.cpp b/backtrace_win32.cpp index ae5470a0..378ac7c6 100644 --- a/backtrace_win32.cpp +++ b/backtrace_win32.cpp @@ -15,11 +15,11 @@ * 2012-2016, Danny Robson */ -#include "./backtrace.hpp" +#include "backtrace.hpp" -#include "./win32/handle.hpp" -#include "./debug.hpp" -#include "./except.hpp" +#include "win32/handle.hpp" +#include "debug.hpp" +#include "except.hpp" #include #include diff --git a/bezier.cpp b/bezier.cpp index 0966a416..b02319ea 100644 --- a/bezier.cpp +++ b/bezier.cpp @@ -14,12 +14,12 @@ * Copyright 2015-2016 Danny Robson */ -#include "./bezier.hpp" +#include "bezier.hpp" -#include "./debug.hpp" -#include "./polynomial.hpp" -#include "./stream.hpp" -#include "./coord/iostream.hpp" +#include "debug.hpp" +#include "polynomial.hpp" +#include "stream.hpp" +#include "coord/iostream.hpp" #include #include diff --git a/bezier1.cpp b/bezier1.cpp index b645fbd4..97c280ea 100644 --- a/bezier1.cpp +++ b/bezier1.cpp @@ -14,7 +14,7 @@ * Copyright 2015-2016 Danny Robson */ -#include "./bezier.hpp" +#include "bezier.hpp" #include #include diff --git a/bezier2.cpp b/bezier2.cpp index cb252207..9e6619a2 100644 --- a/bezier2.cpp +++ b/bezier2.cpp @@ -14,10 +14,10 @@ * Copyright 2015-2016 Danny Robson */ -#include "./bezier.hpp" +#include "bezier.hpp" -#include "./polynomial.hpp" -#include "./coord/iostream.hpp" +#include "polynomial.hpp" +#include "coord/iostream.hpp" /////////////////////////////////////////////////////////////////////////////// diff --git a/bezier3.cpp b/bezier3.cpp index f34c7452..0721b924 100644 --- a/bezier3.cpp +++ b/bezier3.cpp @@ -14,7 +14,7 @@ * Copyright 2015-2016 Danny Robson */ -#include "./bezier.hpp" +#include "bezier.hpp" #include "coord/iostream.hpp" diff --git a/cast.hpp b/cast.hpp index 6afc863b..f477c936 100644 --- a/cast.hpp +++ b/cast.hpp @@ -17,7 +17,7 @@ #ifndef __UTIL_CAST_HPP #define __UTIL_CAST_HPP -#include "./debug.hpp" +#include "debug.hpp" #include #include diff --git a/cmdopt.cpp b/cmdopt.cpp index 451e5739..875d9d27 100644 --- a/cmdopt.cpp +++ b/cmdopt.cpp @@ -14,10 +14,10 @@ * Copyright 2013-2016 Danny Robson */ -#include "./cmdopt.hpp" +#include "cmdopt.hpp" -#include "./cast.hpp" -#include "./debug.hpp" +#include "cast.hpp" +#include "debug.hpp" #include #include diff --git a/cmdopt.ipp b/cmdopt.ipp index 047c397a..4153b850 100644 --- a/cmdopt.ipp +++ b/cmdopt.ipp @@ -23,8 +23,8 @@ #include #include -#include "./introspection.hpp" -#include "./iterator.hpp" +#include "introspection.hpp" +#include "iterator.hpp" namespace util::cmdopt { /////////////////////////////////////////////////////////////////////////// diff --git a/colour.cpp b/colour.cpp index ff11cb4b..a38567fb 100644 --- a/colour.cpp +++ b/colour.cpp @@ -14,12 +14,12 @@ * Copyright 2010-2017 Danny Robson */ -#include "./colour.hpp" +#include "colour.hpp" -#include "./ascii.hpp" -#include "./debug.hpp" -#include "./log.hpp" -#include "./range.hpp" +#include "ascii.hpp" +#include "debug.hpp" +#include "log.hpp" +#include "range.hpp" #include #include diff --git a/coord/ops.hpp b/coord/ops.hpp index 52cab527..9d6a36ab 100644 --- a/coord/ops.hpp +++ b/coord/ops.hpp @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright 2012-2016 Danny Robson + * Copyright 2012-2017 Danny Robson */ #ifndef __UTIL_COORDS_OPS #define __UTIL_COORDS_OPS -#include "./fwd.hpp" +#include "fwd.hpp" #include "../debug.hpp" #include "../maths.hpp" diff --git a/crypto/ice.cpp b/crypto/ice.cpp index ac5f2501..31dcf769 100644 --- a/crypto/ice.cpp +++ b/crypto/ice.cpp @@ -21,7 +21,7 @@ // Software Encryption - Fourth International Workshop, Haifa, Israel, // Springer-Verlag, pp. 69-82, 1997 -#include "./ice.hpp" +#include "ice.hpp" #include "../endian.hpp" #include "../debug.hpp" diff --git a/debug.hpp b/debug.hpp index e111ce48..82ca9585 100644 --- a/debug.hpp +++ b/debug.hpp @@ -391,14 +391,14 @@ namespace util::debug { } -#include "./debug.ipp" +#include "debug.ipp" /////////////////////////////////////////////////////////////////////////////// // XXX: maths needs to be included so that CHECK_EQ/NEQ can call almost_equal, // but maths.hpp might be using CHECK_ macros so we must include maths.hpp // after we define the CHECK_ macros so the preprocessor can resolve them. -#include "./maths.hpp" +#include "maths.hpp" #endif // __DEBUG_HPP diff --git a/debug.ipp b/debug.ipp index 5371c2e0..15da902a 100644 --- a/debug.ipp +++ b/debug.ipp @@ -20,7 +20,7 @@ #define __UTIL_DEBUG_IPP -#include "./format.hpp" +#include "format.hpp" #include diff --git a/debug_posix.cpp b/debug_posix.cpp index 12348312..93db5332 100644 --- a/debug_posix.cpp +++ b/debug_posix.cpp @@ -15,16 +15,16 @@ * 2011-2016, Danny Robson */ -#include "./debug.hpp" +#include "debug.hpp" -#include "./log.hpp" +#include "log.hpp" +#include "platform.hpp" #include #include #include #include -#include "./platform.hpp" #if defined(PLATFORM_FREEBSD) #define PTRACE_ATTACH PT_ATTACH diff --git a/debug_win32.cpp b/debug_win32.cpp index 5f10357b..bc785ed0 100644 --- a/debug_win32.cpp +++ b/debug_win32.cpp @@ -14,11 +14,11 @@ * Copyright 2016 Danny Robson */ -#include "./debug.hpp" +#include "debug.hpp" -#include "./except.hpp" -#include "./log.hpp" -#include "./except.hpp" +#include "except.hpp" +#include "log.hpp" +#include "except.hpp" #include #include diff --git a/except.cpp b/except.cpp index d902c840..11887d50 100644 --- a/except.cpp +++ b/except.cpp @@ -14,10 +14,10 @@ * Copyright 2010 Danny Robson */ -#include "./except.hpp" +#include "except.hpp" -#include "./debug.hpp" -#include "./platform.hpp" +#include "debug.hpp" +#include "platform.hpp" #include #include diff --git a/exe_linux.cpp b/exe_linux.cpp index a7f02317..6a29de99 100644 --- a/exe_linux.cpp +++ b/exe_linux.cpp @@ -14,10 +14,10 @@ * Copyright 2010-2016 Danny Robson */ -#include "./exe.hpp" +#include "exe.hpp" -#include "./except.hpp" -#include "./cast.hpp" +#include "except.hpp" +#include "cast.hpp" #include #include diff --git a/exe_win32.cpp b/exe_win32.cpp index ca0f832e..b67f69d9 100644 --- a/exe_win32.cpp +++ b/exe_win32.cpp @@ -14,7 +14,7 @@ * Copyright 2010-2016 Danny Robson */ -#include "./exe.hpp" +#include "exe.hpp" #include "except.hpp" diff --git a/extent.cpp b/extent.cpp index 03b4becb..5da4f70f 100644 --- a/extent.cpp +++ b/extent.cpp @@ -14,10 +14,10 @@ * Copyright 2010-2016 Danny Robson */ -#include "./extent.hpp" +#include "extent.hpp" -#include "./debug.hpp" -#include "./maths.hpp" +#include "debug.hpp" +#include "maths.hpp" #include #include diff --git a/fixed.hpp b/fixed.hpp index 5f6d7fca..7b025b7d 100644 --- a/fixed.hpp +++ b/fixed.hpp @@ -17,9 +17,9 @@ #ifndef __UTIL_FIXED_HPP #define __UTIL_FIXED_HPP -#include "./types/bits.hpp" -#include "./maths.hpp" -#include "./endian.hpp" +#include "types/bits.hpp" +#include "maths.hpp" +#include "endian.hpp" #include diff --git a/fixup/experimental/filesystem b/fixup/experimental/filesystem index 375196f7..b342cdce 100644 --- a/fixup/experimental/filesystem +++ b/fixup/experimental/filesystem @@ -1 +1 @@ -#include "./filesystem.hpp" +#include "filesystem.hpp" diff --git a/fixup/experimental/filesystem.cpp b/fixup/experimental/filesystem.cpp index 4ad7156f..bd890218 100644 --- a/fixup/experimental/filesystem.cpp +++ b/fixup/experimental/filesystem.cpp @@ -14,7 +14,7 @@ * Copyright 2016 Danny Robson */ -#include "./filesystem.hpp" +#include "filesystem.hpp" #include "../../except.hpp" diff --git a/format.ipp b/format.ipp index a8258323..1d0048d5 100644 --- a/format.ipp +++ b/format.ipp @@ -14,9 +14,9 @@ * Copyright 2015-2016 Danny Robson */ -#include "./ascii.hpp" -#include "./debug.hpp" -#include "./maths.hpp" +#include "ascii.hpp" +#include "debug.hpp" +#include "maths.hpp" #include #include diff --git a/geom/aabb.cpp b/geom/aabb.cpp index b2601671..2aa1052a 100644 --- a/geom/aabb.cpp +++ b/geom/aabb.cpp @@ -15,9 +15,9 @@ */ -#include "./aabb.hpp" +#include "aabb.hpp" -#include "./iostream.hpp" +#include "iostream.hpp" #include "../coord/iostream.hpp" #include "../debug.hpp" diff --git a/geom/iostream.cpp b/geom/iostream.cpp index bc5add01..625b30e4 100644 --- a/geom/iostream.cpp +++ b/geom/iostream.cpp @@ -14,9 +14,9 @@ * Copyright 2015 Danny Robson */ -#include "./iostream.hpp" +#include "iostream.hpp" -#include "./sphere.hpp" +#include "sphere.hpp" #include "../coord/iostream.hpp" diff --git a/geom/iostream.hpp b/geom/iostream.hpp index 507aecab..ffe348b9 100644 --- a/geom/iostream.hpp +++ b/geom/iostream.hpp @@ -17,7 +17,7 @@ #ifndef __UTIL_GEOM_IOSTREAM_HPP #define __UTIL_GEOM_IOSTREAM_HPP -#include "./fwd.hpp" +#include "fwd.hpp" #include diff --git a/geom/ray.cpp b/geom/ray.cpp index 41fa0d76..60252f1d 100644 --- a/geom/ray.cpp +++ b/geom/ray.cpp @@ -14,10 +14,10 @@ * Copyright 2015 Danny Robson */ -#include "./ray.hpp" +#include "ray.hpp" -#include "./iostream.hpp" -#include "./ops.hpp" +#include "iostream.hpp" +#include "ops.hpp" #include "../coord/iostream.hpp" #include "../debug.hpp" diff --git a/hash/adler.cpp b/hash/adler.cpp index 8a1102ec..d9f93dbe 100644 --- a/hash/adler.cpp +++ b/hash/adler.cpp @@ -14,9 +14,9 @@ * Copyright 2010-2014 Danny Robson */ -#include "./adler.hpp" +#include "adler.hpp" -#include "./fletcher.hpp" +#include "fletcher.hpp" #include "../debug.hpp" static constexpr unsigned MODULUS = 65521; diff --git a/hash/adler.hpp b/hash/adler.hpp index f233ecd7..37bb6fe3 100644 --- a/hash/adler.hpp +++ b/hash/adler.hpp @@ -17,7 +17,7 @@ #ifndef __UTIL_HASH_ADLER_HPP #define __UTIL_HASH_ADLER_HPP -#include "./fletcher.hpp" +#include "fletcher.hpp" #include diff --git a/hash/crc.cpp b/hash/crc.cpp index 38398e67..ebefc88b 100644 --- a/hash/crc.cpp +++ b/hash/crc.cpp @@ -14,7 +14,7 @@ * Copyright 2011 Danny Robson */ -#include "./crc.hpp" +#include "crc.hpp" #include "../bitwise.hpp" #include "../debug.hpp" diff --git a/hash/fletcher.cpp b/hash/fletcher.cpp index a29dac95..e8a05125 100644 --- a/hash/fletcher.cpp +++ b/hash/fletcher.cpp @@ -15,7 +15,7 @@ */ -#include "./fletcher.hpp" +#include "fletcher.hpp" #include "../debug.hpp" diff --git a/hash/fwd.hpp b/hash/fwd.hpp index b4fd9bee..90c97b43 100644 --- a/hash/fwd.hpp +++ b/hash/fwd.hpp @@ -21,9 +21,9 @@ // directly, and are unlikely to change given their inherent // lightweight nature. -#include "./fasthash.hpp" -#include "./fnv1a.hpp" -#include "./murmur.hpp" +#include "fasthash.hpp" +#include "fnv1a.hpp" +#include "murmur.hpp" // Forward declerations of class based hashes diff --git a/hash/keccak.cpp b/hash/keccak.cpp index 224c4116..c0936fec 100644 --- a/hash/keccak.cpp +++ b/hash/keccak.cpp @@ -1,4 +1,4 @@ -#include "./keccak.hpp" +#include "keccak.hpp" #include "../endian.hpp" #include "../maths.hpp" diff --git a/hash/murmur.hpp b/hash/murmur.hpp index 6d774264..6a4d5931 100644 --- a/hash/murmur.hpp +++ b/hash/murmur.hpp @@ -17,8 +17,8 @@ #ifndef __UTIL_HASH_MURMUR_HPP #define __UTIL_HASH_MURMUR_HPP -#include "./murmur/murmur1.hpp" -#include "./murmur/murmur2.hpp" -#include "./murmur/murmur3.hpp" +#include "murmur/murmur1.hpp" +#include "murmur/murmur2.hpp" +#include "murmur/murmur3.hpp" #endif diff --git a/hash/murmur/murmur2.hpp b/hash/murmur/murmur2.hpp index 721e148c..6f41da26 100644 --- a/hash/murmur/murmur2.hpp +++ b/hash/murmur/murmur2.hpp @@ -31,7 +31,7 @@ namespace util::hash::murmur2 { uint64_t hash_64 (const void *restrict data, size_t len, uint64_t seed); } -#include "./murmur2.ipp" +#include "murmur2.ipp" #endif diff --git a/hash/ripemd.cpp b/hash/ripemd.cpp index 369561a2..49510100 100644 --- a/hash/ripemd.cpp +++ b/hash/ripemd.cpp @@ -15,7 +15,7 @@ * 2014, Danny Robson */ -#include "./ripemd.hpp" +#include "ripemd.hpp" #include "../debug.hpp" #include "../bitwise.hpp" diff --git a/hash/sha1.cpp b/hash/sha1.cpp index 3f26a780..331056ad 100644 --- a/hash/sha1.cpp +++ b/hash/sha1.cpp @@ -14,7 +14,7 @@ * Copyright 2013 Danny Robson */ -#include "./sha1.hpp" +#include "sha1.hpp" #include "../bitwise.hpp" #include "../debug.hpp" diff --git a/hash/simple.cpp b/hash/simple.cpp index 20ee090a..22eb18a3 100644 --- a/hash/simple.cpp +++ b/hash/simple.cpp @@ -14,4 +14,4 @@ * Copyright 2016, Danny Robson */ -#include "./simple.hpp" +#include "simple.hpp" diff --git a/hash/xxhash.cpp b/hash/xxhash.cpp index 465cc640..87767f0f 100644 --- a/hash/xxhash.cpp +++ b/hash/xxhash.cpp @@ -14,11 +14,11 @@ * Copyright 2016 Danny Robson */ -#include "./xxhash.hpp" +#include "xxhash.hpp" -#include "./debug.hpp" -#include "./bitwise.hpp" -#include "./endian.hpp" +#include "../bitwise.hpp" +#include "../debug.hpp" +#include "../endian.hpp" using util::hash::xxhash; diff --git a/introspection.hpp b/introspection.hpp index 4aeab3f6..38bff553 100644 --- a/introspection.hpp +++ b/introspection.hpp @@ -17,8 +17,8 @@ #ifndef __UTIL_INTROSPECTION_HPP #define __UTIL_INTROSPECTION_HPP -#include "./preprocessor.hpp" -#include "./variadic.hpp" +#include "preprocessor.hpp" +#include "variadic.hpp" #include #include diff --git a/io.hpp b/io.hpp index 521109b5..36cd14e2 100644 --- a/io.hpp +++ b/io.hpp @@ -116,11 +116,11 @@ namespace util { } #ifdef PLATFORM_WIN32 -#include "./io_win32.hpp" +#include "io_win32.hpp" #else -#include "./io_posix.hpp" +#include "io_posix.hpp" #endif -#include "./io.ipp" +#include "io.ipp" #endif diff --git a/io_posix.cpp b/io_posix.cpp index f4b612d0..9bca4ce4 100644 --- a/io_posix.cpp +++ b/io_posix.cpp @@ -16,10 +16,10 @@ #include "io.hpp" +#include "cast.hpp" #include "debug.hpp" #include "except.hpp" #include "posix/fd.hpp" -#include "./cast.hpp" #include diff --git a/io_posix.ipp b/io_posix.ipp index d6814682..2e66c300 100644 --- a/io_posix.ipp +++ b/io_posix.ipp @@ -20,7 +20,7 @@ #define __UTIL_IO_POSIX_IPP -#include "./pointer.hpp" +#include "pointer.hpp" /////////////////////////////////////////////////////////////////////////////// diff --git a/io_win32.cpp b/io_win32.cpp index 521c2fdd..bd08b1a2 100644 --- a/io_win32.cpp +++ b/io_win32.cpp @@ -14,10 +14,10 @@ * Copyright 2014 Danny Robson */ -#include "./io_win32.hpp" +#include "io_win32.hpp" -#include "./debug.hpp" -#include "./except.hpp" +#include "debug.hpp" +#include "except.hpp" #include diff --git a/io_win32.hpp b/io_win32.hpp index 079da417..eef0e3b8 100644 --- a/io_win32.hpp +++ b/io_win32.hpp @@ -17,9 +17,9 @@ #ifndef __UTIL_IO_WIN32_HPP #define __UTIL_IO_WIN32_HPP -#include "./io.hpp" -#include "./win32/handle.hpp" -#include "./view.hpp" +#include "io.hpp" +#include "win32/handle.hpp" +#include "view.hpp" #include #include diff --git a/json/schema.cpp b/json/schema.cpp index 172c1de6..aff1afc0 100644 --- a/json/schema.cpp +++ b/json/schema.cpp @@ -14,10 +14,10 @@ * Copyright 2015 Danny Robson */ -#include "./schema.hpp" +#include "schema.hpp" -#include "./tree.hpp" -#include "./except.hpp" +#include "tree.hpp" +#include "except.hpp" #include "../io.hpp" #include "../maths.hpp" diff --git a/json/schema.hpp b/json/schema.hpp index 6522d85c..4398bf1d 100644 --- a/json/schema.hpp +++ b/json/schema.hpp @@ -17,7 +17,7 @@ #ifndef __UTIL_JSON_SCHEMA_HPP #define __UTIL_JSON_SCHEMA_HPP -#include "./fwd.hpp" +#include "fwd.hpp" #include diff --git a/json/tree.cpp b/json/tree.cpp index 770511cb..40b4055f 100644 --- a/json/tree.cpp +++ b/json/tree.cpp @@ -15,10 +15,10 @@ */ -#include "./tree.hpp" +#include "tree.hpp" -#include "./except.hpp" -#include "./flat.hpp" +#include "except.hpp" +#include "flat.hpp" #include "../debug.hpp" #include "../io.hpp" diff --git a/json/tree.hpp b/json/tree.hpp index 8cf3708f..1ac06a3e 100644 --- a/json/tree.hpp +++ b/json/tree.hpp @@ -17,8 +17,8 @@ #ifndef __UTIL_JSON_TREE_HPP #define __UTIL_JSON_TREE_HPP -#include "./flat.hpp" -#include "./fwd.hpp" +#include "flat.hpp" +#include "fwd.hpp" #include "../iterator.hpp" #include "../view.hpp" diff --git a/log.hpp b/log.hpp index aa30788c..b41ee7af 100644 --- a/log.hpp +++ b/log.hpp @@ -17,8 +17,8 @@ #ifndef __UTIL_LOG_HPP #define __UTIL_LOG_HPP -#include "./nocopy.hpp" -#include "./preprocessor.hpp" +#include "nocopy.hpp" +#include "preprocessor.hpp" #include #include diff --git a/maths.hpp b/maths.hpp index 9e8e9f35..5ad376bc 100644 --- a/maths.hpp +++ b/maths.hpp @@ -21,8 +21,8 @@ // it triggers a circular dependency; debug -> format -> maths -> debug // instead, just use cassert -#include "./types/traits.hpp" -#include "./float.hpp" +#include "types/traits.hpp" +#include "float.hpp" #include #include diff --git a/matrix3.cpp b/matrix3.cpp index 64b0b678..d4398a20 100644 --- a/matrix3.cpp +++ b/matrix3.cpp @@ -14,7 +14,7 @@ * Copyright 2015 Danny Robson */ -#include "./matrix.hpp" +#include "matrix.hpp" using util::matrix; diff --git a/memory/buffer/circular.cpp b/memory/buffer/circular.cpp index 457db4fe..a091a667 100644 --- a/memory/buffer/circular.cpp +++ b/memory/buffer/circular.cpp @@ -14,7 +14,7 @@ * Copyright 2015 Danny Robson */ -#include "./circular.hpp" +#include "circular.hpp" #include "../system.hpp" #include "../../debug.hpp" diff --git a/memory/buffer/paged.cpp b/memory/buffer/paged.cpp index 5d937e90..3a141de7 100644 --- a/memory/buffer/paged.cpp +++ b/memory/buffer/paged.cpp @@ -14,7 +14,7 @@ * Copyright 2015 Danny Robson */ -#include "./paged.hpp" +#include "paged.hpp" #include "../system.hpp" #include "../../except.hpp" diff --git a/memory/deleter.cpp b/memory/deleter.cpp index 9ec8d645..9b30b0e6 100644 --- a/memory/deleter.cpp +++ b/memory/deleter.cpp @@ -14,7 +14,7 @@ * Copyright 2015 Danny Robson */ -#include "./deleter.hpp" +#include "deleter.hpp" using util::memory::owner_deleter; diff --git a/memory/system.cpp b/memory/system.cpp index a06b610b..acf4eefb 100644 --- a/memory/system.cpp +++ b/memory/system.cpp @@ -14,7 +14,7 @@ * Copyright 2015 Danny Robson */ -#include "./system.hpp" +#include "system.hpp" #include "../except.hpp" #include "../cast.hpp" diff --git a/point.cpp b/point.cpp index fc1bef83..bbda9bc6 100644 --- a/point.cpp +++ b/point.cpp @@ -14,9 +14,9 @@ * Copyright 2011-2016 Danny Robson */ -#include "./point.hpp" +#include "point.hpp" -#include "./debug.hpp" +#include "debug.hpp" #include diff --git a/pool.ipp b/pool.ipp index ea02ac98..34a53f1f 100644 --- a/pool.ipp +++ b/pool.ipp @@ -20,12 +20,12 @@ #define __UTIL_POOL_IPP +#include "debug.hpp" + #include #include #include -#include "./debug.hpp" - namespace util { //------------------------------------------------------------------------- diff --git a/posix/dir.cpp b/posix/dir.cpp index 2c48ad6c..e8e3fce6 100644 --- a/posix/dir.cpp +++ b/posix/dir.cpp @@ -14,7 +14,7 @@ * Copyright 2015 Danny Robson */ -#include "./dir.hpp" +#include "dir.hpp" #include "../except.hpp" diff --git a/posix/dir.hpp b/posix/dir.hpp index d27d6d68..8476a12e 100644 --- a/posix/dir.hpp +++ b/posix/dir.hpp @@ -48,6 +48,6 @@ namespace util::posix { }; } -#include "./dir.ipp" +#include "dir.ipp" #endif diff --git a/posix/fd.cpp b/posix/fd.cpp index 8d16dbc4..9bee1779 100644 --- a/posix/fd.cpp +++ b/posix/fd.cpp @@ -14,7 +14,7 @@ * Copyright 2016 Danny Robson */ -#include "./fd.hpp" +#include "fd.hpp" #include "../except.hpp" diff --git a/posix/map.hpp b/posix/map.hpp index b3a51e9b..33fbd133 100644 --- a/posix/map.hpp +++ b/posix/map.hpp @@ -17,7 +17,7 @@ #ifndef __CRUFT_UTIL_POSIX_HPP #define __CRUFT_UTIL_POSIX_HPP -#include "./fd.hpp" +#include "fd.hpp" #include #include diff --git a/quaternion.cpp b/quaternion.cpp index b868aa60..3d0d7975 100644 --- a/quaternion.cpp +++ b/quaternion.cpp @@ -15,10 +15,10 @@ */ -#include "./quaternion.hpp" +#include "quaternion.hpp" -#include "./debug.hpp" -#include "./vector.hpp" +#include "debug.hpp" +#include "vector.hpp" #include diff --git a/quaternion.hpp b/quaternion.hpp index d1897ea8..52eea91a 100644 --- a/quaternion.hpp +++ b/quaternion.hpp @@ -126,6 +126,6 @@ namespace util { operator<< (std::ostream&, quaternion); } -#include "./quaternion.ipp" +#include "quaternion.ipp" #endif diff --git a/rand/mwc64x.cpp b/rand/mwc64x.cpp index 07aaaf3c..0a0a2274 100644 --- a/rand/mwc64x.cpp +++ b/rand/mwc64x.cpp @@ -15,7 +15,7 @@ */ -#include "./mwc64x.hpp" +#include "mwc64x.hpp" #include "../debug.hpp" diff --git a/rand/xorshift.cpp b/rand/xorshift.cpp index df1f1c42..d38c42b0 100644 --- a/rand/xorshift.cpp +++ b/rand/xorshift.cpp @@ -14,7 +14,7 @@ * Copyright 2015-2016 Danny Robson */ -#include "./xorshift.hpp" +#include "xorshift.hpp" #include "../debug.hpp" diff --git a/region.cpp b/region.cpp index df6b3a5b..39def184 100644 --- a/region.cpp +++ b/region.cpp @@ -15,11 +15,11 @@ */ -#include "./region.hpp" +#include "region.hpp" -#include "./debug.hpp" +#include "debug.hpp" -#include "./coord/iostream.hpp" +#include "coord/iostream.hpp" #include diff --git a/sarray.cpp b/sarray.cpp index 287fb71c..2aad7134 100644 --- a/sarray.cpp +++ b/sarray.cpp @@ -14,4 +14,4 @@ * Copyright 2017 Danny Robson */ -#include "./sarray.hpp" +#include "sarray.hpp" diff --git a/sarray.hpp b/sarray.hpp index 377deeb5..57b6f359 100644 --- a/sarray.hpp +++ b/sarray.hpp @@ -17,7 +17,7 @@ #ifndef CRUFT_UTIL_SARRAY_HPP #define CRUFT_UTIL_SARRAY_HPP -#include "./iterator.hpp" +#include "iterator.hpp" #include #include diff --git a/string.cpp b/string.cpp index 34423493..8367347a 100644 --- a/string.cpp +++ b/string.cpp @@ -14,7 +14,7 @@ * Copyright 2011-2016 Danny Robson */ -#include "./string.hpp" +#include "string.hpp" #include #include diff --git a/string.hpp b/string.hpp index d7c9434e..c93f809a 100644 --- a/string.hpp +++ b/string.hpp @@ -17,7 +17,7 @@ #ifndef __UTIL_STRING_HPP #define __UTIL_STRING_HPP -#include "./view.hpp" +#include "view.hpp" namespace util { diff --git a/strongdef.cpp b/strongdef.cpp index 4d7a888c..1c591def 100644 --- a/strongdef.cpp +++ b/strongdef.cpp @@ -14,7 +14,7 @@ * Copyright 2015 Danny Robson */ -#include "./strongdef.hpp" +#include "strongdef.hpp" using util::strongdef; diff --git a/term.cpp b/term.cpp index 78ed2316..cbc87074 100644 --- a/term.cpp +++ b/term.cpp @@ -14,9 +14,9 @@ * Copyright 2016-2017 Danny Robson */ -#include "./term.hpp" +#include "term.hpp" -#include "./string.hpp" +#include "string.hpp" #include #include diff --git a/test/exe.cpp b/test/exe.cpp index 1f909382..8ab1c909 100644 --- a/test/exe.cpp +++ b/test/exe.cpp @@ -1,6 +1,6 @@ -#include "./tap.hpp" +#include "../tap.hpp" -#include "./exe.hpp" +#include "../exe.hpp" #include diff --git a/test/geom/ray.cpp b/test/geom/ray.cpp index 45d989e4..495cdb96 100644 --- a/test/geom/ray.cpp +++ b/test/geom/ray.cpp @@ -1,7 +1,7 @@ -#include "geom/aabb.hpp" -#include "geom/plane.hpp" -#include "geom/ray.hpp" -#include "tap.hpp" +#include "../../geom/aabb.hpp" +#include "../../geom/plane.hpp" +#include "../../geom/ray.hpp" +#include "../../tap.hpp" using util::geom::ray2f; using util::geom::ray3f; diff --git a/test/iterator.cpp b/test/iterator.cpp index 78760608..a1bc50a6 100644 --- a/test/iterator.cpp +++ b/test/iterator.cpp @@ -1,6 +1,6 @@ -#include "tap.hpp" +#include "../tap.hpp" -#include "./iterator.hpp" +#include "../iterator.hpp" #include #include diff --git a/test/pool.cpp b/test/pool.cpp index 81c412e4..b26809ee 100644 --- a/test/pool.cpp +++ b/test/pool.cpp @@ -1,6 +1,6 @@ -#include "pool.hpp" +#include "../pool.hpp" -#include "tap.hpp" +#include "../tap.hpp" #include #include diff --git a/test/stream.cpp b/test/stream.cpp index 320ef3ff..bce8204f 100644 --- a/test/stream.cpp +++ b/test/stream.cpp @@ -1,6 +1,6 @@ -#include "tap.hpp" +#include "../tap.hpp" -#include "stream.hpp" +#include "../stream.hpp" /////////////////////////////////////////////////////////////////////////////// diff --git a/test/typeidx.cpp b/test/typeidx.cpp index ed3ae9bf..c6b26403 100644 --- a/test/typeidx.cpp +++ b/test/typeidx.cpp @@ -1,6 +1,6 @@ -#include "tap.hpp" +#include "../tap.hpp" -#include "./typeidx.hpp" +#include "../typeidx.hpp" /////////////////////////////////////////////////////////////////////////////// diff --git a/time.cpp b/time.cpp index fba55178..6086b319 100644 --- a/time.cpp +++ b/time.cpp @@ -14,9 +14,9 @@ * Copyright 2010-2016 Danny Robson */ -#include "./time.hpp" +#include "time.hpp" -#include "./log.hpp" +#include "log.hpp" #include diff --git a/time.hpp b/time.hpp index 5fcca2b6..60c12b1a 100644 --- a/time.hpp +++ b/time.hpp @@ -17,11 +17,12 @@ #ifndef __UTIL_TIME_HPP #define __UTIL_TIME_HPP +#include "stats.hpp" + #include #include #include -#include "./stats.hpp" namespace util { // ------------------------------------------------------------------------ @@ -89,6 +90,6 @@ namespace util { }; } -#include "./time.ipp" +#include "time.ipp" #endif // __UTIL_TIME_HPP diff --git a/time_posix.cpp b/time_posix.cpp index 43b496b4..7805fad2 100644 --- a/time_posix.cpp +++ b/time_posix.cpp @@ -14,9 +14,9 @@ * Copyright 2010-2016 Danny Robson */ -#include "./time.hpp" +#include "time.hpp" -#include "./cast.hpp" +#include "cast.hpp" #include diff --git a/typeidx.cpp b/typeidx.cpp index 3231bd10..03b0fd59 100644 --- a/typeidx.cpp +++ b/typeidx.cpp @@ -14,7 +14,7 @@ * Copyright 2017 Danny Robson */ -#include "./typeidx.hpp" +#include "typeidx.hpp" /////////////////////////////////////////////////////////////////////////////// diff --git a/vector.ipp b/vector.ipp index 5d2add75..a390fd7e 100644 --- a/vector.ipp +++ b/vector.ipp @@ -20,7 +20,7 @@ #define __UTIL_VECTOR_IPP #endif -#include "./maths.hpp" +#include "maths.hpp" /////////////////////////////////////////////////////////////////////////////// diff --git a/view.cpp b/view.cpp index 40d011dd..1a4d49a2 100644 --- a/view.cpp +++ b/view.cpp @@ -14,7 +14,7 @@ * Copyright 2016 Danny Robson */ -#include "./view.hpp" +#include "view.hpp" #include diff --git a/view.hpp b/view.hpp index 4072e598..432757e3 100644 --- a/view.hpp +++ b/view.hpp @@ -18,7 +18,7 @@ #ifndef __UTIL_VIEW_HPP #define __UTIL_VIEW_HPP -#include "./types/traits.hpp" +#include "types/traits.hpp" #include #include @@ -133,6 +133,6 @@ namespace util { operator<< (std::ostream&, view); } -#include "./view.ipp" +#include "view.ipp" #endif diff --git a/view.ipp b/view.ipp index dc42b71b..e7e122c8 100644 --- a/view.ipp +++ b/view.ipp @@ -20,9 +20,10 @@ #endif #define __UTIL_VIEW_IPP +#include "view.hpp" -#include "./debug.hpp" -#include "./iterator.hpp" +#include "debug.hpp" +#include "iterator.hpp" /////////////////////////////////////////////////////////////////////////////// diff --git a/win32/handle.cpp b/win32/handle.cpp index 9fff2ec7..bfe73aa4 100644 --- a/win32/handle.cpp +++ b/win32/handle.cpp @@ -1,4 +1,4 @@ -#include "./handle.hpp" +#include "handle.hpp" #include "../except.hpp"