From 5c673119ada6f4f0f93a05a2fdde0a235da0cb0e Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 29 Jun 2016 17:58:38 +0100 Subject: [PATCH] BUG: ensightFile: does not handle writeKeyword since no virtual for const word& Related to #132. --- src/conversion/ensight/file/ensightFile.C | 1 - src/conversion/ensight/file/ensightFile.H | 12 ++++++------ src/conversion/ensight/file/ensightGeoFile.C | 7 ++++++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/conversion/ensight/file/ensightFile.C b/src/conversion/ensight/file/ensightFile.C index 46809d4ebe..700b39c014 100644 --- a/src/conversion/ensight/file/ensightFile.C +++ b/src/conversion/ensight/file/ensightFile.C @@ -182,7 +182,6 @@ Foam::Ostream& Foam::ensightFile::write(const char* value) } return *this; - } diff --git a/src/conversion/ensight/file/ensightFile.H b/src/conversion/ensight/file/ensightFile.H index faf07bd265..03cbdcd703 100644 --- a/src/conversion/ensight/file/ensightFile.H +++ b/src/conversion/ensight/file/ensightFile.H @@ -144,7 +144,7 @@ public: using Ostream::write; //- Binary write - virtual Ostream& write(const char* buf, std::streamsize count); + virtual Ostream& write(const char*, std::streamsize count); //- Write element keyword with trailing newline, optionally with undef virtual Ostream& writeKeyword(const keyType&); @@ -156,19 +156,19 @@ public: Ostream& writeUndef(); //- Write C-string as "%79s" or as binary (max 80 chars) - Ostream& write(const char* value); + Ostream& write(const char*); //- Write string as "%79s" or as binary (max 80 chars) - Ostream& write(const string& value); + Ostream& write(const string&); //- Write integer as "%10d" or as binary - Ostream& write(const label value); + Ostream& write(const label); //- Write integer with specified width or as binary - Ostream& write(const label value, const label fieldWidth); + Ostream& write(const label, const label fieldWidth); //- Write float as "%12.5e" or as binary - Ostream& write(const scalar value); + Ostream& write(const scalar); //- Add carriage return to ascii stream void newline(); diff --git a/src/conversion/ensight/file/ensightGeoFile.C b/src/conversion/ensight/file/ensightGeoFile.C index 214a882a5e..9c0ceecdf9 100644 --- a/src/conversion/ensight/file/ensightGeoFile.C +++ b/src/conversion/ensight/file/ensightGeoFile.C @@ -25,6 +25,8 @@ License #include "ensightGeoFile.H" +#include "IOstreams.H" + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // void Foam::ensightGeoFile::initialize() @@ -74,7 +76,10 @@ Foam::ensightGeoFile::~ensightGeoFile() Foam::Ostream& Foam::ensightGeoFile::writeKeyword(const keyType& key) { - write(key); newline(); + // Note: make sure to hit ensightFile::write(const string&) + write(string(key)); + + newline(); return *this; }