Permalink
Browse files

BUG: spatial/qhull: cherry-pick previous qhull fixes

bb4c46f BUG: spatial/qhull: fix compilation on Intel compilers

The other fixes were already incorporated upstream:

666f6ad BUG: spatial/qhull: define ptr_intT correctly in Qhull
e089c85 MAINT: fix some build warnings.  Closes ticket 1528.
  • Loading branch information...
1 parent 36e2e1d commit 7b500f9e57755360183a975f22e0a0a7e0447517 @pv pv committed Aug 27, 2011
Showing with 1 addition and 3 deletions.
  1. +1 −3 scipy/spatial/qhull/src/qhull_a.h
@@ -103,9 +103,7 @@
# define QHULL_OS_WIN
#endif
#if defined(__INTEL_COMPILER) && !defined(QHULL_OS_WIN)
-template <typename T>
-inline void qhullUnused(T &x) { (void)x; }
-# define QHULL_UNUSED(x) qhullUnused(x);
+# define QHULL_UNUSED(x) (x)
#else
# define QHULL_UNUSED(x) (void)x;
#endif

0 comments on commit 7b500f9

Please sign in to comment.