From 24eafa1b827b3be2913d6fd37f027821dc457d2d Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 16 Feb 2011 17:21:22 +0000 Subject: [PATCH] ENH: dictionary: make virtual for on-the-fly c++ --- src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C | 7 +++++-- src/OpenFOAM/db/dictionary/dictionary.H | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C index 6b34384df0..0954a23a7e 100644 --- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C +++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C @@ -241,10 +241,13 @@ Foam::IOdictionary::IOdictionary(const IOobject& io, const dictionary& dict) Foam::IOdictionary::IOdictionary(const IOobject& io, Istream& is) : - regIOobject(io), - dictionary(is) + regIOobject(io) { dictionary::name() = IOobject::objectPath(); + // Note that we do construct the dictionary null and read in afterwards + // so that if there is some fancy massaging due to a functionEntry in + // the dictionary at least the type information is already complete. + is >> *this; } diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H index e113535624..f1196852bf 100644 --- a/src/OpenFOAM/db/dictionary/dictionary.H +++ b/src/OpenFOAM/db/dictionary/dictionary.H @@ -239,7 +239,7 @@ public: //- Destructor - ~dictionary(); + virtual ~dictionary(); // Member functions