diff options
| author | Jeroen Vermeulen <jtv@precisiontranslationtools.com> | 2015-03-28 15:37:48 +0300 |
|---|---|---|
| committer | Jeroen Vermeulen <jtv@precisiontranslationtools.com> | 2015-03-28 15:37:48 +0300 |
| commit | 88e90957a1b56c98842769947f07d7abee95a8ec (patch) | |
| tree | 57404bcfc5371ddbcb3f55399d9e95c5f4bdb9bf /util | |
| parent | 206d0c969885817521e941eaec879517e39a5b59 (diff) | |
Modernize "C" includes in util.
This is one of those little chores in managing a long-lived C++
project: standard C headers like stdio.h and math.h now have their own
place in the C++ standard as resp. cstdio, cmath, and so on. In this
branch the #include names are updated for the util/ subdirectory; more
branches to follow.
C++11 adds cstdint, but to support compilation with the previous
standard, that change is left for later.
Diffstat (limited to 'util')
42 files changed, 54 insertions, 74 deletions
diff --git a/util/bit_packing.cc b/util/bit_packing.cc index 41999b726..d3f998d46 100644 --- a/util/bit_packing.cc +++ b/util/bit_packing.cc @@ -1,7 +1,7 @@ #include "util/bit_packing.hh" #include "util/exception.hh" -#include <string.h> +#include <cstring> namespace util { diff --git a/util/bit_packing.hh b/util/bit_packing.hh index 1e34d9ab1..3cf3cd4a1 100644 --- a/util/bit_packing.hh +++ b/util/bit_packing.hh @@ -18,7 +18,7 @@ * NICT. */ -#include <assert.h> +#include <cassert> #ifdef __APPLE__ #include <architecture/byte_order.h> #elif __linux__ @@ -28,8 +28,7 @@ #endif #include <stdint.h> - -#include <string.h> +#include <cstring> namespace util { diff --git a/util/bit_packing_test.cc b/util/bit_packing_test.cc index 4edc2004c..c4494b69f 100644 --- a/util/bit_packing_test.cc +++ b/util/bit_packing_test.cc @@ -3,7 +3,7 @@ #define BOOST_TEST_MODULE BitPackingTest #include <boost/test/unit_test.hpp> -#include <string.h> +#include <cstring> namespace util { namespace { diff --git a/util/cat_compressed_main.cc b/util/cat_compressed_main.cc index 2b4d72927..9ec8e81f7 100644 --- a/util/cat_compressed_main.cc +++ b/util/cat_compressed_main.cc @@ -2,7 +2,7 @@ #include "util/file.hh" #include "util/read_compressed.hh" -#include <string.h> +#include <cstring> #include <iostream> namespace { diff --git a/util/double-conversion/bignum-dtoa.cc b/util/double-conversion/bignum-dtoa.cc index b6c2e85d1..3d217bf02 100644 --- a/util/double-conversion/bignum-dtoa.cc +++ b/util/double-conversion/bignum-dtoa.cc @@ -25,7 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include <math.h> +#include <cmath> #include "bignum-dtoa.h" diff --git a/util/double-conversion/cached-powers.cc b/util/double-conversion/cached-powers.cc index c67642919..9dcfa3673 100644 --- a/util/double-conversion/cached-powers.cc +++ b/util/double-conversion/cached-powers.cc @@ -25,9 +25,9 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include <stdarg.h> -#include <limits.h> -#include <math.h> +#include <cstdarg> +#include <climits> +#include <cmath> #include "utils.h" diff --git a/util/double-conversion/double-conversion.cc b/util/double-conversion/double-conversion.cc index febba6cd7..8a7923c5c 100644 --- a/util/double-conversion/double-conversion.cc +++ b/util/double-conversion/double-conversion.cc @@ -25,8 +25,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include <limits.h> -#include <math.h> +#include <climits> +#include <cmath> #include "double-conversion.h" diff --git a/util/double-conversion/fixed-dtoa.cc b/util/double-conversion/fixed-dtoa.cc index d56b1449b..7c1a95278 100644 --- a/util/double-conversion/fixed-dtoa.cc +++ b/util/double-conversion/fixed-dtoa.cc @@ -25,7 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include <math.h> +#include <cmath> #include "fixed-dtoa.h" #include "ieee.h" diff --git a/util/double-conversion/strtod.cc b/util/double-conversion/strtod.cc index e298766a2..55b4daa5d 100644 --- a/util/double-conversion/strtod.cc +++ b/util/double-conversion/strtod.cc @@ -25,8 +25,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include <stdarg.h> -#include <limits.h> +#include <cstdarg> +#include <climits> #include "strtod.h" #include "bignum.h" diff --git a/util/ersatz_progress.hh b/util/ersatz_progress.hh index 535dbde23..b3bef7fa6 100644 --- a/util/ersatz_progress.hh +++ b/util/ersatz_progress.hh @@ -3,7 +3,6 @@ #include <iostream> #include <string> - #include <stdint.h> // Ersatz version of boost::progress so core language model doesn't depend on diff --git a/util/exception.cc b/util/exception.cc index eaf4cbc21..32d48516a 100644 --- a/util/exception.cc +++ b/util/exception.cc @@ -4,8 +4,8 @@ #include <typeinfo> #endif -#include <errno.h> -#include <string.h> +#include <cerrno> +#include <cstring> namespace util { diff --git a/util/exception.hh b/util/exception.hh index 4e50a6f3a..2b503e50e 100644 --- a/util/exception.hh +++ b/util/exception.hh @@ -5,7 +5,6 @@ #include <limits> #include <sstream> #include <string> - #include <stdint.h> namespace util { diff --git a/util/file.cc b/util/file.cc index aa61cf9a9..414d0471c 100644 --- a/util/file.cc +++ b/util/file.cc @@ -13,9 +13,9 @@ #include <sstream> -#include <assert.h> -#include <errno.h> -#include <limits.h> +#include <cassert> +#include <cerrno> +#include <climits> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/util/file.hh b/util/file.hh index 7204b6a04..ca52dbfba 100644 --- a/util/file.hh +++ b/util/file.hh @@ -8,7 +8,6 @@ #include <cstddef> #include <cstdio> #include <string> - #include <stdint.h> namespace util { diff --git a/util/file_piece.cc b/util/file_piece.cc index 4aaa250e3..37e492672 100644 --- a/util/file_piece.cc +++ b/util/file_piece.cc @@ -14,10 +14,9 @@ #include <iostream> #include <string> #include <limits> - -#include <assert.h> +#include <cassert> #include <fcntl.h> -#include <stdlib.h> +#include <cstdlib> #include <sys/types.h> #include <sys/stat.h> diff --git a/util/file_piece.hh b/util/file_piece.hh index 5495ddccc..35f5eb648 100644 --- a/util/file_piece.hh +++ b/util/file_piece.hh @@ -11,8 +11,7 @@ #include <cstddef> #include <iosfwd> #include <string> - -#include <assert.h> +#include <cassert> #include <stdint.h> namespace util { diff --git a/util/file_piece_test.cc b/util/file_piece_test.cc index 4361877fe..4a2a521ba 100644 --- a/util/file_piece_test.cc +++ b/util/file_piece_test.cc @@ -8,8 +8,7 @@ #include <boost/test/unit_test.hpp> #include <fstream> #include <iostream> - -#include <stdio.h> +#include <cstdio> #include <sys/types.h> #include <sys/stat.h> diff --git a/util/fixed_array.hh b/util/fixed_array.hh index 416b92f4e..e2aa8ae7d 100644 --- a/util/fixed_array.hh +++ b/util/fixed_array.hh @@ -5,8 +5,8 @@ #include <cstddef> -#include <assert.h> -#include <stdlib.h> +#include <cassert> +#include <cstdlib> namespace util { diff --git a/util/mmap.cc b/util/mmap.cc index a3c8a0225..b91f181f4 100644 --- a/util/mmap.cc +++ b/util/mmap.cc @@ -11,11 +11,11 @@ #include <iostream> -#include <assert.h> +#include <cassert> #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> -#include <stdlib.h> +#include <cstdlib> #if defined(_WIN32) || defined(_WIN64) #include <windows.h> diff --git a/util/murmur_hash.cc b/util/murmur_hash.cc index 189668c01..d04e6ecd0 100644 --- a/util/murmur_hash.cc +++ b/util/murmur_hash.cc @@ -11,7 +11,7 @@ */ #include "util/murmur_hash.hh" -#include <string.h> +#include <cstring> namespace util { diff --git a/util/pcqueue.hh b/util/pcqueue.hh index d2ffee777..f74ef18e8 100644 --- a/util/pcqueue.hh +++ b/util/pcqueue.hh @@ -8,7 +8,7 @@ #include <boost/thread/mutex.hpp> #include <boost/utility.hpp> -#include <errno.h> +#include <cerrno> #ifdef __APPLE__ #include <mach/semaphore.h> diff --git a/util/pool.cc b/util/pool.cc index 429ba1585..e0e4c61f6 100644 --- a/util/pool.cc +++ b/util/pool.cc @@ -2,7 +2,7 @@ #include "util/scoped.hh" -#include <stdlib.h> +#include <cstdlib> namespace util { diff --git a/util/pool.hh b/util/pool.hh index 89e793d7e..fd55572cd 100644 --- a/util/pool.hh +++ b/util/pool.hh @@ -5,7 +5,6 @@ #define UTIL_POOL_H #include <vector> - #include <stdint.h> namespace util { diff --git a/util/probing_hash_table.hh b/util/probing_hash_table.hh index ea228dd9a..83fd0ec12 100644 --- a/util/probing_hash_table.hh +++ b/util/probing_hash_table.hh @@ -9,7 +9,7 @@ #include <functional> #include <vector> -#include <assert.h> +#include <cassert> #include <stdint.h> namespace util { diff --git a/util/probing_hash_table_test.cc b/util/probing_hash_table_test.cc index 9f7948ce6..6ed541431 100644 --- a/util/probing_hash_table_test.cc +++ b/util/probing_hash_table_test.cc @@ -7,9 +7,9 @@ #include <boost/test/unit_test.hpp> #include <boost/scoped_array.hpp> #include <boost/functional/hash.hpp> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <stdint.h> namespace util { diff --git a/util/read_compressed.cc b/util/read_compressed.cc index cee98040b..7f240dd7e 100644 --- a/util/read_compressed.cc +++ b/util/read_compressed.cc @@ -7,10 +7,10 @@ #include <algorithm> #include <iostream> -#include <assert.h> -#include <limits.h> -#include <stdlib.h> -#include <string.h> +#include <cassert> +#include <climits> +#include <cstdlib> +#include <cstring> #ifdef HAVE_ZLIB #include <zlib.h> diff --git a/util/read_compressed.hh b/util/read_compressed.hh index 767ee94b2..9b36f641c 100644 --- a/util/read_compressed.hh +++ b/util/read_compressed.hh @@ -5,7 +5,6 @@ #include "util/scoped.hh" #include <cstddef> - #include <stdint.h> namespace util { diff --git a/util/read_compressed_test.cc b/util/read_compressed_test.cc index 301e8f4b4..a983ca720 100644 --- a/util/read_compressed_test.cc +++ b/util/read_compressed_test.cc @@ -9,11 +9,10 @@ #include <fstream> #include <string> - -#include <stdlib.h> +#include <cstdlib> #if defined __MINGW32__ -#include <time.h> +#include <ctime> #include <fcntl.h> #if !defined mkstemp diff --git a/util/sized_iterator.hh b/util/sized_iterator.hh index 75f6886f7..c28d8e02e 100644 --- a/util/sized_iterator.hh +++ b/util/sized_iterator.hh @@ -8,7 +8,7 @@ #include <string> #include <stdint.h> -#include <string.h> +#include <cstring> namespace util { diff --git a/util/sorted_uniform.hh b/util/sorted_uniform.hh index a3f6d021d..3673a8b5d 100644 --- a/util/sorted_uniform.hh +++ b/util/sorted_uniform.hh @@ -3,8 +3,7 @@ #include <algorithm> #include <cstddef> - -#include <assert.h> +#include <cassert> #include <stdint.h> namespace util { diff --git a/util/stream/chain.cc b/util/stream/chain.cc index ce29e428c..7b68400a8 100644 --- a/util/stream/chain.cc +++ b/util/stream/chain.cc @@ -8,9 +8,7 @@ #include <cstdlib> #include <new> #include <iostream> - #include <stdint.h> -#include <stdlib.h> namespace util { namespace stream { diff --git a/util/stream/chain.hh b/util/stream/chain.hh index 508650860..28dc8060e 100644 --- a/util/stream/chain.hh +++ b/util/stream/chain.hh @@ -10,8 +10,7 @@ #include <boost/thread/thread.hpp> #include <cstddef> - -#include <assert.h> +#include <cassert> namespace util { template <class T> class PCQueue; diff --git a/util/stream/multi_progress.cc b/util/stream/multi_progress.cc index 8ba10386b..7d6a6a73a 100644 --- a/util/stream/multi_progress.cc +++ b/util/stream/multi_progress.cc @@ -6,7 +6,7 @@ #include <iostream> #include <limits> -#include <string.h> +#include <cstring> #if !defined(_WIN32) && !defined(_WIN64) #include <unistd.h> diff --git a/util/stream/multi_progress.hh b/util/stream/multi_progress.hh index 82e698a59..41d40075a 100644 --- a/util/stream/multi_progress.hh +++ b/util/stream/multi_progress.hh @@ -5,7 +5,6 @@ #include <boost/thread/mutex.hpp> #include <cstddef> - #include <stdint.h> namespace util { namespace stream { diff --git a/util/stream/multi_stream.hh b/util/stream/multi_stream.hh index 0ee7fab6f..2772a7081 100644 --- a/util/stream/multi_stream.hh +++ b/util/stream/multi_stream.hh @@ -9,8 +9,8 @@ #include <cstddef> #include <new> -#include <assert.h> -#include <stdlib.h> +#include <cassert> +#include <cstdlib> namespace util { namespace stream { diff --git a/util/stream/stream.hh b/util/stream/stream.hh index 7ea1c9f70..0e37f5d51 100644 --- a/util/stream/stream.hh +++ b/util/stream/stream.hh @@ -5,7 +5,7 @@ #include <boost/noncopyable.hpp> -#include <assert.h> +#include <cassert> #include <stdint.h> namespace util { diff --git a/util/string_piece.cc b/util/string_piece.cc index ec394b96b..180b4e434 100644 --- a/util/string_piece.cc +++ b/util/string_piece.cc @@ -5,8 +5,7 @@ #include "util/string_piece.hh" #include <algorithm> - -#include <limits.h> +#include <climits> #ifndef HAVE_ICU diff --git a/util/string_piece.hh b/util/string_piece.hh index 114e25473..9c4798217 100644 --- a/util/string_piece.hh +++ b/util/string_piece.hh @@ -85,7 +85,7 @@ inline bool starts_with(const StringPiece& longer, const StringPiece& prefix) { #include <algorithm> #include <cstddef> #include <string> -#include <string.h> +#include <cstring> #ifdef WIN32 #undef max diff --git a/util/thread_pool.hh b/util/thread_pool.hh index d1a883a00..d385b1a74 100644 --- a/util/thread_pool.hh +++ b/util/thread_pool.hh @@ -8,8 +8,7 @@ #include <boost/thread.hpp> #include <iostream> - -#include <stdlib.h> +#include <cstdlib> namespace util { diff --git a/util/tokenize_piece.hh b/util/tokenize_piece.hh index 908c8dafe..8621705e8 100644 --- a/util/tokenize_piece.hh +++ b/util/tokenize_piece.hh @@ -7,8 +7,7 @@ #include <boost/iterator/iterator_facade.hpp> #include <algorithm> - -#include <string.h> +#include <cstring> namespace util { diff --git a/util/usage.cc b/util/usage.cc index a597300e3..bbb209306 100644 --- a/util/usage.cc +++ b/util/usage.cc @@ -7,10 +7,9 @@ #include <sstream> #include <set> #include <string> - -#include <string.h> -#include <ctype.h> -#include <time.h> +#include <cstring> +#include <cctype> +#include <ctime> #if defined(_WIN32) || defined(_WIN64) // This code lifted from physmem.c in gnulib. See the copyright statement // below. diff --git a/util/usage.hh b/util/usage.hh index e578b0a65..85bd2119a 100644 --- a/util/usage.hh +++ b/util/usage.hh @@ -3,7 +3,6 @@ #include <cstddef> #include <iosfwd> #include <string> - #include <stdint.h> namespace util { |