Skip to content
Snippets Groups Projects
Commit 11fa1958 authored by Sergey Linev's avatar Sergey Linev
Browse files

[eve7] fix windows warnings

C4005: 'NOMINMAX': macro redefinition
C4138: '*/' found outside of comment
parent 1cf392d4
No related branches found
No related tags found
No related merge requests found
...@@ -38,7 +38,9 @@ ...@@ -38,7 +38,9 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define NOGDI #define NOGDI
#define NOIME #define NOIME
#ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif
#ifdef __MINGW64_VERSION_MAJOR #ifdef __MINGW64_VERSION_MAJOR
#undef _WIN32_WINNT #undef _WIN32_WINNT
......
...@@ -24,7 +24,7 @@ protected: ...@@ -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."); throw std::runtime_error("virtual Build(const T&, int, REveElement&, const REveViewContext*) not implemented by inherited class.");
} }
...@@ -36,7 +36,7 @@ protected: ...@@ -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."); throw std::runtime_error("virtual BuildViewType(const T&, int, REveElement&, const REveViewContext*) not implemented by inherited class.");
} }
......
...@@ -69,9 +69,9 @@ void TestTriangleHandler::tess_vertex(Int_t *vi, TriangleCollector *tc) ...@@ -69,9 +69,9 @@ void TestTriangleHandler::tess_vertex(Int_t *vi, TriangleCollector *tc)
////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////
/// tess_combine /// tess_combine
void TestTriangleHandler::tess_combine(GLdouble /*coords*/[3], void* /*vertex_data*/[4], void TestTriangleHandler::tess_combine(GLdouble /*coords*/[3], void * /*vertex_data*/[4],
GLfloat /*weight*/[4], void** /*outData*/, GLfloat /*weight*/[4], void ** /*outData*/,
TriangleCollector */*tc*/) TriangleCollector * /*tc*/)
{ {
throw std::runtime_error("GLU::TriangleCollector tesselator requested vertex combining -- not supported yet."); throw std::runtime_error("GLU::TriangleCollector tesselator requested vertex combining -- not supported yet.");
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment