zhyang-dev/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates for clang++-3.9

Browse Source
This commit is contained in:
Henry Weller
2017-01-18 18:12:45 +00:00
parent 9d39850df3
commit 63dee8f2da
9 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenFOAM/fields/Fields/Field/FieldMapper.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -32,13 +32,13 @@ Description
#ifndef FieldMapper_H #ifndef FieldMapper_H
#define FieldMapper_H #define FieldMapper_H
#include "mapDistributeBase.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
class mapDistributeBase;
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class FieldMapper Declaration Class FieldMapper Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
@ -76,7 +76,7 @@ public:
FatalErrorInFunction FatalErrorInFunction
<< "attempt to access null distributeMap" << "attempt to access null distributeMap"
<< abort(FatalError); << abort(FatalError);
return *static_cast<mapDistributeBase*>(nullptr); return *(new mapDistributeBase());
} }
//- Are there unmapped values? I.e. do all size() elements get //- Are there unmapped values? I.e. do all size() elements get

4
src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -29,8 +29,8 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
const Foam::labelRange Foam::labelRange::endLabelRange_;
const Foam::labelRange::const_iterator Foam::labelRange::endIter_; const Foam::labelRange::const_iterator Foam::labelRange::endIter_;
int Foam::labelRange::debug(::Foam::debug::debugSwitch("labelRange", 0)); int Foam::labelRange::debug(::Foam::debug::debugSwitch("labelRange", 0));

8
src/OpenFOAM/primitives/ranges/labelRange/labelRange.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,6 +31,7 @@ SourceFiles
labelRange.C labelRange.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef labelRange_H #ifndef labelRange_H
#define labelRange_H #define labelRange_H
@ -79,6 +80,7 @@ public:
} }
}; };
// Constructors // Constructors
//- Construct an empty range //- Construct an empty range
@ -196,9 +198,11 @@ public:
private: private:
//- const labelRange held by endIter_
static const labelRange endLabelRange_;
//- const_iterator returned by end(), cend() //- const_iterator returned by end(), cend()
static const const_iterator endIter_; static const const_iterator endIter_;
}; };

4
src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -50,7 +50,7 @@ inline Foam::labelRange::labelRange(const label start, const label size)
inline Foam::labelRange::const_iterator::const_iterator() inline Foam::labelRange::const_iterator::const_iterator()
: :
range_(*reinterpret_cast<Foam::labelRange* >(0)), range_(endLabelRange_),
index_(-1) index_(-1)
{} {}

3
src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,6 +28,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
const Foam::labelRanges Foam::labelRanges::endLabelRanges_;
const Foam::labelRanges::const_iterator Foam::labelRanges::endIter_; const Foam::labelRanges::const_iterator Foam::labelRanges::endIter_;

6
src/OpenFOAM/primitives/ranges/labelRange/labelRanges.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -170,9 +170,11 @@ public:
private: private:
//- const labelRanges held by endIter_
static const labelRanges endLabelRanges_;
//- const_iterator returned by end(), cend() //- const_iterator returned by end(), cend()
static const const_iterator endIter_; static const const_iterator endIter_;
}; };

4
src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -42,7 +42,7 @@ inline Foam::labelRanges::labelRanges(const label nElem)
inline Foam::labelRanges::const_iterator::const_iterator() inline Foam::labelRanges::const_iterator::const_iterator()
: :
list_(*reinterpret_cast<Foam::labelRanges* >(0)), list_(endLabelRanges_),
index_(-1), index_(-1),
subIndex_(-1) subIndex_(-1)
{} {}

2
wmake/rules/linux64Clang/c++
View File

@ -1,6 +1,6 @@
SUFFIXES += .C SUFFIXES += .C
c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-undefined-var-template
# Suppress some warnings for flex++ and CGAL # Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-tautological-undefined-compare -Wno-shift-negative-value c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-tautological-undefined-compare -Wno-shift-negative-value

4
wmake/rules/linuxClang/c++
View File

@ -1,9 +1,9 @@
SUFFIXES += .C SUFFIXES += .C
c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-undefined-var-template
# Suppress some warnings for flex++ and CGAL # Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedef -Wno-tautological-undefined-compare -Wno-shift-negative-value c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-tautological-undefined-compare -Wno-shift-negative-value
CC = clang++ -std=c++11 -m32 CC = clang++ -std=c++11 -m32