[ardour-dev] GCC 2.95.4 compile fails with current CVS tarball

[Jack O'Quin]

Tom Szilagyi <st444 at hszk.bme.hu> writes:

> In libs/soundtouch/soundtouch/STTypes.h there is this line:
> 
> #define st_assert(expr) ((expr) ? 0 : throw soundtouch_exception())
> 
> Which carries the result of a gcc-3 fix.
> Before that, the line looked like this:
> 
> #define st_assert(expr) ((expr) ? (void) 0 : throw soundtouch_exception())
> 
> And as such, it compiles with gcc-2.95.4 fine.
> (The gcc-3 fix breaked compiling with 2.9x)

Thanks, Tom.

Here's a patch to fix this problem (based on your description)...

--- libs/soundtouch/soundtouch/STTypes.h~	Sun Apr 18 13:15:54 2004
+++ libs/soundtouch/soundtouch/STTypes.h	Sun Apr 18 13:11:51 2004
@@ -49,6 +49,10 @@
 	virtual const char *what() const throw() { return "soundtouch library st_assertion failure"; }
 };
 
+#if defined(__GNUC__) && __GNUC__ >= 3  /* GCC 3.x */
 #define st_assert(expr) ((expr) ? 0 : throw soundtouch_exception())
+#else 
+#define st_assert(expr) ((expr) ? (void) 0 : throw soundtouch_exception())
+#endif
 
 #endif

-- 
  joq