From c281f4c5079c47d35b5ed9fd83201968cd822286 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Wed, 22 Aug 2012 16:13:23 +1000 Subject: [PATCH] Dont use include guard for ipp, use include errors --- log.ipp | 11 ++++++++--- maths/polynomial.ipp | 8 ++++++++ random.ipp | 8 ++++++-- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/log.ipp b/log.ipp index 9c70b49e..3419d254 100644 --- a/log.ipp +++ b/log.ipp @@ -17,11 +17,18 @@ * Copyright 2012 Danny Robson */ -#ifndef __UTIL_LOG_IPP +#ifdef __UTIL_LOG_IPP +#error Double inclusion of util/log.ipp +#endif + #define __UTIL_LOG_IPP + +//----------------------------------------------------------------------------- #include + +//----------------------------------------------------------------------------- namespace util { namespace detail { void @@ -39,5 +46,3 @@ namespace util { { detail::log (l, std::move (boost::format (format)), _tail...); } } - -#endif diff --git a/maths/polynomial.ipp b/maths/polynomial.ipp index 6bbe2137..37ccb23a 100644 --- a/maths/polynomial.ipp +++ b/maths/polynomial.ipp @@ -17,6 +17,14 @@ * Copyright 2010 Danny Robson */ +#ifdef __UTIL_MATHS_POLYNOMIAL_IPP +#error Double includion of util/maths/polynomial.hpp +#endif + +#define __UTIL_MATHS_POLYNOMIAL_IPP + + +//----------------------------------------------------------------------------- template T maths::polynomial::eval (T x) const { diff --git a/random.ipp b/random.ipp index d72d9435..9120ad2d 100644 --- a/random.ipp +++ b/random.ipp @@ -17,9 +17,14 @@ * Copyright 2010 Danny Robson */ -#ifndef __UTIL_RANDOM_IPP +#ifdef __UTIL_RANDOM_IPP +#error Double inclusion of util/random.ipp +#endif + #define __UTIL_RANDOM_IPP + +//----------------------------------------------------------------------------- namespace util { template T* randomise (T (&array)[N]) { @@ -29,4 +34,3 @@ namespace util { } } -#endif