Removed Cint support.

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<>

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);

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

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

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&);

src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H

@@ -80,7 +80,7 @@ class includeEntry
 public:
 
     //- Runtime type information
-    TypeName("include");
+    ClassName("include");
 
 
     // Member Functions

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();
-
 };
 
 

src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H

@@ -74,7 +74,7 @@ class removeEntry
 public:
 
     //- Runtime type information
-    TypeName("remove");
+    ClassName("remove");
 
 
     // Member Functions

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;
 

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"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

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"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //