Commit 3345fd83 authored by Henry Weller's avatar Henry Weller
Browse files

Removed support for cint.

parent bde1e5b2
......@@ -129,16 +129,10 @@ public:
// IOstream Operators
friend Istream& operator>>
#ifndef __CINT__
<TemplateArgument>
#endif
friend Istream& operator>> <TemplateArgument>
(Istream&, ClassName<TemplateArgument>&);
friend Ostream& operator<<
#ifndef __CINT__
<TemplateArgument>
#endif
friend Ostream& operator<< <TemplateArgument>
(Ostream&, const ClassName<TemplateArgument>&);
};
......
#----------------------------------*-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
# -----------------------------------------------------------------------------
#----------------------------------*-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
#
#------------------------------------------------------------------------------
# -----------------------------------------------------------------------------
......@@ -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/paraview3/bashrc
_foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
_foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
# Clean environment paths again. Only remove duplicates
......
......@@ -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/paraview3/cshrc
# _foamSource $WM_PROJECT_DIR/etc/apps/ensight/cshrc
# _foamSource $WM_PROJECT_DIR/etc/apps/cint/cshrc
# Clean environment paths again. Only remove duplicates
......
......@@ -97,7 +97,7 @@ case "${compilerInstall:-OpenFOAM}" in
OpenFOAM)
case "$WM_COMPILER" in
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/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
;;
......
......@@ -122,19 +122,13 @@ public:
// IOstream Operators
friend Istream& operator>>
#ifndef __CINT__
<T, Key, Hash>
#endif
friend Istream& operator>> <T, Key, Hash>
(
Istream&,
HashPtrTable<T, Key, Hash>&
);
friend Ostream& operator<<
#ifndef __CINT__
<T, Key, Hash>
#endif
friend Ostream& operator<< <T, Key, Hash>
(
Ostream&,
const HashPtrTable<T, Key, Hash>&
......
......@@ -417,19 +417,13 @@ public:
// IOstream Operator
friend Istream& operator>>
#ifndef __CINT__
<T, Key, Hash>
#endif
friend Istream& operator>> <T, Key, Hash>
(
Istream&,
HashTable<T, Key, Hash>&
);
friend Ostream& operator<<
#ifndef __CINT__
<T, Key, Hash>
#endif
friend Ostream& operator<< <T, Key, Hash>
(
Ostream&,
const HashTable<T, Key, Hash>&
......
......@@ -428,20 +428,19 @@ inline bool Foam::HashTable<T, Key, Hash>::const_iterator::operator!=
template<class T, class Key, class Hash>
inline const T&
inline const T&
Foam::HashTable<T, Key, Hash>::const_iterator::operator*() const
{
return elmtPtr_->obj_;
}
#ifndef __CINT__
template<class T, class Key, class Hash>
inline const T&
Foam::HashTable<T, Key, Hash>::const_iterator::operator()() const
{
return elmtPtr_->obj_;
}
#endif
template<class T, class Key, class Hash>
inline
......
......@@ -152,10 +152,7 @@ public:
// Istream operator
//- Read List from Istream, discarding contents of existing List.
friend Istream& operator>>
#ifndef __CINT__
<LListBase, T>
#endif
friend Istream& operator>> <LListBase, T>
(
Istream&,
ILList<LListBase, T>&
......
......@@ -327,19 +327,13 @@ public:
// IOstream operators
friend Istream& operator>>
#ifndef __CINT__
<LListBase, T>
#endif
friend Istream& operator>> <LListBase, T>
(
Istream&,
LList<LListBase, T>&
);
friend Ostream& operator<<
#ifndef __CINT__
<LListBase, T>
#endif
friend Ostream& operator<< <LListBase, T>
(
Ostream&,
const LList<LListBase, T>&
......
......@@ -260,19 +260,13 @@ public:
// IOstream operators
friend Istream& operator>>
#ifndef __CINT__
<LListBase, T>
#endif
friend Istream& operator>> <LListBase, T>
(
Istream&,
LPtrList<LListBase, T>&
);
friend Ostream& operator<<
#ifndef __CINT__
<LListBase, T>
#endif
friend Ostream& operator<< <LListBase, T>
(
Ostream&,
const LPtrList<LListBase, T>&
......
......@@ -277,10 +277,7 @@ public:
// Ostream operator
friend Ostream& operator<<
#ifndef __CINT__
<LListBase, T>
#endif
friend Ostream& operator<< <LListBase, T>
(
Ostream&,
const UILList<LListBase, T>&
......
......@@ -210,20 +210,14 @@ public:
// IOstream operators
// Write DynamicList to Ostream.
friend Ostream& operator<<
#ifndef __CINT__
<T, SizeInc, SizeMult, SizeDiv>
#endif
friend Ostream& operator<< <T, SizeInc, SizeMult, SizeDiv>
(
Ostream&,
const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
);
//- Read from Istream, discarding contents of existing DynamicList.
friend Istream& operator>>
#ifndef __CINT__
<T, SizeInc, SizeMult, SizeDiv>
#endif
friend Istream& operator>> <T, SizeInc, SizeMult, SizeDiv>
(
Istream&,
DynamicList<T, SizeInc, SizeMult, SizeDiv>&
......
......@@ -331,17 +331,11 @@ public:
// IOstream operators
//- Read List from Istream, discarding contents of existing List.
friend Istream& operator>>
#ifndef __CINT__
<T, Size>
#endif
friend Istream& operator>> <T, Size>
(Istream&, FixedList<T, Size>&);
// Write FixedList to Ostream.
friend Ostream& operator<<
#ifndef __CINT__
<T, Size>
#endif
friend Ostream& operator<< <T, Size>
(
Ostream&,
const FixedList<T, Size>&
......
......@@ -398,7 +398,6 @@ inline bool Foam::FixedList<T, Size>::empty() const
}
#ifndef __CINT__
template<class T, unsigned Size>
template<class HashT>
inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator()
......@@ -426,6 +425,5 @@ inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator()
}
}
#endif // __CINT__
// ************************************************************************* //
......@@ -233,10 +233,7 @@ public:
// Istream operator
//- Read List from Istream, discarding contents of existing List.
friend Istream& operator>>
#ifndef __CINT__
<T>
#endif
friend Istream& operator>> <T>
(Istream&, List<T>&);
};
......
......@@ -97,16 +97,16 @@ public:
//- Assignment of all entries to the given value
inline void operator=(const T&);
// Ostream operator
//- Write UIndirectList to Ostream
// Binary output is currently still a bit of a problem
friend Ostream& operator<<
#ifndef __CINT__
<T>
#endif
(Ostream&, const UIndirectList<T>&);
friend Ostream& operator<< <T>
(
Ostream&,
const UIndirectList<T>&
);
};
......
......@@ -313,11 +313,11 @@ public:
// Ostream operator
// Write UList to Ostream.
friend Ostream& operator<<
#ifndef __CINT__
<T>
#endif
(Ostream&, const UList<T>&);
friend Ostream& operator<< <T>
(
Ostream&,
const UList<T>&
);
};
// Reverse the first n elements of the list
......
......@@ -148,9 +148,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Global predefined null output stream
#ifndef __CINT__
extern OFstream Snull;
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -193,9 +193,7 @@ public:
//- Ostream operator
#ifndef __MAKECINT__
friend Ostream& operator<<(Ostream& os, const versionNumber& vn);
#endif
};
......@@ -421,7 +419,7 @@ public:
}
//- Return compression of given compression name
static compressionType compressionEnum(const word&);
static compressionType compressionEnum(const word&);
//- Return the stream compression
compressionType compression() const
......@@ -554,7 +552,6 @@ Ostream& operator<<(Ostream& os, const IOstream::versionNumber& vn);
// --------------------------------------------------------------------
// ------ Manipulators (not taking arguments)
// --------------------------------------------------------------------
#ifndef __CINT__
typedef IOstream& (*IOstreamManip)(IOstream&);
......@@ -595,8 +592,6 @@ inline IOstream& scientific(IOstream& io)
return io;
}
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -52,19 +52,14 @@ class InfoProxy
{
public:
#ifndef __MAKECINT__
const T& t_;
#endif
InfoProxy(const T& t)
:
t_(t)
{}
friend Ostream& operator<<
#ifndef __CINT__
<T>
#endif
friend Ostream& operator<< <T>
(Ostream&, const InfoProxy<T>&);
};
......
......@@ -152,7 +152,6 @@ public:
// --------------------------------------------------------------------
// ------ Manipulators (not taking arguments)
// --------------------------------------------------------------------
#ifndef __CINT__
typedef Istream& (*IstreamManip)(Istream&);
......@@ -169,8 +168,6 @@ inline Istream& operator>>(Istream& is, IOstreamManip f)
return is;
}
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -199,7 +199,6 @@ public:
// --------------------------------------------------------------------
// ------ Manipulators (not taking arguments)
// --------------------------------------------------------------------
#ifndef __CINT__
typedef Ostream& (*OstreamManip)(Ostream&);
......@@ -254,8 +253,6 @@ inline Ostream& endl(Ostream& os)
return os;
}
#endif
// Useful aliases for tab and newline characters
static const char tab = '\t';
......
......@@ -151,9 +151,7 @@ public:
// Ostream Operator
#ifndef __CINT__
friend Ostream& operator<<(Ostream&, const commsStruct&);
#endif
};
......
......@@ -58,9 +58,7 @@ class ISstream
// Private data
fileName name_;
#ifndef __CINT__
istream& is_;
#endif
// Private member functions
......
......@@ -58,9 +58,7 @@ class OSstream
// Private data
fileName name_;
#ifndef __CINT__
ostream& os_;
#endif
// Private Member Functions
......
......@@ -206,9 +206,7 @@ public:
// IOstream Operators
#ifndef __MAKECINT__
friend Ostream& operator<<(Ostream&, const compound&);
#endif
};
......
......@@ -150,12 +150,9 @@ public:
//- Convert to Ostream
// Prints basic message and then returns Ostream for further info.
#ifndef __CINT__
operator OSstream&();
#endif
//- Explicitly convert to Ostream for << operations
// needed in cint
OSstream& operator()()
{
return operator OSstream&();
......@@ -311,9 +308,7 @@ extern IOerror FatalIOError;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifndef __CINT__
#include "errorManip.H"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -182,12 +182,9 @@ public:
);
//- Convert to Ostream for << operations
#ifndef __CINT__
operator OSstream&();
#endif
//- Explicitly convert to Ostream for << operations
// needed in cint
OSstream& operator()()
{
return operator OSstream&();
......
......@@ -174,16 +174,10 @@ public:
// IOstream operators
friend Istream& operator>>
#ifndef __CINT__
<Type>
#endif
friend Istream& operator>> <Type>
(Istream&, dimensioned<Type>&);
friend Ostream& operator<<
#ifndef __CINT__
<Type>
#endif
friend Ostream& operator<< <Type>
(Ostream&, const dimensioned<Type>&);
};
......
......@@ -198,13 +198,11 @@ public:
//- Return a pointer to a new calculatedFvPatchFieldField created on