zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed support for cint.

Browse Source
This commit is contained in:
Henry Weller
2009-06-22 21:03:57 +01:00
parent bde1e5b2e1
commit 3345fd8378
52 changed files with 53 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H
View File

@ -129,16 +129,10 @@ public:
// IOstream Operators // IOstream Operators
friend Istream& operator>> friend Istream& operator>> <TemplateArgument>
#ifndef __CINT__
<TemplateArgument>
#endif
(Istream&, ClassName<TemplateArgument>&); (Istream&, ClassName<TemplateArgument>&);
friend Ostream& operator<< friend Ostream& operator<< <TemplateArgument>
#ifndef __CINT__
<TemplateArgument>
#endif
(Ostream&, const ClassName<TemplateArgument>&); (Ostream&, const ClassName<TemplateArgument>&);
}; };

51
etc/apps/cint/bashrc
View File

@ -1,51 +0,0 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# cint/bashrc
#
# Description
# Setup file for cint
# Sourced from OpenFOAM-*/etc/bashrc
#
#------------------------------------------------------------------------------
for CINTSYSDIR in \
$HOME/pub/CINT/cint7 \
$WM_THIRD_PARTY_DIR/cint-svn/platforms/$WM_OPTIONS \
;
do
if [ -r $CINTSYSDIR ]
then
export CINTSYSDIR
export PATH=$PATH:$CINTSYSDIR/bin
export MANPATH=$MANPATH:$CINTSYSDIR/doc
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CINTSYSDIR/lib
break
fi
done
[ -r "$CINTSYSDIR" ] || unset CINTSYSDIR
# -----------------------------------------------------------------------------

34
etc/apps/cint/cshrc
View File

@ -1,34 +0,0 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
# \\/ M anipulation |
#-------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# cint/cshrc
#
# Description
# Setup file for cint
# Sourced from OpenFOAM-*/etc/cshrc
#
#------------------------------------------------------------------------------
# -----------------------------------------------------------------------------

1
etc/bashrc
View File

@ -244,7 +244,6 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.sh
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc
_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
_foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc _foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
_foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
# Clean environment paths again. Only remove duplicates # Clean environment paths again. Only remove duplicates

1
etc/cshrc
View File

@ -241,7 +241,6 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.csh
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc
_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
# _foamSource $WM_PROJECT_DIR/etc/apps/ensight/cshrc # _foamSource $WM_PROJECT_DIR/etc/apps/ensight/cshrc
# _foamSource $WM_PROJECT_DIR/etc/apps/cint/cshrc
# Clean environment paths again. Only remove duplicates # Clean environment paths again. Only remove duplicates

2
etc/settings.sh
View File

@ -97,7 +97,7 @@ case "${compilerInstall:-OpenFOAM}" in
OpenFOAM) OpenFOAM)
case "$WM_COMPILER" in case "$WM_COMPILER" in
Gcc) Gcc)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.1/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
;; ;;

10
src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
View File

@ -122,19 +122,13 @@ public:
// IOstream Operators // IOstream Operators
friend Istream& operator>> friend Istream& operator>> <T, Key, Hash>
#ifndef __CINT__
<T, Key, Hash>
#endif
( (
Istream&, Istream&,
HashPtrTable<T, Key, Hash>& HashPtrTable<T, Key, Hash>&
); );
friend Ostream& operator<< friend Ostream& operator<< <T, Key, Hash>
#ifndef __CINT__
<T, Key, Hash>
#endif
( (
Ostream&, Ostream&,
const HashPtrTable<T, Key, Hash>& const HashPtrTable<T, Key, Hash>&

10
src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
View File

@ -417,19 +417,13 @@ public:
// IOstream Operator // IOstream Operator
friend Istream& operator>> friend Istream& operator>> <T, Key, Hash>
#ifndef __CINT__
<T, Key, Hash>
#endif
( (
Istream&, Istream&,
HashTable<T, Key, Hash>& HashTable<T, Key, Hash>&
); );
friend Ostream& operator<< friend Ostream& operator<< <T, Key, Hash>
#ifndef __CINT__
<T, Key, Hash>
#endif
( (
Ostream&, Ostream&,
const HashTable<T, Key, Hash>& const HashTable<T, Key, Hash>&

5
src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
View File

@ -428,20 +428,19 @@ inline bool Foam::HashTable<T, Key, Hash>::const_iterator::operator!=
template<class T, class Key, class Hash> template<class T, class Key, class Hash>
inline const T& inline const T&
Foam::HashTable<T, Key, Hash>::const_iterator::operator*() const Foam::HashTable<T, Key, Hash>::const_iterator::operator*() const
{ {
return elmtPtr_->obj_; return elmtPtr_->obj_;
} }
#ifndef __CINT__
template<class T, class Key, class Hash> template<class T, class Key, class Hash>
inline const T& inline const T&
Foam::HashTable<T, Key, Hash>::const_iterator::operator()() const Foam::HashTable<T, Key, Hash>::const_iterator::operator()() const
{ {
return elmtPtr_->obj_; return elmtPtr_->obj_;
} }
#endif
template<class T, class Key, class Hash> template<class T, class Key, class Hash>
inline inline

5
src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
View File

@ -152,10 +152,7 @@ public:
// Istream operator // Istream operator
//- Read List from Istream, discarding contents of existing List. //- Read List from Istream, discarding contents of existing List.
friend Istream& operator>> friend Istream& operator>> <LListBase, T>
#ifndef __CINT__
<LListBase, T>
#endif
( (
Istream&, Istream&,
ILList<LListBase, T>& ILList<LListBase, T>&

10
src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
View File

@ -327,19 +327,13 @@ public:
// IOstream operators // IOstream operators
friend Istream& operator>> friend Istream& operator>> <LListBase, T>
#ifndef __CINT__
<LListBase, T>
#endif
( (
Istream&, Istream&,
LList<LListBase, T>& LList<LListBase, T>&
); );
friend Ostream& operator<< friend Ostream& operator<< <LListBase, T>
#ifndef __CINT__
<LListBase, T>
#endif
( (
Ostream&, Ostream&,
const LList<LListBase, T>& const LList<LListBase, T>&

10
src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
View File

@ -260,19 +260,13 @@ public:
// IOstream operators // IOstream operators
friend Istream& operator>> friend Istream& operator>> <LListBase, T>
#ifndef __CINT__
<LListBase, T>
#endif
( (
Istream&, Istream&,
LPtrList<LListBase, T>& LPtrList<LListBase, T>&
); );
friend Ostream& operator<< friend Ostream& operator<< <LListBase, T>
#ifndef __CINT__
<LListBase, T>
#endif
( (
Ostream&, Ostream&,
const LPtrList<LListBase, T>& const LPtrList<LListBase, T>&

5
src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
View File

@ -277,10 +277,7 @@ public:
// Ostream operator // Ostream operator
friend Ostream& operator<< friend Ostream& operator<< <LListBase, T>
#ifndef __CINT__
<LListBase, T>
#endif
( (
Ostream&, Ostream&,
const UILList<LListBase, T>& const UILList<LListBase, T>&

10
src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
View File

@ -210,20 +210,14 @@ public:
// IOstream operators // IOstream operators
// Write DynamicList to Ostream. // Write DynamicList to Ostream.
friend Ostream& operator<< friend Ostream& operator<< <T, SizeInc, SizeMult, SizeDiv>
#ifndef __CINT__
<T, SizeInc, SizeMult, SizeDiv>
#endif
( (
Ostream&, Ostream&,
const DynamicList<T, SizeInc, SizeMult, SizeDiv>& const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
); );
//- Read from Istream, discarding contents of existing DynamicList. //- Read from Istream, discarding contents of existing DynamicList.
friend Istream& operator>> friend Istream& operator>> <T, SizeInc, SizeMult, SizeDiv>
#ifndef __CINT__
<T, SizeInc, SizeMult, SizeDiv>
#endif
( (
Istream&, Istream&,
DynamicList<T, SizeInc, SizeMult, SizeDiv>& DynamicList<T, SizeInc, SizeMult, SizeDiv>&

10
src/OpenFOAM/containers/Lists/FixedList/FixedList.H
View File

@ -331,17 +331,11 @@ public:
// IOstream operators // IOstream operators
//- Read List from Istream, discarding contents of existing List. //- Read List from Istream, discarding contents of existing List.
friend Istream& operator>> friend Istream& operator>> <T, Size>
#ifndef __CINT__
<T, Size>
#endif
(Istream&, FixedList<T, Size>&); (Istream&, FixedList<T, Size>&);
// Write FixedList to Ostream. // Write FixedList to Ostream.
friend Ostream& operator<< friend Ostream& operator<< <T, Size>
#ifndef __CINT__
<T, Size>
#endif
( (
Ostream&, Ostream&,
const FixedList<T, Size>& const FixedList<T, Size>&

2
src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
View File

@ -398,7 +398,6 @@ inline bool Foam::FixedList<T, Size>::empty() const
} }
#ifndef __CINT__
template<class T, unsigned Size> template<class T, unsigned Size>
template<class HashT> template<class HashT>
inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator() inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator()
@ -426,6 +425,5 @@ inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator()
} }
} }
#endif // __CINT__
// ************************************************************************* // // ************************************************************************* //

5
src/OpenFOAM/containers/Lists/List/List.H
View File

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

12
src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
View File

@ -97,16 +97,16 @@ public:
//- Assignment of all entries to the given value //- Assignment of all entries to the given value
inline void operator=(const T&); inline void operator=(const T&);
// Ostream operator // Ostream operator
//- Write UIndirectList to Ostream //- Write UIndirectList to Ostream
// Binary output is currently still a bit of a problem // Binary output is currently still a bit of a problem
friend Ostream& operator<< friend Ostream& operator<< <T>
#ifndef __CINT__ (
<T> Ostream&,
#endif const UIndirectList<T>&
(Ostream&, const UIndirectList<T>&); );
}; };

10
src/OpenFOAM/containers/Lists/UList/UList.H
View File

@ -313,11 +313,11 @@ public:
// Ostream operator // Ostream operator
// Write UList to Ostream. // Write UList to Ostream.
friend Ostream& operator<< friend Ostream& operator<< <T>
#ifndef __CINT__ (
<T> Ostream&,
#endif const UList<T>&
(Ostream&, const UList<T>&); );
}; };
// Reverse the first n elements of the list // Reverse the first n elements of the list

2
src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
View File

@ -148,9 +148,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Global predefined null output stream // Global predefined null output stream
#ifndef __CINT__
extern OFstream Snull; extern OFstream Snull;
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

7
src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
View File

@ -193,9 +193,7 @@ public:
//- Ostream operator //- Ostream operator
#ifndef __MAKECINT__
friend Ostream& operator<<(Ostream& os, const versionNumber& vn); friend Ostream& operator<<(Ostream& os, const versionNumber& vn);
#endif
}; };
@ -421,7 +419,7 @@ public:
} }
//- Return compression of given compression name //- Return compression of given compression name
static compressionType compressionEnum(const word&); static compressionType compressionEnum(const word&);
//- Return the stream compression //- Return the stream compression
compressionType compression() const compressionType compression() const
@ -554,7 +552,6 @@ Ostream& operator<<(Ostream& os, const IOstream::versionNumber& vn);
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// ------ Manipulators (not taking arguments) // ------ Manipulators (not taking arguments)
// -------------------------------------------------------------------- // --------------------------------------------------------------------
#ifndef __CINT__
typedef IOstream& (*IOstreamManip)(IOstream&); typedef IOstream& (*IOstreamManip)(IOstream&);
@ -595,8 +592,6 @@ inline IOstream& scientific(IOstream& io)
return io; return io;
} }
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

9
src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
View File

@ -52,19 +52,14 @@ class InfoProxy
{ {
public: public:
#ifndef __MAKECINT__
const T& t_; const T& t_;
#endif
InfoProxy(const T& t) InfoProxy(const T& t)
: :
t_(t) t_(t)
{} {}
friend Ostream& operator<< friend Ostream& operator<< <T>
#ifndef __CINT__
<T>
#endif
(Ostream&, const InfoProxy<T>&); (Ostream&, const InfoProxy<T>&);
}; };

3
src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
View File

@ -152,7 +152,6 @@ public:
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// ------ Manipulators (not taking arguments) // ------ Manipulators (not taking arguments)
// -------------------------------------------------------------------- // --------------------------------------------------------------------
#ifndef __CINT__
typedef Istream& (*IstreamManip)(Istream&); typedef Istream& (*IstreamManip)(Istream&);
@ -169,8 +168,6 @@ inline Istream& operator>>(Istream& is, IOstreamManip f)
return is; return is;
} }
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
View File

@ -199,7 +199,6 @@ public:
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// ------ Manipulators (not taking arguments) // ------ Manipulators (not taking arguments)
// -------------------------------------------------------------------- // --------------------------------------------------------------------
#ifndef __CINT__
typedef Ostream& (*OstreamManip)(Ostream&); typedef Ostream& (*OstreamManip)(Ostream&);
@ -254,8 +253,6 @@ inline Ostream& endl(Ostream& os)
return os; return os;
} }
#endif
// Useful aliases for tab and newline characters // Useful aliases for tab and newline characters
static const char tab = '\t'; static const char tab = '\t';

2
src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
View File

@ -151,9 +151,7 @@ public:
// Ostream Operator // Ostream Operator
#ifndef __CINT__
friend Ostream& operator<<(Ostream&, const commsStruct&); friend Ostream& operator<<(Ostream&, const commsStruct&);
#endif
}; };

2
src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
View File

@ -58,9 +58,7 @@ class ISstream
// Private data // Private data
fileName name_; fileName name_;
#ifndef __CINT__
istream& is_; istream& is_;
#endif
// Private member functions // Private member functions

2
src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
View File

@ -58,9 +58,7 @@ class OSstream
// Private data // Private data
fileName name_; fileName name_;
#ifndef __CINT__
ostream& os_; ostream& os_;
#endif
// Private Member Functions // Private Member Functions

2
src/OpenFOAM/db/IOstreams/token/token.H
View File

@ -206,9 +206,7 @@ public:
// IOstream Operators // IOstream Operators
#ifndef __MAKECINT__
friend Ostream& operator<<(Ostream&, const compound&); friend Ostream& operator<<(Ostream&, const compound&);
#endif
}; };

5
src/OpenFOAM/db/error/error.H
View File

@ -150,12 +150,9 @@ public:
//- Convert to Ostream //- Convert to Ostream
// Prints basic message and then returns Ostream for further info. // Prints basic message and then returns Ostream for further info.
#ifndef __CINT__
operator OSstream&(); operator OSstream&();
#endif
//- Explicitly convert to Ostream for << operations //- Explicitly convert to Ostream for << operations
// needed in cint
OSstream& operator()() OSstream& operator()()
{ {
return operator OSstream&(); return operator OSstream&();
@ -311,9 +308,7 @@ extern IOerror FatalIOError;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifndef __CINT__
#include "errorManip.H" #include "errorManip.H"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
src/OpenFOAM/db/error/messageStream.H
View File

@ -182,12 +182,9 @@ public:
); );
//- Convert to Ostream for << operations //- Convert to Ostream for << operations
#ifndef __CINT__
operator OSstream&(); operator OSstream&();
#endif
//- Explicitly convert to Ostream for << operations //- Explicitly convert to Ostream for << operations
// needed in cint
OSstream& operator()() OSstream& operator()()
{ {
return operator OSstream&(); return operator OSstream&();

10
src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
View File

@ -174,16 +174,10 @@ public:
// IOstream operators // IOstream operators
friend Istream& operator>> friend Istream& operator>> <Type>
#ifndef __CINT__
<Type>
#endif
(Istream&, dimensioned<Type>&); (Istream&, dimensioned<Type>&);
friend Ostream& operator<< friend Ostream& operator<< <Type>
#ifndef __CINT__
<Type>
#endif
(Ostream&, const dimensioned<Type>&); (Ostream&, const dimensioned<Type>&);
}; };

12
src/OpenFOAM/fields/Fields/Field/Field.H
View File

@ -198,13 +198,11 @@ public:
//- Return a pointer to a new calculatedFvPatchFieldField created on //- Return a pointer to a new calculatedFvPatchFieldField created on
// freestore without setting patchField values // freestore without setting patchField values
#ifndef __CINT__
template<class Type2> template<class Type2>
static tmp<Field<Type> > NewCalculatedType(const Field<Type2>& f) static tmp<Field<Type> > NewCalculatedType(const Field<Type2>& f)
{ {
return tmp<Field<Type> >(new Field<Type>(f.size())); return tmp<Field<Type> >(new Field<Type>(f.size()));
} }
#endif
// Member Functions // Member Functions
@ -343,16 +341,10 @@ public:
// IOstream operators // IOstream operators
friend Ostream& operator<< friend Ostream& operator<< <Type>
#ifndef __CINT__
<Type>
#endif
(Ostream&, const Field<Type>&); (Ostream&, const Field<Type>&);
friend Ostream& operator<< friend Ostream& operator<< <Type>
#ifndef __CINT__
<Type>
#endif
(Ostream&, const tmp<Field<Type> >&); (Ostream&, const tmp<Field<Type> >&);
}; };

6
src/OpenFOAM/include/CintDefs.H
View File

@ -1,6 +0,0 @@
#ifdef __CINT__
# define tmp Foam::tmp
# define UList Foam::UList
# define List Foam::List
# define InfoProxy Foam::InfoProxy
#endif

6
src/OpenFOAM/include/CintUndefs.H
View File

@ -1,6 +0,0 @@
#ifdef __CINT__
# undef tmp
# undef UList
# undef List
# undef InfoProxy
#endif

10
src/OpenFOAM/meshes/primitiveShapes/line/line.H
View File

@ -124,19 +124,13 @@ public:
// Ostream operator // Ostream operator
friend Istream& operator>> friend Istream& operator>> <Point, PointRef>
#ifndef __CINT__
<Point, PointRef>
#endif
( (
Istream&, Istream&,
line& line&
); );
friend Ostream& operator<< friend Ostream& operator<< <Point, PointRef>
#ifndef __CINT__
<Point, PointRef>
#endif
( (
Ostream&, Ostream&,
const line& const line&

7
src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
View File

@ -184,10 +184,7 @@ public:
// Ostream operator // Ostream operator
friend Ostream& operator<< friend Ostream& operator<< <Point>
#ifndef __CINT__
<Point>
#endif
( (
Ostream& os, Ostream& os,
const PointHit<Point>& b const PointHit<Point>& b
@ -202,7 +199,7 @@ inline Ostream& operator<<(Ostream& os, const PointHit<Point>& b)
<< b.rawPoint() << token::SPACE << b.rawPoint() << token::SPACE
<< b.distance() << token::SPACE << b.distance() << token::SPACE
<< b.eligibleMiss(); << b.eligibleMiss();
return os; return os;
} }

4
src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
View File

@ -181,7 +181,7 @@ inline Cmpt det(const SphericalTensor<Cmpt>& st)
template <class Cmpt> template <class Cmpt>
inline SphericalTensor<Cmpt> inv(const SphericalTensor<Cmpt>& st) inline SphericalTensor<Cmpt> inv(const SphericalTensor<Cmpt>& st)
{ {
return SphericalTensor<Cmpt>(1.0/st.ii()); return SphericalTensor<Cmpt>(1.0/st.ii());
} }
@ -202,7 +202,6 @@ public:
}; };
#ifndef __CINT__
template<class Cmpt> template<class Cmpt>
class innerProduct<SphericalTensor<Cmpt>, SphericalTensor<Cmpt> > class innerProduct<SphericalTensor<Cmpt>, SphericalTensor<Cmpt> >
{ {
@ -227,7 +226,6 @@ public:
typedef Vector<Cmpt> type; typedef Vector<Cmpt> type;
}; };
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
View File

@ -520,7 +520,6 @@ public:
typedef SymmTensor<Cmpt> type; typedef SymmTensor<Cmpt> type;
}; };
#ifndef __CINT__
template<class Cmpt> template<class Cmpt>
class innerProduct<SymmTensor<Cmpt>, SymmTensor<Cmpt> > class innerProduct<SymmTensor<Cmpt>, SymmTensor<Cmpt> >
{ {
@ -529,7 +528,6 @@ public:
typedef SymmTensor<Cmpt> type; typedef SymmTensor<Cmpt> type;
}; };
template<class Cmpt> template<class Cmpt>
class innerProduct<SymmTensor<Cmpt>, Vector<Cmpt> > class innerProduct<SymmTensor<Cmpt>, Vector<Cmpt> >
{ {
@ -578,7 +576,7 @@ public:
typedef SymmTensor<Cmpt> type; typedef SymmTensor<Cmpt> type;
}; };
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

5
src/OpenFOAM/primitives/Tensor/TensorI.H
View File

@ -647,7 +647,6 @@ operator&&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
return(t1.xx()*st2.ii() + t1.yy()*st2.ii() + t1.zz()*st2.ii()); return(t1.xx()*st2.ii() + t1.yy()*st2.ii() + t1.zz()*st2.ii());
} }
#ifndef __CINT__
template<class Cmpt> template<class Cmpt>
class typeOfSum<SphericalTensor<Cmpt>, Tensor<Cmpt> > class typeOfSum<SphericalTensor<Cmpt>, Tensor<Cmpt> >
{ {
@ -679,7 +678,7 @@ public:
typedef Tensor<Cmpt> type; typedef Tensor<Cmpt> type;
}; };
#endif
// * * * * * * * * * * Mixed Tensor SymmTensor Operators * * * * * * * * * * // // * * * * * * * * * * Mixed Tensor SymmTensor Operators * * * * * * * * * * //
@ -806,7 +805,6 @@ operator&&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
); );
} }
#ifndef __CINT__
template<class Cmpt> template<class Cmpt>
class typeOfSum<SymmTensor<Cmpt>, Tensor<Cmpt> > class typeOfSum<SymmTensor<Cmpt>, Tensor<Cmpt> >
{ {
@ -839,7 +837,6 @@ public:
typedef Tensor<Cmpt> type; typedef Tensor<Cmpt> type;
}; };
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

20
src/OpenFOAM/primitives/Tuple2/Tuple2.H
View File

@ -139,19 +139,13 @@ public:
// Friend Operators // Friend Operators
friend bool operator== friend bool operator== <Type1, Type2>
#ifndef __CINT__
<Type1, Type2>
#endif
( (
const Tuple2<Type1, Type2>& a, const Tuple2<Type1, Type2>& a,
const Tuple2<Type1, Type2>& b const Tuple2<Type1, Type2>& b
); );
friend bool operator!= friend bool operator!= <Type1, Type2>
#ifndef __CINT__
<Type1, Type2>
#endif
( (
const Tuple2<Type1, Type2>& a, const Tuple2<Type1, Type2>& a,
const Tuple2<Type1, Type2>& b const Tuple2<Type1, Type2>& b
@ -161,20 +155,14 @@ public:
// IOstream operators // IOstream operators
//- Read Tuple2 from Istream, discarding contents of existing Tuple2. //- Read Tuple2 from Istream, discarding contents of existing Tuple2.
friend Istream& operator>> friend Istream& operator>> <Type1, Type2>
#ifndef __CINT__
<Type1, Type2>
#endif
( (
Istream& is, Istream& is,
Tuple2<Type1, Type2>& t2 Tuple2<Type1, Type2>& t2
); );
// Write Tuple2 to Ostream. // Write Tuple2 to Ostream.
friend Ostream& operator<< friend Ostream& operator<< <Type1, Type2>
#ifndef __CINT__
<Type1, Type2>
#endif
( (
Ostream& os, Ostream& os,
const Tuple2<Type1, Type2>& t2 const Tuple2<Type1, Type2>& t2

10
src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
View File

@ -136,19 +136,13 @@ public:
// IOstream Operators // IOstream Operators
friend Istream& operator>> friend Istream& operator>> <Form, Cmpt, nCmpt>
#ifndef __CINT__
<Form, Cmpt, nCmpt>
#endif
( (
Istream&, Istream&,
VectorSpace<Form, Cmpt, nCmpt>& VectorSpace<Form, Cmpt, nCmpt>&
); );
friend Ostream& operator<< friend Ostream& operator<< <Form, Cmpt, nCmpt>
#ifndef __CINT__
<Form, Cmpt, nCmpt>
#endif
( (
Ostream&, Ostream&,
const VectorSpace<Form, Cmpt, nCmpt>& const VectorSpace<Form, Cmpt, nCmpt>&

4
src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
View File

@ -263,7 +263,6 @@ inline const Cmpt& component
// Powers of a Form // Powers of a Form
// Equivalent to outer-products between the Form and itself // Equivalent to outer-products between the Form and itself
#ifndef __CINT__
// Form^0 = 1.0 // Form^0 = 1.0
template<class Form, class Cmpt, int nCmpt> template<class Form, class Cmpt, int nCmpt>
inline typename powProduct<Form, 0>::type pow inline typename powProduct<Form, 0>::type pow
@ -300,7 +299,7 @@ inline typename powProduct<Form, 2>::type pow
{ {
return sqr(static_cast<const Form&>(v)); return sqr(static_cast<const Form&>(v));
} }
#endif
template<class Form, class Cmpt, int nCmpt> template<class Form, class Cmpt, int nCmpt>
inline scalar magSqr inline scalar magSqr
@ -515,7 +514,6 @@ inline Form operator+
return v; return v;
} }
template<class Form, class Cmpt, int nCmpt> template<class Form, class Cmpt, int nCmpt>
inline Form operator- inline Form operator-
( (

48
src/OpenFOAM/primitives/VectorSpace/products.H
View File

@ -61,8 +61,6 @@ public:
}; };
#ifndef __CINT__
template<class arg1, class arg2> template<class arg1, class arg2>
class outerProduct class outerProduct
{ {
@ -121,52 +119,6 @@ public:
>::type type; >::type type;
}; };
#else
template<class arg1, class arg2>
class outerProduct
{
public:
typedef arg1 type;
};
template<class arg1, class arg2>
class crossProduct
{
public:
typedef arg1 type;
};
template<class arg1, class arg2>
class innerProduct
{
public:
typedef arg1 type;
};
template<class arg1, class arg2>
class scalarProduct
{
public:
typedef typename pTraits<arg1>::cmptType type;
};
template<class arg1, int arg2>
class powProduct
{
public:
typedef arg1 type;
};
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

12
wmake/rules/General/cint
View File

@ -1,12 +0,0 @@
.SUFFIXES: .ldf
ifeq ($(origin WM_SCHEDULER), undefined)
EVAL_LDF = eval
else
EVAL_LDF = $(WM_SCHEDULER)
endif
ldftoo = $(EVAL_LDF) m4 $$SOURCE \> $*.H \; cint -n$*.C -N$(*F) -p -c-1 -A -I${CINTSYSDIR}/inc -I${WM_PROJECT_DIR}/src/OpenFOAM/lnInclude -D__MAKECINT__ -DG__MAKECINT -DG__SHAREDLIB -DG__OSFDLL -DG__ANSI -DG__ERRORCALLBACK -DG__SIGNEDCHAR -DG__NEWSTDHEADER -DG__CINT_VER6 -DG__NATIVELONGLONG -DG__P2FCAST -DG__STD_EXCEPTION -DG__HAVE_CONFIG -DG__NOMAKEINFO -DDP -D__restrict__= -Y0 -DNoInline $*.H \; $(CC) $(c++FLAGS) -c $*.C -o $@
.ldf.dep:
$(MAKE_DEP)

1
wmake/rules/SiCortex64Gcc/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X include $(RULES)/X
include $(RULES)/c include $(RULES)/c
include $(RULES)/c++ include $(RULES)/c++
include $(GENERAL_RULES)/cint

3
wmake/rules/SunOS64Gcc/general
View File

@ -1,11 +1,10 @@
CPP = /lib/cpp $(GFLAGS) CPP = /lib/cpp $(GFLAGS)
LD = ld -64 LD = ld -64
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard
include $(RULES)/X include $(RULES)/X
include $(RULES)/c include $(RULES)/c
include $(RULES)/c++ include $(RULES)/c++
include $(GENERAL_RULES)/cint

1
wmake/rules/linux64Gcc/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X include $(RULES)/X
include $(RULES)/c include $(RULES)/c
include $(RULES)/c++ include $(RULES)/c++
include $(GENERAL_RULES)/cint

1
wmake/rules/linux64Gcc42/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X include $(RULES)/X
include $(RULES)/c include $(RULES)/c
include $(RULES)/c++ include $(RULES)/c++
include $(GENERAL_RULES)/cint

1
wmake/rules/linux64Gcc43/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X include $(RULES)/X
include $(RULES)/c include $(RULES)/c
include $(RULES)/c++ include $(RULES)/c++
include $(GENERAL_RULES)/cint

1
wmake/rules/linuxGcc/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X include $(RULES)/X
include $(RULES)/c include $(RULES)/c
include $(RULES)/c++ include $(RULES)/c++
include $(GENERAL_RULES)/cint

1
wmake/rules/linuxGcc43/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X include $(RULES)/X
include $(RULES)/c include $(RULES)/c
include $(RULES)/c++ include $(RULES)/c++
include $(GENERAL_RULES)/cint

1
wmake/rules/linuxPPC64Gcc/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X include $(RULES)/X
include $(RULES)/c include $(RULES)/c
include $(RULES)/c++ include $(RULES)/c++
include $(GENERAL_RULES)/cint