fixes for GCC 6.3.1 (courtesy of Will Harrower):
renamed local variables in THROW macros to avoid warnings
cast to bool
///////////////////////////////////////////////////////////////////////////
//
-// Copyright (c) 2002-2012, Industrial Light & Magic, a division of Lucas
+// Copyright (c) 2002-2018, Industrial Light & Magic, a division of Lucas
// Digital Ltd. LLC
//
// All rights reserved.
@@ -64,9 +64,9 @@ IEX_EXPORT void iex_debugTrap();
do \
{ \
iex_debugTrap(); \
- std::stringstream s; \
- s << text; \
- throw type (s); \
+ std::stringstream _iex_throw_s; \
+ _iex_throw_s << text; \
+ throw type (_iex_throw_s); \
} \
while (0)
@@ -97,18 +97,18 @@ IEX_EXPORT void iex_debugTrap();
#define APPEND_EXC(exc, text) \
do \
{ \
- std::stringstream s; \
- s << text; \
- exc.append (s); \
+ std::stringstream _iex_append_s; \
+ _iex_append_s << text; \
+ exc.append (_iex_append_s); \
} \
while (0)
#define REPLACE_EXC(exc, text) \
do \
{ \
- std::stringstream s; \
- s << text; \
- exc.assign (s); \
+ std::stringstream _iex_replace_s; \
+ _iex_replace_s << text; \
+ exc.assign (_iex_replace_s); \
} \
while (0)
@@ -126,9 +126,9 @@ IEX_EXPORT void iex_debugTrap();
#define THROW_ERRNO(text) \
do \
{ \
- std::stringstream s; \
- s << text; \
- ::IEX_NAMESPACE::throwErrnoExc (s.str()); \
+ std::stringstream _iex_throw_errno_s; \
+ _iex_throw_errno_s << text; \
+ ::IEX_NAMESPACE::throwErrnoExc (_iex_throw_errno_s.str()); \
} \
while (0)
@@ -145,7 +145,7 @@ IEX_EXPORT void iex_debugTrap();
#define ASSERT(assertion, type, text) \
do \
{ \
- if( (assertion) == false ) \
+ if( bool(assertion) == false ) \
{ \
THROW( type, text ); \
} \
