make header paths more explicit

geom/aabb.cpp

@@ -15,8 +15,8 @@
  */
 
 
-#include "aabb.hpp"
+#include "./aabb.hpp"
-#include "debug.hpp"
+#include "../debug.hpp"
 
 using util::geom::AABB;
 

geom/plane.cpp

@@ -17,12 +17,12 @@
 
 #include "plane.hpp"
 
-#include "debug.hpp"
+#include "../debug.hpp"
 
 using util::geom::plane;
 
 
-//-----------------------------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////////
 template <size_t S, typename T>
 plane<S,T>::plane (point<S,T>  _p,
                    vector<S,T> _n):
@@ -33,6 +33,6 @@ plane<S,T>::plane (point<S,T>  _p,
 }
 
 
-//-----------------------------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////////
 template struct util::geom::plane<2,float>;
 template struct util::geom::plane<3,float>;

hash/adler.cpp

@@ -14,10 +14,10 @@
  * Copyright 2010-2014 Danny Robson <danny@nerdcruft.net>
  */
 
-#include "adler.hpp"
+#include "./adler.hpp"
 
-#include "debug.hpp"
+#include "./fletcher.hpp"
-#include "fletcher.hpp"
+#include "../debug.hpp"
 
 static const unsigned MODULUS = 65521;
 

hash/crc.cpp

@@ -14,10 +14,10 @@
  * Copyright 2011 Danny Robson <danny@nerdcruft.net>
  */
 
-#include "crc.hpp"
+#include "./crc.hpp"
 
-#include "debug.hpp"
+#include "../endian.hpp"
-#include "endian.hpp"
+#include "../debug.hpp"
 
 uint32_t
 crc32 (const void *restrict, size_t) {

hash/fletcher.hpp

@@ -17,12 +17,13 @@
 #ifndef __UTIL_FLETCHER_HPP
 #define __UTIL_FLETCHER_HPP
 
-#include "types/bits.hpp"
+#include "../types/bits.hpp"
 
 #include <cstdint>
 #include <cstdlib>
 
 
+///////////////////////////////////////////////////////////////////////////////
 template <
     unsigned OUTPUT,
     unsigned MODULUS,

hash/hmac.cpp

@@ -16,7 +16,7 @@
 
 #include "hmac.hpp"
 
-#include "debug.hpp"
+#include "../debug.hpp"
 
 #include <algorithm>
 

hash/md2.cpp

@@ -16,13 +16,14 @@
 
 #include "md2.hpp"
 
-#include "types.hpp"
+#include "../types.hpp"
 
 #include <array>
 #include <algorithm>
 #include <cstring>
 
 
+///////////////////////////////////////////////////////////////////////////////
 using util::hash::MD2;
 
 using std::array;
@@ -31,6 +32,7 @@ using std::end;
 using std::fill;
 
 
+///////////////////////////////////////////////////////////////////////////////
 static array<uint8_t,256> S = { {
      41,  46,  67, 201, 162, 216, 124,   1,  61,  54,  84, 161, 236, 240,   6,  19,
      98, 167,   5, 243, 192, 199, 115, 140, 152, 147,  43, 217, 188,  76, 130, 202,
@@ -51,12 +53,14 @@ static array<uint8_t,256> S = { {
 } };
 
 
+///////////////////////////////////////////////////////////////////////////////
 MD2::MD2 ()
 {
     reset ();
 }
 
 
+//-----------------------------------------------------------------------------
 void
 MD2::reset (void) {
     m_total = 0;
@@ -65,14 +69,18 @@ MD2::reset (void) {
 }
 
 
+//-----------------------------------------------------------------------------
 void
 MD2::update (const void *data, size_t size)
     { update (static_cast<const uint8_t*> (data), size); }
 
 
+//-----------------------------------------------------------------------------
 static const size_t M_OFFSET = 16;
 static const size_t M_LENGTH = 16;
 
+
+//-----------------------------------------------------------------------------
 void
 MD2::update (const uint8_t *data, size_t size) {
     uint8_t *M = X + M_OFFSET;
@@ -104,6 +112,7 @@ MD2::update (const uint8_t *data, size_t size) {
 }
 
 
+//-----------------------------------------------------------------------------
 MD2::digest_t
 MD2::digest (void) const {
     digest_t d;
@@ -112,6 +121,7 @@ MD2::digest (void) const {
 }
 
 
+//-----------------------------------------------------------------------------
 void
 MD2::transform (void) {
     uint8_t *M = X + M_OFFSET;

hash/md4.cpp

@@ -16,9 +16,9 @@
 
 #include "md4.hpp"
 
-#include "bitwise.hpp"
+#include "../bitwise.hpp"
-#include "types.hpp"
+#include "../types.hpp"
-#include "endian.hpp"
+#include "../endian.hpp"
 
 #include <cstring>
 

hash/md5.cpp

@@ -16,7 +16,7 @@
 
 #include "md5.hpp"
 
-#include "bitwise.hpp"
+#include "../bitwise.hpp"
 
 #include <cstring>
 

hash/ripemd.cpp

@@ -15,10 +15,10 @@
  *      2014, Danny Robson <danny@nerdcruft.net>
  */
 
-#include "ripemd.hpp"
+#include "./ripemd.hpp"
 
-#include "debug.hpp"
+#include "../debug.hpp"
-#include "bitwise.hpp"
+#include "../bitwise.hpp"
 
 #include <cstring>
 #include <stdexcept>

hash/sha1.cpp

@@ -14,13 +14,13 @@
  * Copyright 2013 Danny Robson <danny@nerdcruft.net>
  */
 
-#include "sha1.hpp"
+#include "./sha1.hpp"
 
-#include "bitwise.hpp"
+#include "../bitwise.hpp"
-#include "debug.hpp"
+#include "../debug.hpp"
-#include "endian.hpp"
+#include "../endian.hpp"
-#include "types.hpp"
+#include "../types.hpp"
-#include "cast.hpp"
+#include "../cast.hpp"
 
 #include <algorithm>
 #include <cassert>

hash/sha2.cpp

@@ -17,8 +17,8 @@
 
 #include "sha2.hpp"
 
-#include "bitwise.hpp"
+#include "../bitwise.hpp"
-#include "endian.hpp"
+#include "../endian.hpp"
 
 #include <algorithm>
 

json/schema.cpp

@@ -14,12 +14,12 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#include "schema.hpp"
+#include "./schema.hpp"
 
-#include "debug.hpp"
-#include "maths.hpp"
 #include "./tree.hpp"
 #include "./except.hpp"
+#include "../debug.hpp"
+#include "../maths.hpp"
 
 #include <regex>
 

json/tree.cpp

@@ -15,15 +15,15 @@
  */
 
 
-#include "json/tree.hpp"
+#include "./tree.hpp"
 
-#include "json/except.hpp"
+#include "./except.hpp"
-#include "json/flat.hpp"
+#include "./flat.hpp"
 
-#include "debug.hpp"
+#include "../debug.hpp"
-#include "io.hpp"
+#include "../io.hpp"
-#include "maths.hpp"
+#include "../maths.hpp"
-#include "cast.hpp"
+#include "../cast.hpp"
 
 #include <algorithm>
 #include <cstdlib>

test/string.cpp

@@ -1,6 +1,6 @@
-#include <cruft/util/tap.hpp>
+#include "tap.hpp"
-#include <cruft/util/string.hpp>
+#include "string.hpp"
-#include <cruft/util/types.hpp>
+#include "types.hpp"
 
 int
 main (int, char**)

test/view.cpp

@@ -1,5 +1,5 @@
-#include <cruft/util/tap.hpp>
+#include "tap.hpp"
-#include <cruft/util/view.hpp>
+#include "view.hpp"
     
 int
 main (int, char**)