diff --git a/graphics/VP1/VP1Base/src/VP1Msg.cxx b/graphics/VP1/VP1Base/src/VP1Msg.cxx index 335baaa2f8538d82ca7fcbc82988983b2bcc58a6..fd5bf3fe02822f818851257c25230fe3e0c188f3 100644 --- a/graphics/VP1/VP1Base/src/VP1Msg.cxx +++ b/graphics/VP1/VP1Base/src/VP1Msg.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration */ @@ -60,10 +60,10 @@ void VP1Msg::messageWarningRed( const QString& str, IVP1System* sys /* defaults sys->message(str); // colors, see: - // - http://brianmilco.blogspot.ch/2011/11/color-debug-output-with-qt-and-qdebug.html - // - http://misc.flogisoft.com/bash/tip_colors_and_formatting - std::string msg = str.toStdString(); - fprintf(stderr, "\033[1m\033[31mWarning:\033[21m\033[0m: %s\n", msg.c_str() ); + // - http://brianmilco.blogspot.ch/2011/11/color-debug-output-with-qt-and-qdebug.html + // - http://misc.flogisoft.com/bash/tip_colors_and_formatting + std::string msg = str.toStdString(); + fprintf(stderr, "\033[1m\033[31mWarning:\033[21m\033[0m: %s\n", msg.c_str() ); } // The whole 'Warning' message is printed in red //____________________________________________________________________ @@ -73,10 +73,10 @@ void VP1Msg::messageWarningAllRed( const QString& str, IVP1System* sys /* defaul sys->message(str); // colors, see: - // - http://brianmilco.blogspot.ch/2011/11/color-debug-output-with-qt-and-qdebug.html - // - http://misc.flogisoft.com/bash/tip_colors_and_formatting - std::string msg = str.toStdString(); - fprintf(stderr, "\033[1m\033[31mWarning:\033[21m %s\033[0m\n", msg.c_str() ); + // - http://brianmilco.blogspot.ch/2011/11/color-debug-output-with-qt-and-qdebug.html + // - http://misc.flogisoft.com/bash/tip_colors_and_formatting + std::string msg = str.toStdString(); + fprintf(stderr, "\033[1m\033[31mWarning:\033[21m %s\033[0m\n", msg.c_str() ); } diff --git a/graphics/VP1/VP1Gui/src/VP1AvailEvents.cxx b/graphics/VP1/VP1Gui/src/VP1AvailEvents.cxx index cbe644fe7b8993515c85d73fc1c84771c3298351..e942af5ba867565427dab2823b86e3c484705382 100644 --- a/graphics/VP1/VP1Gui/src/VP1AvailEvents.cxx +++ b/graphics/VP1/VP1Gui/src/VP1AvailEvents.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration */ @@ -50,14 +50,6 @@ public: //This ordering is not "newer". It is solely to be able to use in a set. return runNumber==o.runNumber ? eventNumber < o.eventNumber : runNumber < o.runNumber; } - - EventID & operator= (const EventID & o ) - { - if (&o == this) return *this; - eventNumber = o.eventNumber; - runNumber = o.runNumber; - return *this; - } }; static EventID evtToID(const VP1EventFile& evt) { diff --git a/graphics/VP1/VP1HEPVis/src/gl2ps.cxx b/graphics/VP1/VP1HEPVis/src/gl2ps.cxx index c2834d5ddebf5a3a6e8f174ad89ba4e185cda416..5e205107a36ad4c0c9da77822e6a71db1363789a 100644 --- a/graphics/VP1/VP1HEPVis/src/gl2ps.cxx +++ b/graphics/VP1/VP1HEPVis/src/gl2ps.cxx @@ -4185,7 +4185,7 @@ static int gl2psPrintPDFShaderStreamDataCoord(GL2PSvertex *vertex, int offs = 0; unsigned long imap; GLfloat diff; - double dmax = ~1UL; + double dmax = static_cast<double>(~1UL); char edgeflag = 0; /* FIXME: temp bux fix for 64 bit archs: */ @@ -4229,7 +4229,7 @@ static int gl2psPrintPDFShaderStreamDataRGB(GL2PSvertex *vertex, { int offs = 0; unsigned long imap; - double dmax = ~1UL; + double dmax = static_cast<double>(~1UL); /* FIXME: temp bux fix for 64 bit archs: */ if(sizeof(unsigned long) == 8) dmax = dmax - 2048.; @@ -4255,7 +4255,7 @@ static int gl2psPrintPDFShaderStreamDataAlpha(GL2PSvertex *vertex, { int offs = 0; unsigned long imap; - double dmax = ~1UL; + double dmax = static_cast<double>(~1UL); /* FIXME: temp bux fix for 64 bit archs: */ if(sizeof(unsigned long) == 8) dmax = dmax - 2048.;