From 02006d85d7d84fc9cdc83ade28d289db58966a04 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 5 Jul 2012 23:12:22 +0100 Subject: [PATCH] Disabled use of __FUNCTION__ for now --- include/internal/catch_common.h | 8 ++++---- single_include/catch.hpp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h index 9936e0a..624966d 100644 --- a/include/internal/catch_common.h +++ b/include/internal/catch_common.h @@ -120,11 +120,11 @@ namespace Catch { #define CATCH_INTERNAL_ERROR( msg ) throwLogicError( msg, __FILE__, __LINE__ ); -#ifdef __FUNCTION__ -#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FUNCTION__, __FILE__, __LINE__ ) -#else +//#ifdef __FUNCTION__ +//#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FUNCTION__, __FILE__, __LINE__ ) +//#else #define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FILE__, __LINE__ ) -#endif +//#endif #endif // TWOBLUECUBES_CATCH_COMMON_H_INCLUDED diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 00994f5..e426720 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,5 +1,5 @@ /* - * Generated: 2012-07-05 18:37:02.079024 + * Generated: 2012-07-05 18:47:13.729198 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -128,11 +128,11 @@ namespace Catch { #define CATCH_INTERNAL_ERROR( msg ) throwLogicError( msg, __FILE__, __LINE__ ); -#ifdef __FUNCTION__ -#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FUNCTION__, __FILE__, __LINE__ ) -#else +//#ifdef __FUNCTION__ +//#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FUNCTION__, __FILE__, __LINE__ ) +//#else #define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FILE__, __LINE__ ) -#endif +//#endif // #included from: catch_totals.hpp