diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index 5fc5a839b13d8d86a06828551200584335ca9f4c..063af46c66118b07ab87b42faf9bb834d83a5d76 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -83,8 +83,6 @@ class objectRegistry;
Class IOobject Declaration
\*---------------------------------------------------------------------------*/
-#include "CintDefs.H"
-
class IOobject
{
@@ -395,7 +393,6 @@ public:
void operator=(const IOobject&);
};
-#include "CintUndefs.H"
#if defined (__GNUC__)
template<>
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
index b9b2b43355036cd097bee6d6212302d1a833ca55..a9c50741e932333e10c53b8163ab704533918126 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
@@ -74,8 +74,6 @@ namespace Foam
Class IOstream Declaration
\*---------------------------------------------------------------------------*/
-#include "CintDefs.H"
-
class IOstream
{
@@ -543,7 +541,6 @@ public:
}
};
-#include "CintUndefs.H"
Ostream& operator<<(Ostream& os, const IOstream::streamFormat& sf);
Ostream& operator<<(Ostream& os, const IOstream::versionNumber& vn);
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
index cff0a59bb620bf96e1e324111c783573e64c248e..6ea3380777f252c4bc76faaed0309f1d20311f60 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
@@ -70,6 +70,7 @@ protected:
//- Current indent level
unsigned short indentLevel_;
+
public:
// Constructors
@@ -87,10 +88,9 @@ public:
{}
- // Destructor
-
- virtual ~Ostream()
- {}
+ //- Destructor
+ virtual ~Ostream()
+ {}
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
index 3a34761db789bc27ddfdc0ac27b698d5a10299d6..891c8f0dab8472b7d13aca6e0e881619e7e3501b 100644
--- a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
+++ b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
@@ -98,6 +98,12 @@ public:
}
+ // Destructor
+
+ virtual ~ITstream()
+ {}
+
+
// Member functions
// Inquiry
@@ -142,31 +148,31 @@ public:
// Read functions
//- Return next token from stream
- Istream& read(token&);
+ virtual Istream& read(token&);
//- Read a character
- Istream& read(char&);
+ virtual Istream& read(char&);
//- Read a word
- Istream& read(word&);
+ virtual Istream& read(word&);
// Read a string (including enclosing double-quotes)
- Istream& read(string&);
+ virtual Istream& read(string&);
//- Read a label
- Istream& read(label&);
+ virtual Istream& read(label&);
//- Read a floatScalar
- Istream& read(floatScalar&);
+ virtual Istream& read(floatScalar&);
//- Read a doubleScalar
- Istream& read(doubleScalar&);
+ virtual Istream& read(doubleScalar&);
//- Read binary block
- Istream& read(char*, std::streamsize);
+ virtual Istream& read(char*, std::streamsize);
//- Rewind and return the stream so that it may be read again
- Istream& rewind();
+ virtual Istream& rewind();
// Edit
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index c7fc48d6345b5aca2bbda500ad86ed9895e75aff..0880b13d13262ef949a75b7de29932fcb87b6f82 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -66,8 +66,6 @@ Ostream& operator<<(Ostream&, const token&);
Class token Declaration
\*---------------------------------------------------------------------------*/
-#include "CintDefs.H"
-
class token
{
@@ -429,7 +427,6 @@ public:
friend ostream& operator<<(ostream&, const InfoProxy<token>&);
};
-#include "CintUndefs.H"
Ostream& operator<<(Ostream&, const token::punctuationToken&);
ostream& operator<<(ostream&, const token::punctuationToken&);
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
index e4255827bf60572cdf5d43f8b0cf5da577d79fe8..6fc94aa1ad6ca8255832a3981d1bd5a42bab1d10 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
@@ -80,7 +80,7 @@ class includeEntry
public:
//- Runtime type information
- TypeName("include");
+ ClassName("include");
// Member Functions
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
index da3bd7a0676ae53a969fdaa7f09e0a696916e363..4aace67dfaff2c01f98bfe7e31aeca78bc800be4 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
@@ -96,7 +96,7 @@ class inputModeEntry
public:
//- Runtime type information
- TypeName("inputMode");
+ ClassName("inputMode");
// Member Functions
@@ -118,7 +118,6 @@ public:
//- Return true if the inputMode is %error
static bool error();
-
};
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
index 1ed2d99639228540938aba2c4d993a3a749a6185..b98da86e67de68f421d4865389a8c74e812fddd7 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
@@ -74,7 +74,7 @@ class removeEntry
public:
//- Runtime type information
- TypeName("remove");
+ ClassName("remove");
// Member Functions
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
index c5189c1520d6c2ddb955f300d27c9d9c7eb1edf0..afc391248380ea12f90f3fd14cf9fa5b5db8bd5c 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
@@ -66,9 +66,6 @@ class primitiveEntry
public entry,
public ITstream
{
-
-public:
-
// Private member functions
//- Append the given token to this entry
@@ -93,9 +90,6 @@ public:
Istream&
);
- //- Read tokens from the given stream
- bool read(const dictionary&, Istream&);
-
//- Read the complete entry from the given stream
void readEntry(const dictionary&, Istream&);
@@ -169,6 +163,9 @@ public:
// calling this function generates a FatalError
dictionary& dict();
+ //- Read tokens from the given stream
+ bool read(const dictionary&, Istream&);
+
// Write
void write(Ostream&) const;
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
index 79c9cd4bae2f48d2273199ce81afc4a7aa2e06c2..1b9915d5730da34d75fca1c2680911217c1fd1cb 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
@@ -62,12 +62,10 @@ Istream& operator>>(Istream&, DynamicField<Type>&);
Class DynamicField Declaration
\*---------------------------------------------------------------------------*/
-#include "CintDefs.H"
-
template<class Type>
class DynamicField
:
- public Field<Type> //private Field<Type>
+ public Field<Type>
{
// Private data
@@ -185,26 +183,16 @@ public:
// IOstream operators
- friend Ostream& operator<<
- #ifndef __CINT__
- <Type>
- #endif
+ friend Ostream& operator<< <Type>
(Ostream&, const DynamicField<Type>&);
- friend Ostream& operator<<
- #ifndef __CINT__
- <Type>
- #endif
+ friend Ostream& operator<< <Type>
(Ostream&, const tmp<DynamicField<Type> >&);
- friend Istream& operator>>
- #ifndef __CINT__
- <Type>
- #endif
+ friend Istream& operator>> <Type>
(Istream&, DynamicField<Type>&);
};
-#include "CintUndefs.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index f45c7907051d35591d3bf2346b21bcd84a22eeee..98e664ec8d5a503fb0ea98802fe0ab54dc8414f4 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -75,8 +75,6 @@ class dictionary;
Class Field Declaration
\*---------------------------------------------------------------------------*/
-#include "CintDefs.H"
-
template<class Type>
class Field
:
@@ -348,7 +346,6 @@ public:
(Ostream&, const tmp<Field<Type> >&);
};
-#include "CintUndefs.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //