From 424e6e8701ca7faa0e142fc7bb81c2cea005319f Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Tue, 17 Nov 2015 16:19:27 +1100 Subject: [PATCH] cast: move types/casts to cast --- Makefile.am | 2 +- backtrace_execinfo.cpp | 2 +- types/casts.hpp => cast.hpp | 6 +++--- exe.cpp | 2 +- hash/sha1.cpp | 2 +- io.cpp | 2 +- ip.cpp.rl | 2 +- json/tree.cpp | 2 +- memory/buffer/paged.cpp | 2 +- memory/system.cpp | 2 +- net/except.cpp | 2 +- net/socket.cpp | 2 +- noise/basis/type/distance.cpp | 2 +- region.cpp | 2 +- string.cpp | 2 +- time.cpp | 2 +- time_posix.cpp | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) rename types/casts.hpp => cast.hpp (97%) diff --git a/Makefile.am b/Makefile.am index 9aef778e..bbb86f54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,6 +33,7 @@ UTIL_FILES = \ bezier.hpp \ bitwise.cpp \ bitwise.hpp \ + cast.hpp \ cmdopt.cpp \ cmdopt.hpp \ cmdopt.ipp \ @@ -297,7 +298,6 @@ UTIL_FILES = \ tuple.cpp \ tuple.hpp \ types/bits.hpp \ - types/casts.hpp \ types/comparator.hpp \ types/comparator.ipp \ types.hpp \ diff --git a/backtrace_execinfo.cpp b/backtrace_execinfo.cpp index 0fa7d513..9e7aeb10 100644 --- a/backtrace_execinfo.cpp +++ b/backtrace_execinfo.cpp @@ -20,7 +20,7 @@ #include "./debug.hpp" #include "./exe.hpp" #include "./io.hpp" -#include "types/casts.hpp" +#include "cast.hpp" #include #include diff --git a/types/casts.hpp b/cast.hpp similarity index 97% rename from types/casts.hpp rename to cast.hpp index 58d41fa8..8d447d21 100644 --- a/types/casts.hpp +++ b/cast.hpp @@ -14,10 +14,10 @@ * Copyright 2011 Danny Robson */ -#ifndef __UTIL_TYPES_CASTS_HPP -#define __UTIL_TYPES_CASTS_HPP +#ifndef __UTIL_CAST_HPP +#define __UTIL_CAST_HPP -#include "../debug.hpp" +#include "./debug.hpp" #include #include diff --git a/exe.cpp b/exe.cpp index e6ee2fca..b389609b 100644 --- a/exe.cpp +++ b/exe.cpp @@ -22,7 +22,7 @@ #if defined(PLATFORM_LINUX) #include "except.hpp" -#include "types/casts.hpp" +#include "cast.hpp" #include #include diff --git a/hash/sha1.cpp b/hash/sha1.cpp index 57cf9ee7..612a518f 100644 --- a/hash/sha1.cpp +++ b/hash/sha1.cpp @@ -20,7 +20,7 @@ #include "debug.hpp" #include "endian.hpp" #include "types.hpp" -#include "types/casts.hpp" +#include "cast.hpp" #include #include diff --git a/io.cpp b/io.cpp index de881f54..fcc77ec7 100644 --- a/io.cpp +++ b/io.cpp @@ -19,7 +19,7 @@ #include "debug.hpp" #include "except.hpp" #include "platform.hpp" -#include "types/casts.hpp" +#include "cast.hpp" #include #include diff --git a/ip.cpp.rl b/ip.cpp.rl index 64f0b924..d1ccac3e 100644 --- a/ip.cpp.rl +++ b/ip.cpp.rl @@ -20,7 +20,7 @@ #include "ip.hpp" -#include "types/casts.hpp" +#include "cast.hpp" #include #include diff --git a/json/tree.cpp b/json/tree.cpp index ba2970f1..49db2bec 100644 --- a/json/tree.cpp +++ b/json/tree.cpp @@ -23,7 +23,7 @@ #include "debug.hpp" #include "io.hpp" #include "maths.hpp" -#include "types/casts.hpp" +#include "cast.hpp" #include #include diff --git a/memory/buffer/paged.cpp b/memory/buffer/paged.cpp index f76734e5..fbe78682 100644 --- a/memory/buffer/paged.cpp +++ b/memory/buffer/paged.cpp @@ -20,7 +20,7 @@ #include "../../except.hpp" #include "../../maths.hpp" #include "../../pointer.hpp" -#include "../../types/casts.hpp" +#include "../../cast.hpp" #include diff --git a/memory/system.cpp b/memory/system.cpp index 1e679dd1..a06b610b 100644 --- a/memory/system.cpp +++ b/memory/system.cpp @@ -17,7 +17,7 @@ #include "./system.hpp" #include "../except.hpp" -#include "../types/casts.hpp" +#include "../cast.hpp" #include diff --git a/net/except.cpp b/net/except.cpp index d224c49b..94911b11 100644 --- a/net/except.cpp +++ b/net/except.cpp @@ -17,7 +17,7 @@ #include "except.hpp" #include "../debug.hpp" -#include "../types/casts.hpp" +#include "../cast.hpp" //----------------------------------------------------------------------------- diff --git a/net/socket.cpp b/net/socket.cpp index db29ba2f..d3e1918a 100644 --- a/net/socket.cpp +++ b/net/socket.cpp @@ -18,7 +18,7 @@ #include "../debug.hpp" #include "../except.hpp" -#include "../types/casts.hpp" +#include "../cast.hpp" #include "../log.hpp" #include "except.hpp" diff --git a/noise/basis/type/distance.cpp b/noise/basis/type/distance.cpp index 35ee2661..9fe655cc 100644 --- a/noise/basis/type/distance.cpp +++ b/noise/basis/type/distance.cpp @@ -1,6 +1,6 @@ #include "./distance.hpp" #include "../../../extent.hpp" -#include "../../../types/casts.hpp" +#include "../../../cast.hpp" /////////////////////////////////////////////////////////////////////////////// diff --git a/region.cpp b/region.cpp index 9fb3f510..5323c174 100644 --- a/region.cpp +++ b/region.cpp @@ -18,7 +18,7 @@ #include "region.hpp" #include "debug.hpp" -#include "types/casts.hpp" +#include "cast.hpp" #include #include diff --git a/string.cpp b/string.cpp index 3b130da2..acc75d14 100644 --- a/string.cpp +++ b/string.cpp @@ -18,7 +18,7 @@ #include -#include "types/casts.hpp" +#include "cast.hpp" // TODO: Horribly inefficient, but God help you if you're relying on this // being efficient in the first place. diff --git a/time.cpp b/time.cpp index 6d289407..5e61ff98 100644 --- a/time.cpp +++ b/time.cpp @@ -19,7 +19,7 @@ #include "debug.hpp" #include "log.hpp" #include "platform.hpp" -#include "types/casts.hpp" +#include "cast.hpp" using namespace util; diff --git a/time_posix.cpp b/time_posix.cpp index 92e8cd44..effd2bf4 100644 --- a/time_posix.cpp +++ b/time_posix.cpp @@ -16,7 +16,7 @@ #include "time.hpp" -#include "types/casts.hpp" +#include "cast.hpp" #include