diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C index 94d63086587a3d1095010f317f955e6f10695f0a..3b51bc10ffafbc45e6430cb7a8339a4639b823ae 100644 --- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C +++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C @@ -287,7 +287,7 @@ Foam::Xfer<Foam::labelList> Foam::PackedBoolList::used() const // * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * // Foam::PackedBoolList& -Foam::PackedBoolList::operator=(const UList<bool>& lst) +Foam::PackedBoolList::operator=(const Foam::UList<bool>& lst) { this->setSize(lst.size()); diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H index f9948d719a242fab123830fd25aadfb0b123066d..697c7983c15d80d30a8de9946999861dfae533fd 100644 --- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H +++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H @@ -115,7 +115,7 @@ public: inline PackedBoolList(const Xfer<PackedList<1> >&); //- Construct from a list of bools - explicit inline PackedBoolList(const UList<bool>&); + explicit inline PackedBoolList(const Foam::UList<bool>&); //- Construct from a list of labels // using the labels as indices to indicate which bits are set diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H index 219fb79b3755a6f72d9476007546a10e1cca2cf4..f781b7370fd21f6506033cf9c093167b32fc7e37 100644 --- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H +++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H @@ -73,7 +73,7 @@ inline Foam::PackedBoolList::PackedBoolList(const Xfer<PackedList<1> >& lst) {} -inline Foam::PackedBoolList::PackedBoolList(const UList<bool>& lst) +inline Foam::PackedBoolList::PackedBoolList(const Foam::UList<bool>& lst) : PackedList<1>() { diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H index f7622cae557d22a280f4351b8aa0275e974c52fc..ffd2dcd21b02538068ded852287775f6a5daed91 100644 --- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H +++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H @@ -47,9 +47,6 @@ SourceFiles namespace Foam { -class Istream; -class Ostream; - // Forward declaration of friend functions and operators template<class T, class BaseType> class CompactIOField; @@ -58,6 +55,7 @@ template<class T, class BaseType> Istream& operator>> Istream&, CompactIOField<T, BaseType>& ); + template<class T, class BaseType> Ostream& operator<< ( Ostream&, @@ -122,23 +120,6 @@ public: void operator=(const CompactIOField<T, BaseType>&); void operator=(const Field<T>&); - - - // IOstream operators - - //- Read Field from Istream, discarding contents of existing Field. - friend Istream& operator>> <T, BaseType> - ( - Istream&, - CompactIOField<T, BaseType>& - ); - - // Write Field to Ostream. - friend Ostream& operator<< <T, BaseType> - ( - Ostream&, - const CompactIOField<T, BaseType>& - ); }; diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C index 0954a23a7e638342677e042dab5839fc3f405c5e..2c5087c120cde91de2592035f556dc9dda3d6b1b 100644 --- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C +++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C @@ -124,16 +124,14 @@ Foam::IOdictionary::IOdictionary(const IOobject& io) regIOobject(io) { // Temporary warning - if (io.readOpt() == IOobject::MUST_READ) + if (debug && io.readOpt() == IOobject::MUST_READ) { WarningIn("IOdictionary::IOdictionary(const IOobject&)") - //FatalErrorIn("IOdictionary::IOdictionary(const IOobject&)") << "Dictionary " << name() << " constructed with IOobject::MUST_READ" " instead of IOobject::MUST_READ_IF_MODIFIED." << nl << "Use MUST_READ_IF_MODIFIED if you need automatic rereading." << endl; - //<< abort(FatalError); } // Everyone check or just master @@ -182,7 +180,7 @@ Foam::IOdictionary::IOdictionary(const IOobject& io, const dictionary& dict) regIOobject(io) { // Temporary warning - if (io.readOpt() == IOobject::MUST_READ) + if (debug && io.readOpt() == IOobject::MUST_READ) { WarningIn ( diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H index e1870f4f47aeb6ecbd34030545b4a22d797f772d..bafba9f87770d9c2dbdc28627b5d18cea147f288 100644 --- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H +++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H @@ -55,6 +55,7 @@ Ostream& operator<< Ostream&, const DynamicField<T, SizeInc, SizeMult, SizeDiv>& ); + template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv> Istream& operator>> ( @@ -234,23 +235,6 @@ public: //- Assignment from UList inline void operator=(const UList<T>&); - - - // IOstream operators - - // Write DynamicField to Ostream. - friend Ostream& operator<< <T, SizeInc, SizeMult, SizeDiv> - ( - Ostream&, - const DynamicField<T, SizeInc, SizeMult, SizeDiv>& - ); - - //- Read from Istream, discarding contents of existing DynamicField. - friend Istream& operator>> <T, SizeInc, SizeMult, SizeDiv> - ( - Istream&, - DynamicField<T, SizeInc, SizeMult, SizeDiv>& - ); }; diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C index 7478de9c9a247d79cfe582d1cd36870cf0c794a9..414e113ec8992f1ea21c86eec2ca228e58c5011d 100644 --- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C +++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C @@ -282,7 +282,7 @@ Foam::label Foam::ptscotchDecomp::decomposeZeroDomains << ( cWeights.size() - ? scalarField::subField(cWeights, nCells, startCell) + ? static_cast<const scalarField&>(scalarField::subField(cWeights, nCells, startCell)) : scalarField(0) );