From 11fa1958c36362c94bd230301c79c8fd79c3c25c Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Thu, 11 Jul 2019 09:27:03 +0200
Subject: [PATCH] [eve7] fix windows warnings
C4005: 'NOMINMAX': macro redefinition
C4138: '*/' found outside of comment
---
graf3d/eve7/glu/gluos.h | 2 ++
graf3d/eve7/inc/ROOT/REveDataSimpleProxyBuilderTemplate.hxx | 4 ++--
graf3d/eve7/src/REveGluTess.cxx | 6 +++---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/graf3d/eve7/glu/gluos.h b/graf3d/eve7/glu/gluos.h
index 290a06f0282..82e2a99ff59 100644
--- a/graf3d/eve7/glu/gluos.h
+++ b/graf3d/eve7/glu/gluos.h
@@ -38,7 +38,9 @@
#define WIN32_LEAN_AND_MEAN
#define NOGDI
#define NOIME
+#ifndef NOMINMAX
#define NOMINMAX
+#endif
#ifdef __MINGW64_VERSION_MAJOR
#undef _WIN32_WINNT
diff --git a/graf3d/eve7/inc/ROOT/REveDataSimpleProxyBuilderTemplate.hxx b/graf3d/eve7/inc/ROOT/REveDataSimpleProxyBuilderTemplate.hxx
index d6f6d0b8280..6414e236856 100644
--- a/graf3d/eve7/inc/ROOT/REveDataSimpleProxyBuilderTemplate.hxx
+++ b/graf3d/eve7/inc/ROOT/REveDataSimpleProxyBuilderTemplate.hxx
@@ -24,7 +24,7 @@ protected:
}
}
- void Build(const T & /*iData*/, int /*index*/, REveElement */*itemHolder*/, const REveViewContext */*context*/) override
+ void Build(const T & /*iData*/, int /*index*/, REveElement * /*itemHolder*/, const REveViewContext * /*context*/) override
{
throw std::runtime_error("virtual Build(const T&, int, REveElement&, const REveViewContext*) not implemented by inherited class.");
}
@@ -36,7 +36,7 @@ protected:
}
}
- void BuildViewType(const T &/*iData*/, int /*index*/, REveElement */*itemHolder*/, std::string /*viewType*/, const REveViewContext */*context*/) override
+ void BuildViewType(const T & /*iData*/, int /*index*/, REveElement * /*itemHolder*/, std::string /*viewType*/, const REveViewContext * /*context*/) override
{
throw std::runtime_error("virtual BuildViewType(const T&, int, REveElement&, const REveViewContext*) not implemented by inherited class.");
}
diff --git a/graf3d/eve7/src/REveGluTess.cxx b/graf3d/eve7/src/REveGluTess.cxx
index 14c4d70dd44..a6c2990d04d 100644
--- a/graf3d/eve7/src/REveGluTess.cxx
+++ b/graf3d/eve7/src/REveGluTess.cxx
@@ -69,9 +69,9 @@ void TestTriangleHandler::tess_vertex(Int_t *vi, TriangleCollector *tc)
//////////////////////////////////////////////////////////////////////////////////////
/// tess_combine
-void TestTriangleHandler::tess_combine(GLdouble /*coords*/[3], void* /*vertex_data*/[4],
- GLfloat /*weight*/[4], void** /*outData*/,
- TriangleCollector */*tc*/)
+void TestTriangleHandler::tess_combine(GLdouble /*coords*/[3], void * /*vertex_data*/[4],
+ GLfloat /*weight*/[4], void ** /*outData*/,
+ TriangleCollector * /*tc*/)
{
throw std::runtime_error("GLU::TriangleCollector tesselator requested vertex combining -- not supported yet.");
}
--
GitLab