Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Geometry: fix clang warnings about abs #16932

Merged
merged 3 commits into from Dec 12, 2016
Merged

Geometry: fix clang warnings about abs #16932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
950d23a
Geometry: fix clang warnings about abs
gartung Dec 8, 2016
0253553
cast unsigned long to long before abs to prevent undefined behavior
gartung Dec 9, 2016
4a1e937
change cast to int
gartung Dec 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Geometry/CaloEventSetup/test/CaloGeometryAnalyzer.cc
View file
Open in desktop
Expand Up @@ -217,7 +217,7 @@ CaloGeometryAnalyzer::cmpset( const CaloSubdetectorGeometry* geom ,
}
else
{
if( 2 < abs( base.size() - over.size() ) )
if( 2 < std::abs( (int)(base.size()) - (int)(over.size()) ) )
{
DetSet inBaseNotOver ;
DetSet inOverNotBase ;
Expand Down Expand Up @@ -366,7 +366,7 @@ CaloGeometryAnalyzer::ovrTst( const CaloGeometry& cg ,
{
static const GlobalPoint origin (0,0,0) ;
const int ieta ( id.ieta() ) ;
if( 85 == abs( ieta ) )
if( 85 == std::abs( ieta ) )
{
const EcalBarrelGeometry* ebG ( dynamic_cast<const EcalBarrelGeometry*>( geom ) );
const CaloCellGeometry* cell ( geom->getGeometry(id) ) ;
Expand Down
4 changes: 2 additions & 2 deletions Geometry/HGCalCommonData/plugins/DDHGCalNoTaperEndcap.cc
View file
Open in desktop
Expand Up @@ -67,12 +67,12 @@ DDHGCalNoTaperEndcap::createQuarter( DDCompactView& cpv, int xQuadrant, int yQua
#ifdef EDM_ML_DEBUG
int rowmax(0), column(0);
#endif
while (abs(offsetX) < m_rMax) {
while (std::abs(offsetX) < m_rMax) {
#ifdef EDM_ML_DEBUG
column++;
int row(0);
#endif
while (abs(offsetY) < m_rMax) {
while (std::abs(offsetY) < m_rMax) {
#ifdef EDM_ML_DEBUG
row++;
#endif
Expand Down