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

Add -Wno-format-contains-nul if we have -Wno-format #17637

Merged
merged 2 commits into from Feb 27, 2017
Merged

Add -Wno-format-contains-nul if we have -Wno-format #17637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4dad93
Add -Wno-format-contains-nul if we have -Wno-format
Feb 27, 2017
644dc8b
Add missing braces
Feb 27, 2017
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 DataFormats/Math/interface/ExtVec.h
View file
Open in desktop
Expand Up @@ -267,8 +267,8 @@ struct Rot2 {
Vec2<T> axis[2];

constexpr Rot2() :
axis{ (Vec){T(1),0},
(Vec){0,T(1)}
axis{{(Vec){T(1),0}},
{(Vec){0,T(1)}}
}{}

constexpr Rot2( Vec2<T> ix, Vec2<T> iy) :
Expand Down
12 changes: 8 additions & 4 deletions DataFormats/Math/test/BuildFile.xml
View file
Open in desktop
Expand Up @@ -11,19 +11,22 @@
<bin file="ProjectMatrix_t.cpp" name="DataFormatsProjectMatrix_t">
</bin>
<bin file="FastMath_t.cpp" name="DataFormatsFastMath_t">
<flags CXXFLAGS="-std=gnu++11 -Wno-error=format -Wno-format"/>
<flags CXXFLAGS="-std=gnu++11 -Wno-error=format -Wno-format -Wno-format-contains-nul"/>
<flags REM_CXXFLAGS="-Wformat -ansi"/>
<flags REM_CXXFLAGS="-Wformat-contains-nul"/>
</bin>
<bin file="testApproximations.cpp" name="testMathApproximations">
<flags CXXFLAGS="-std=gnu++11 -Wno-error=format -Wno-format"/>
<flags CXXFLAGS="-std=gnu++11 -Wno-error=format -Wno-format -Wno-format-contains-nul"/>
<flags REM_CXXFLAGS="-std=c++%"/>
<flags REM_CXXFLAGS="-Wformat"/>
<flags REM_CXXFLAGS="-Wformat-contains-nul"/>
<flags REM_CXXFLAGS="-ansi"/>
</bin>
<bin file="testApproxMath.cpp" name="testMathApproxMath">
<flags CXXFLAGS="-std=gnu++11 -Wno-error=format -Wno-format"/>
<flags CXXFLAGS="-std=gnu++11 -Wno-error=format -Wno-format -Wno-format-contains-nul"/>
<flags REM_CXXFLAGS="-std=c++%"/>
<flags REM_CXXFLAGS="-Wformat"/>
<flags REM_CXXFLAGS="-Wformat-contains-nul"/>
<flags REM_CXXFLAGS="-ansi"/>
</bin>

Expand All @@ -48,9 +51,10 @@
</bin>

<bin file="deltaR_t.cpp" name="DataFormatsDeltaR_t">
<flags CXXFLAGS="-ffast-math -std=gnu++11 -Wno-error=format -Wno-format"/>
<flags CXXFLAGS="-ffast-math -std=gnu++11 -Wno-error=format -Wno-format -Wno-format-contains-nul"/>
<flags REM_CXXFLAGS="-std=c++%"/>
<flags REM_CXXFLAGS="-Wformat"/>
<flags REM_CXXFLAGS="-Wformat-contains-nul"/>
<flags REM_CXXFLAGS="-ansi"/>
</bin>
<bin file="Similarity_t.cpp" name="DataFormatsSimilarity_t">
Expand Down
3 changes: 1 addition & 2 deletions MagneticField/Interpolation/BuildFile.xml
View file
Open in desktop
Expand Up @@ -4,5 +4,4 @@
<export>
<lib name="1"/>
</export>
<flags CXXFLAGS="-Wno-format"/>

<flags CXXFLAGS="-Wno-format -Wno-format-contains-nul"/>
2 changes: 1 addition & 1 deletion MagneticField/Interpolation/test/BuildFile.xml
View file
Open in desktop
Expand Up @@ -15,4 +15,4 @@
<use name="clhep"/>
<use name="MagneticField/Interpolation"/>
</bin>
<flags CXXFLAGS="-Wno-format"/>
<flags CXXFLAGS="-Wno-format -Wno-format-contains-nul"/>