Pierre, I'm going to commit this one for now, as it seems the safest thing to do.

I still think we should try to fix the generic case, but it seems much harder to get this right. I still don't understand how come isinf sometimes appears in the global namespace some times, but not others.

Jose

On 18/03/16 00:17, Pierre Moreau wrote:
This fixes a compile error while building Nouveau with C++11 enabled (and
glibc >= 2.23). This happens if SWR is enabled, as it forces C++11.

Signed-off-by: Pierre Moreau <pierre.mor...@free.fr>
---
  src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp | 4 ++++
  1 file changed, 4 insertions(+)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
index 500ab89..1b595ae 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
@@ -1327,7 +1327,11 @@ GCRA::simplify()
                 bestScore = score;
              }
           }
+#if __cplusplus >= 201103L
+         if (std::isinf(bestScore)) {
+#else
           if (isinf(bestScore)) {
+#endif
              ERROR("no viable spill candidates left\n");
              break;
           }


_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to