From 3345fd837836cb0cfd60aeb24d2d6e9ce40d17d9 Mon Sep 17 00:00:00 2001
From: Henry Weller <henry@nero.(none)>
Date: Mon, 22 Jun 2009 21:03:57 +0100
Subject: [PATCH] Removed support for cint.
---
.../sourceTemplate/foamTemplateTemplate.H | 10 +---
etc/apps/cint/bashrc | 51 -------------------
etc/apps/cint/cshrc | 34 -------------
etc/bashrc | 1 -
etc/cshrc | 1 -
etc/settings.sh | 2 +-
.../HashTables/HashPtrTable/HashPtrTable.H | 10 +---
.../HashTables/HashTable/HashTable.H | 10 +---
.../HashTables/HashTable/HashTableI.H | 5 +-
.../LinkedLists/accessTypes/ILList/ILList.H | 5 +-
.../LinkedLists/accessTypes/LList/LList.H | 10 +---
.../accessTypes/LPtrList/LPtrList.H | 10 +---
.../LinkedLists/accessTypes/UILList/UILList.H | 5 +-
.../Lists/DynamicList/DynamicList.H | 10 +---
.../containers/Lists/FixedList/FixedList.H | 10 +---
.../containers/Lists/FixedList/FixedListI.H | 2 -
src/OpenFOAM/containers/Lists/List/List.H | 5 +-
.../Lists/UIndirectList/UIndirectList.H | 12 ++---
src/OpenFOAM/containers/Lists/UList/UList.H | 10 ++--
src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H | 2 -
.../db/IOstreams/IOstreams/IOstream.H | 7 +--
.../db/IOstreams/IOstreams/InfoProxy.H | 9 +---
src/OpenFOAM/db/IOstreams/IOstreams/Istream.H | 3 --
src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H | 3 --
src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H | 2 -
src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H | 2 -
src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H | 2 -
src/OpenFOAM/db/IOstreams/token/token.H | 2 -
src/OpenFOAM/db/error/error.H | 5 --
src/OpenFOAM/db/error/messageStream.H | 3 --
.../dimensionedType/dimensionedType.H | 10 +---
src/OpenFOAM/fields/Fields/Field/Field.H | 12 +----
src/OpenFOAM/include/CintDefs.H | 6 ---
src/OpenFOAM/include/CintUndefs.H | 6 ---
.../meshes/primitiveShapes/line/line.H | 10 +---
.../primitiveShapes/objectHit/PointHit.H | 7 +--
.../SphericalTensor/SphericalTensorI.H | 4 +-
.../primitives/SymmTensor/SymmTensorI.H | 4 +-
src/OpenFOAM/primitives/Tensor/TensorI.H | 5 +-
src/OpenFOAM/primitives/Tuple2/Tuple2.H | 20 ++------
.../primitives/VectorSpace/VectorSpace.H | 10 +---
.../primitives/VectorSpace/VectorSpaceI.H | 4 +-
.../primitives/VectorSpace/products.H | 48 -----------------
wmake/rules/General/cint | 12 -----
wmake/rules/SiCortex64Gcc/general | 1 -
wmake/rules/SunOS64Gcc/general | 3 +-
wmake/rules/linux64Gcc/general | 1 -
wmake/rules/linux64Gcc42/general | 1 -
wmake/rules/linux64Gcc43/general | 1 -
wmake/rules/linuxGcc/general | 1 -
wmake/rules/linuxGcc43/general | 1 -
wmake/rules/linuxPPC64Gcc/general | 1 -
52 files changed, 53 insertions(+), 358 deletions(-)
delete mode 100644 etc/apps/cint/bashrc
delete mode 100644 etc/apps/cint/cshrc
delete mode 100644 src/OpenFOAM/include/CintDefs.H
delete mode 100644 src/OpenFOAM/include/CintUndefs.H
delete mode 100644 wmake/rules/General/cint
diff --git a/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H b/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H
index fa32697e0a8..76bdd558601 100644
--- a/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H
+++ b/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H
@@ -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>&);
};
diff --git a/etc/apps/cint/bashrc b/etc/apps/cint/bashrc
deleted file mode 100644
index dbbd89631e2..00000000000
--- a/etc/apps/cint/bashrc
+++ /dev/null
@@ -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
-
-# -----------------------------------------------------------------------------
diff --git a/etc/apps/cint/cshrc b/etc/apps/cint/cshrc
deleted file mode 100644
index f2c38c481a3..00000000000
--- a/etc/apps/cint/cshrc
+++ /dev/null
@@ -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
-#
-#------------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index edd0265b63d..aae664f98a2 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -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
diff --git a/etc/cshrc b/etc/cshrc
index 17e75ba888d..3e6af0cd448 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -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
diff --git a/etc/settings.sh b/etc/settings.sh
index aacd41f8bca..3ba1667a3fc 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -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
;;
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index 8ae3697f1dd..78cb735e170 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -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>&
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 0e13b7c9a1d..3871db3a50e 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -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>&
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index e2655da4334..5212d57f516 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -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
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
index 2e0823fe3d6..20635fa53f9 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
@@ -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>&
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
index 9c8a22945ac..0905f5543cb 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
@@ -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>&
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
index ed98956ad5b..333d916a65a 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
@@ -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>&
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
index feefd60c7c8..61585d6ac8c 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
@@ -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>&
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 460d325006d..daccd7af3d1 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -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>&
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index 6c64a92d03f..76f9527701d 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -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>&
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index 055f785471b..1c3fe7131e6 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -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__
// ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 434320cf5b2..a6bf29686a5 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -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>&);
};
diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
index ec6a1b9fd6f..0219e02af72 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
@@ -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>&
+ );
};
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 6370f8e749f..f7db8226ff7 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -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
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
index 29079d33f8c..7ad2ebd88a1 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
@@ -148,9 +148,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Global predefined null output stream
-#ifndef __CINT__
extern OFstream Snull;
-#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
index f2846f47f57..b9b2b433550 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
@@ -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
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H b/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
index b4f48ab18f8..ff2c1e8a3e7 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
@@ -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>&);
};
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
index f446f2938f2..701c674b14f 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
@@ -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
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
index f82c7962225..cff0a59bb62 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
@@ -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';
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index ba7904639c0..dff94c259f7 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -151,9 +151,7 @@ public:
// Ostream Operator
- #ifndef __CINT__
friend Ostream& operator<<(Ostream&, const commsStruct&);
- #endif
};
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
index 45dc5a607ce..fe778fa0103 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
@@ -58,9 +58,7 @@ class ISstream
// Private data
fileName name_;
- #ifndef __CINT__
istream& is_;
- #endif
// Private member functions
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
index 75d18ef7937..5c862afd931 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
@@ -58,9 +58,7 @@ class OSstream
// Private data
fileName name_;
- #ifndef __CINT__
ostream& os_;
- #endif
// Private Member Functions
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 2defc09d73b..c7fc48d6345 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -206,9 +206,7 @@ public:
// IOstream Operators
- #ifndef __MAKECINT__
friend Ostream& operator<<(Ostream&, const compound&);
- #endif
};
diff --git a/src/OpenFOAM/db/error/error.H b/src/OpenFOAM/db/error/error.H
index 1cd9574e6dc..639bd933c6e 100644
--- a/src/OpenFOAM/db/error/error.H
+++ b/src/OpenFOAM/db/error/error.H
@@ -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
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/error/messageStream.H b/src/OpenFOAM/db/error/messageStream.H
index 20b04363276..d37f6a010c7 100644
--- a/src/OpenFOAM/db/error/messageStream.H
+++ b/src/OpenFOAM/db/error/messageStream.H
@@ -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&();
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 1ad252955a3..6817098a6cb 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -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>&);
};
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index e56e4633713..f45c7907051 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -198,13 +198,11 @@ public:
//- Return a pointer to a new calculatedFvPatchFieldField created on
// freestore without setting patchField values
- #ifndef __CINT__
template<class Type2>
static tmp<Field<Type> > NewCalculatedType(const Field<Type2>& f)
{
return tmp<Field<Type> >(new Field<Type>(f.size()));
}
- #endif
// Member Functions
@@ -343,16 +341,10 @@ public:
// IOstream operators
- friend Ostream& operator<<
- #ifndef __CINT__
- <Type>
- #endif
+ friend Ostream& operator<< <Type>
(Ostream&, const Field<Type>&);
- friend Ostream& operator<<
- #ifndef __CINT__
- <Type>
- #endif
+ friend Ostream& operator<< <Type>
(Ostream&, const tmp<Field<Type> >&);
};
diff --git a/src/OpenFOAM/include/CintDefs.H b/src/OpenFOAM/include/CintDefs.H
deleted file mode 100644
index 90e1f62a2f1..00000000000
--- a/src/OpenFOAM/include/CintDefs.H
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifdef __CINT__
-# define tmp Foam::tmp
-# define UList Foam::UList
-# define List Foam::List
-# define InfoProxy Foam::InfoProxy
-#endif
diff --git a/src/OpenFOAM/include/CintUndefs.H b/src/OpenFOAM/include/CintUndefs.H
deleted file mode 100644
index 6b0b69e99ce..00000000000
--- a/src/OpenFOAM/include/CintUndefs.H
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifdef __CINT__
-# undef tmp
-# undef UList
-# undef List
-# undef InfoProxy
-#endif
diff --git a/src/OpenFOAM/meshes/primitiveShapes/line/line.H b/src/OpenFOAM/meshes/primitiveShapes/line/line.H
index 8af00d5bf9a..e9f7c0296f8 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/line/line.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/line/line.H
@@ -124,19 +124,13 @@ public:
// Ostream operator
- friend Istream& operator>>
- #ifndef __CINT__
- <Point, PointRef>
- #endif
+ friend Istream& operator>> <Point, PointRef>
(
Istream&,
line&
);
- friend Ostream& operator<<
- #ifndef __CINT__
- <Point, PointRef>
- #endif
+ friend Ostream& operator<< <Point, PointRef>
(
Ostream&,
const line&
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
index 8ae9afc7f24..375978a0b22 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
@@ -184,10 +184,7 @@ public:
// Ostream operator
- friend Ostream& operator<<
- #ifndef __CINT__
- <Point>
- #endif
+ friend Ostream& operator<< <Point>
(
Ostream& os,
const PointHit<Point>& b
@@ -202,7 +199,7 @@ inline Ostream& operator<<(Ostream& os, const PointHit<Point>& b)
<< b.rawPoint() << token::SPACE
<< b.distance() << token::SPACE
<< b.eligibleMiss();
-
+
return os;
}
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
index 28b7b8b9d30..0459aedecf2 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
@@ -181,7 +181,7 @@ inline Cmpt det(const SphericalTensor<Cmpt>& st)
template <class Cmpt>
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>
class innerProduct<SphericalTensor<Cmpt>, SphericalTensor<Cmpt> >
{
@@ -227,7 +226,6 @@ public:
typedef Vector<Cmpt> type;
};
-#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index 5a2de5dbbda..3078f941e6a 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -520,7 +520,6 @@ public:
typedef SymmTensor<Cmpt> type;
};
-#ifndef __CINT__
template<class Cmpt>
class innerProduct<SymmTensor<Cmpt>, SymmTensor<Cmpt> >
{
@@ -529,7 +528,6 @@ public:
typedef SymmTensor<Cmpt> type;
};
-
template<class Cmpt>
class innerProduct<SymmTensor<Cmpt>, Vector<Cmpt> >
{
@@ -578,7 +576,7 @@ public:
typedef SymmTensor<Cmpt> type;
};
-#endif
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 7ca9958aa18..71e7c0c7673 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -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());
}
-#ifndef __CINT__
template<class Cmpt>
class typeOfSum<SphericalTensor<Cmpt>, Tensor<Cmpt> >
{
@@ -679,7 +678,7 @@ public:
typedef Tensor<Cmpt> type;
};
-#endif
+
// * * * * * * * * * * Mixed Tensor SymmTensor Operators * * * * * * * * * * //
@@ -806,7 +805,6 @@ operator&&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
);
}
-#ifndef __CINT__
template<class Cmpt>
class typeOfSum<SymmTensor<Cmpt>, Tensor<Cmpt> >
{
@@ -839,7 +837,6 @@ public:
typedef Tensor<Cmpt> type;
};
-#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Tuple2/Tuple2.H b/src/OpenFOAM/primitives/Tuple2/Tuple2.H
index 9a850e62366..cac45958727 100644
--- a/src/OpenFOAM/primitives/Tuple2/Tuple2.H
+++ b/src/OpenFOAM/primitives/Tuple2/Tuple2.H
@@ -139,19 +139,13 @@ public:
// Friend Operators
- friend bool operator==
- #ifndef __CINT__
- <Type1, Type2>
- #endif
+ friend bool operator== <Type1, Type2>
(
const Tuple2<Type1, Type2>& a,
const Tuple2<Type1, Type2>& b
);
- friend bool operator!=
- #ifndef __CINT__
- <Type1, Type2>
- #endif
+ friend bool operator!= <Type1, Type2>
(
const Tuple2<Type1, Type2>& a,
const Tuple2<Type1, Type2>& b
@@ -161,20 +155,14 @@ public:
// IOstream operators
//- Read Tuple2 from Istream, discarding contents of existing Tuple2.
- friend Istream& operator>>
- #ifndef __CINT__
- <Type1, Type2>
- #endif
+ friend Istream& operator>> <Type1, Type2>
(
Istream& is,
Tuple2<Type1, Type2>& t2
);
// Write Tuple2 to Ostream.
- friend Ostream& operator<<
- #ifndef __CINT__
- <Type1, Type2>
- #endif
+ friend Ostream& operator<< <Type1, Type2>
(
Ostream& os,
const Tuple2<Type1, Type2>& t2
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
index dda9bd28042..31e5b84f4aa 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
@@ -136,19 +136,13 @@ public:
// IOstream Operators
- friend Istream& operator>>
- #ifndef __CINT__
- <Form, Cmpt, nCmpt>
- #endif
+ friend Istream& operator>> <Form, Cmpt, nCmpt>
(
Istream&,
VectorSpace<Form, Cmpt, nCmpt>&
);
- friend Ostream& operator<<
- #ifndef __CINT__
- <Form, Cmpt, nCmpt>
- #endif
+ friend Ostream& operator<< <Form, Cmpt, nCmpt>
(
Ostream&,
const VectorSpace<Form, Cmpt, nCmpt>&
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
index f368c6b8aef..eeea5f6bffe 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
@@ -263,7 +263,6 @@ inline const Cmpt& component
// Powers of a Form
// Equivalent to outer-products between the Form and itself
-#ifndef __CINT__
// Form^0 = 1.0
template<class Form, class Cmpt, int nCmpt>
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));
}
-#endif
+
template<class Form, class Cmpt, int nCmpt>
inline scalar magSqr
@@ -515,7 +514,6 @@ inline Form operator+
return v;
}
-
template<class Form, class Cmpt, int nCmpt>
inline Form operator-
(
diff --git a/src/OpenFOAM/primitives/VectorSpace/products.H b/src/OpenFOAM/primitives/VectorSpace/products.H
index d91790f02c1..64647f71462 100644
--- a/src/OpenFOAM/primitives/VectorSpace/products.H
+++ b/src/OpenFOAM/primitives/VectorSpace/products.H
@@ -61,8 +61,6 @@ public:
};
-#ifndef __CINT__
-
template<class arg1, class arg2>
class outerProduct
{
@@ -121,52 +119,6 @@ public:
>::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
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/wmake/rules/General/cint b/wmake/rules/General/cint
deleted file mode 100644
index f09d622977c..00000000000
--- a/wmake/rules/General/cint
+++ /dev/null
@@ -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)
diff --git a/wmake/rules/SiCortex64Gcc/general b/wmake/rules/SiCortex64Gcc/general
index 11b48acc3fc..d70a77cdb03 100644
--- a/wmake/rules/SiCortex64Gcc/general
+++ b/wmake/rules/SiCortex64Gcc/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/SunOS64Gcc/general b/wmake/rules/SunOS64Gcc/general
index 70ee588d82d..f9b56321985 100644
--- a/wmake/rules/SunOS64Gcc/general
+++ b/wmake/rules/SunOS64Gcc/general
@@ -1,11 +1,10 @@
CPP = /lib/cpp $(GFLAGS)
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 $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general
index 3c2e4db2ee3..10237bd1b67 100644
--- a/wmake/rules/linux64Gcc/general
+++ b/wmake/rules/linux64Gcc/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linux64Gcc42/general b/wmake/rules/linux64Gcc42/general
index 11b48acc3fc..d70a77cdb03 100644
--- a/wmake/rules/linux64Gcc42/general
+++ b/wmake/rules/linux64Gcc42/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general
index 3c2e4db2ee3..10237bd1b67 100644
--- a/wmake/rules/linux64Gcc43/general
+++ b/wmake/rules/linux64Gcc43/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general
index d009001a6e3..02ad6973ff3 100644
--- a/wmake/rules/linuxGcc/general
+++ b/wmake/rules/linuxGcc/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general
index d009001a6e3..02ad6973ff3 100644
--- a/wmake/rules/linuxGcc43/general
+++ b/wmake/rules/linuxGcc43/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
-include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general
index 2626ab65d12..76d507634a9 100644
--- a/wmake/rules/linuxPPC64Gcc/general
+++ b/wmake/rules/linuxPPC64Gcc/general
@@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
-include $(GENERAL_RULES)/cint
--
GitLab