Remove swig support ifdefs

This commit is contained in:
Hrvoje Jasak 2018-06-18 11:12:55 +01:00
parent 367f3b33d4
commit 7a848fd050
23 changed files with 8 additions and 67 deletions

View file

@ -77,7 +77,6 @@ public:
//- Declare run-time constructor selection table
#ifndef SWIG
declareRunTimeSelectionTable
(
autoPtr,
@ -91,7 +90,6 @@ public:
),
(p, U, T, thermo)
);
#endif
// Constructors

View file

@ -70,7 +70,6 @@ public:
// Declare run-time constructor selection table
#ifndef SWIG
declareRunTimeSelectionTable
(
autoPtr,
@ -79,7 +78,6 @@ public:
(const IOobject& io),
(io)
);
#endif
// Constructors

View file

@ -103,7 +103,6 @@ public:
// Declare run-time constructor selection tables
#ifndef SWIG
declareRunTimeSelectionTable
(
tmp,
@ -142,7 +141,7 @@ public:
),
(p, iF, dict)
);
#endif
// Constructors
@ -391,13 +390,11 @@ public:
// Ostream operator
#ifndef SWIG
friend Ostream& operator<< <Type>
(
Ostream&,
const fvsPatchField<Type>&
);
#endif
};

View file

@ -470,7 +470,6 @@ public:
// Friend operators
#ifndef SWIG
friend tmp<GeometricField<Type, fvPatchField, volMesh> >
operator& <Type>
(
@ -507,7 +506,6 @@ public:
Ostream&,
const fvMatrix<Type>&
);
#endif
};

View file

@ -149,7 +149,6 @@ public:
// Declare run-time constructor selection tables
#ifndef SWIG
declareRunTimeSelectionTable
(
autoPtr,
@ -158,7 +157,6 @@ public:
(const polyPatch& patch, const fvBoundaryMesh& bm),
(patch, bm)
);
#endif
// Constructors

View file

@ -208,7 +208,6 @@ public:
// IOstream operators
#ifndef SWIG
// Write DynamicList to Ostream
friend Ostream& operator<< <T, SizeInc, SizeMult, SizeDiv>
(
@ -222,7 +221,6 @@ public:
Istream&,
DynamicList<T, SizeInc, SizeMult, SizeDiv>&
);
#endif
};

View file

@ -70,10 +70,8 @@ template<class T> class SLList;
template<class T, unsigned Size>
class FixedList
{
#ifndef SWIG
//- Size must be positive (non-zero) and also fit as a signed value
StaticAssert(Size && Size <= INT_MAX);
#endif
// Private data
@ -340,8 +338,6 @@ public:
// IOstream operators
//- Read List from Istream, discarding contents of existing List.
#ifndef SWIG
friend Istream& operator>> <T, Size>
(Istream&, FixedList<T, Size>&);
@ -351,7 +347,6 @@ public:
Ostream&,
const FixedList<T, Size>&
);
#endif
};

View file

@ -241,10 +241,8 @@ public:
// Istream operator
#ifndef SWIG
//- Read List from Istream, discarding contents of existing List.
friend Istream& operator>> <T>(Istream&, List<T>&);
#endif
};

View file

@ -293,13 +293,11 @@ public:
// IOstream operator
#ifndef SWIG
//- Read List from Istream, discarding contents of existing List.
friend Istream& operator>> <T>(Istream&, PtrList<T>&);
// Write List to Ostream.
friend Ostream& operator<< <T>(Ostream&, const PtrList<T>&);
#endif
};

View file

@ -344,13 +344,11 @@ public:
// Ostream operator
// Write UList to Ostream.
#ifndef SWIG
friend Ostream& operator<< <T>
(
Ostream&,
const UList<T>&
);
#endif
};

View file

@ -61,10 +61,8 @@ class NamedEnum
:
public HashTable<int>
{
#ifndef SWIG
//- nEnum must be positive (non-zero)
StaticAssert(nEnum > 0);
#endif
// Private Member Functions

View file

@ -145,9 +145,9 @@ public:
return autoPtr<coordinateRotation>(new coordinateRotation(*this));
}
// Declare run-time constructor selection table
#ifndef SWIG
declareRunTimeSelectionTable
(
autoPtr,
@ -158,7 +158,6 @@ public:
),
(dict)
);
#endif
// Selectors
@ -170,8 +169,7 @@ public:
);
// Destructor
//- Destructor
virtual ~coordinateRotation()
{}

View file

@ -260,7 +260,6 @@ public:
// Declare run-time constructor selection table
#ifndef SWIG
declareRunTimeSelectionTable
(
autoPtr,
@ -285,7 +284,6 @@ public:
),
(name, origin, cr)
);
#endif
// Selectors
@ -310,8 +308,7 @@ public:
static autoPtr<coordinateSystem> New(Istream& is);
// Destructor
//- Destructor
virtual ~coordinateSystem();

View file

@ -50,11 +50,7 @@ namespace Foam
class IOobjectList
:
#ifndef SWIG
public HashPtrTable<IOobject>
#else
public HashPtrTable<IOobject, word, string_hash>
#endif
{
// Private Member Functions

View file

@ -213,7 +213,6 @@ public:
//- A templated class for holding compound tokens
#ifndef SWIG
template<class T>
class Compound
:
@ -240,7 +239,7 @@ public:
operator<<(os, static_cast<const T&>(*this));
}
};
#endif
//- Static undefined token
static token undefinedToken;

View file

@ -51,11 +51,7 @@ namespace Foam
class objectRegistry
:
public regIOobject,
#ifndef SWIG
public HashTable<regIOobject*>
#else
public HashTable<regIOobject*, word, string_hash>
#endif
{
// Private Data

View file

@ -192,13 +192,11 @@ public:
// IOstream operators
#ifndef SWIG
friend Istream& operator>> <Type>
(Istream&, dimensioned<Type>&);
friend Ostream& operator<< <Type>
(Ostream&, const dimensioned<Type>&);
#endif
};

View file

@ -173,13 +173,10 @@ public:
);
//- Construct by transferring the DimensionedField
#ifndef SWIG
DimensionedField
(
const Xfer<DimensionedField<Type, GeoMesh> >&
);
#endif
//- Construct as copy of tmp<DimensionedField> deleting argument
# ifdef ConstructFromTmp
@ -212,13 +209,11 @@ public:
);
//- Construct by transferring the DimensionedField with a new name
#ifndef SWIG
DimensionedField
(
const word& newName,
const Xfer<DimensionedField<Type, GeoMesh> >&
);
#endif
//- Construct as copy resetting name
# ifdef ConstructFromTmp
@ -325,7 +320,6 @@ public:
// Ostream Operators
#ifndef SWIG
friend Ostream& operator<< <Type, GeoMesh>
(
Ostream&,
@ -337,7 +331,6 @@ public:
Ostream&,
const tmp<DimensionedField<Type, GeoMesh> >&
);
#endif
};

View file

@ -188,7 +188,6 @@ public:
// IOstream operators
#ifndef SWIG
friend Ostream& operator<< <Field, Type>
(
Ostream&,
@ -200,7 +199,6 @@ public:
Ostream&,
const tmp<FieldField<Field, Type> >&
);
#endif
};

View file

@ -352,13 +352,11 @@ public:
// IOstream operators
#ifndef SWIG
friend Ostream& operator<< <Type>
(Ostream&, const Field<Type>&);
friend Ostream& operator<< <Type>
(Ostream&, const tmp<Field<Type> >&);
#endif
};

View file

@ -237,7 +237,6 @@ public:
// Declare run-time constructor selection tables
#ifndef SWIG
declareRunTimeSelectionTable
(
autoPtr,
@ -266,7 +265,6 @@ public:
),
(name, dict, index, bm)
);
#endif
// Constructors

View file

@ -34,8 +34,6 @@ Description
namespace Foam
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //

View file

@ -136,7 +136,6 @@ public:
// IOstream Operators
#ifndef SWIG
friend Istream& operator>> <Form, Cmpt, nCmpt>
(
Istream&,
@ -148,7 +147,6 @@ public:
Ostream&,
const VectorSpace<Form, Cmpt, nCmpt>&
);
#endif
};