ENH: make treatment of stream allocators more uniform (issue #532)

- use allocator class to wrap the stream pointers instead of passing
  them into ISstream, OSstream and using a dynamic cast to delete
  then. This is especially important if we will have a bidirectional
  stream (can't delete twice!).

STYLE:

- file stream constructors with std::string (C++11)

- for rewind, explicit about in|out direction. This is not currently
  important, but avoids surprises with any future bidirectional access.

- combined string streams in StringStream.H header.
  Similar to <sstream> include that has both input and output string
  streams.

applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L

@@ -46,7 +46,7 @@ Description
 #include <cstdio>
 
 #include "scalar.H"
-#include "IStringStream.H"
+#include "StringStream.H"
 
 using namespace Foam;
 
@@ -271,7 +271,6 @@ elementType           ^{space}"TYPE"{cspace}
 
 #include "fileName.H"
 #include <fstream>
-using std::ifstream;
 
 
 label findFace(const polyMesh& mesh, const face& f)
@@ -318,8 +317,8 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
 
-    fileName ansysFile(args[1]);
-    ifstream ansysStream(ansysFile.c_str());
+    const fileName ansysFile(args[1]);
+    std::ifstream ansysStream(ansysFile);
 
     if (!ansysStream)
     {

applications/utilities/mesh/conversion/datToFoam/datToFoam.C

@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
 
-    std::ifstream plot3dFile(args[1].c_str());
+    std::ifstream plot3dFile(args[1]);
 
     string line;
     std::getline(plot3dFile, line);

applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L

@@ -43,7 +43,7 @@ Description
 
 #include "argList.H"
 #include "Time.H"
-#include "IStringStream.H"
+#include "StringStream.H"
 #include "polyMesh.H"
 #include "emptyPolyPatch.H"
 #include "wallPolyPatch.H"
@@ -906,7 +906,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
 
     const fileName fluentFile = args[1];
-    std::ifstream fluentStream(fluentFile.c_str());
+    std::ifstream fluentStream(fluentFile);
 
     if (!fluentStream)
     {

applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C

@@ -26,7 +26,6 @@ License
 #include <fstream>
 #include <iostream>
 
-using std::ofstream;
 using std::ios;
 
 #include "Time.H"
@@ -49,18 +48,16 @@ Foam::fluentFvMesh::fluentFvMesh(const IOobject& io)
 
 void Foam::fluentFvMesh::writeFluentMesh() const
 {
-    // make a directory called proInterface in the case
+    // Make a directory called fluentInterface in the case
     mkDir(time().rootPath()/time().caseName()/"fluentInterface");
 
-    // open a file for the mesh
-    ofstream fluentMeshFile
+    // Open a file for the mesh
+    std::ofstream fluentMeshFile
     (
-        (
-            time().rootPath()/
-            time().caseName()/
-            "fluentInterface"/
-            time().caseName() + ".msh"
-        ).c_str()
+        time().rootPath()
+      / time().caseName()
+      / "fluentInterface"
+      / time().caseName() + ".msh"
     );
 
     Info<< "Writing Header" << endl;

applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L

@@ -41,7 +41,7 @@ Description
  \* ------------------------------------------------------------------------- */
 
 #include "scalarList.H"
-#include "IStringStream.H"
+#include "StringStream.H"
 
 // For EOF only
 #include <cstdio>
@@ -622,7 +622,6 @@ mtype                 {space}"MTYPE:"{space}
 
 #include "fileName.H"
 #include <fstream>
-using std::ifstream;
 
 int main(int argc, char *argv[])
 {
@@ -647,7 +646,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
 
     const fileName gambitFile = args[1];
-    ifstream gambitStream(gambitFile.c_str());
+    std::ifstream gambitStream(gambitFile);
 
     if (!gambitStream)
     {

applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H

@@ -1,4 +1,4 @@
-ifstream kivaFile(kivaFileName.c_str());
+std::ifstream kivaFile(kivaFileName);
 
 if (!kivaFile.good())
 {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C

@@ -27,8 +27,7 @@ License
 #include "point.H"
 #include "Istream.H"
 #include "Ostream.H"
-#include "OStringStream.H"
-#include "IStringStream.H"
+#include "StringStream.H"
 
 // * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
 

applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C

@@ -36,7 +36,6 @@ Description
 #include "argList.H"
 #include "fvMesh.H"
 #include "pointFields.H"
-#include "IStringStream.H"
 #include "volPointInterpolation.H"
 
 using namespace Foam;

applications/utilities/mesh/manipulation/objToVTK/objToVTK.C

@@ -34,16 +34,12 @@ Description
 
 #include "argList.H"
 #include "OFstream.H"
-#include <fstream>
-#include <sstream>
-#include "IStringStream.H"
+#include "StringStream.H"
 #include "point.H"
 #include "DynamicList.H"
 
-
 using namespace Foam;
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 string getLine(std::ifstream& is)
@@ -122,7 +118,7 @@ int main(int argc, char *argv[])
     const fileName objName = args[1];
     const fileName outName = args[2];
 
-    std::ifstream OBJfile(objName.c_str());
+    std::ifstream OBJfile(objName);
 
     if (!OBJfile.good())
     {

applications/utilities/mesh/manipulation/setSet/setSet.C

@@ -36,7 +36,7 @@ Description
 #include "Time.H"
 #include "polyMesh.H"
 #include "globalMeshData.H"
-#include "IStringStream.H"
+#include "StringStream.H"
 #include "cellSet.H"
 #include "faceSet.H"
 #include "pointSet.H"

applications/utilities/mesh/manipulation/setsToZones/setsToZones.C

@@ -46,12 +46,9 @@ Description
 #include "argList.H"
 #include "Time.H"
 #include "polyMesh.H"
-#include "IStringStream.H"
 #include "cellSet.H"
 #include "faceSet.H"
 #include "pointSet.H"
-#include "OFstream.H"
-#include "IFstream.H"
 #include "IOobjectList.H"
 #include "SortableList.H"
 #include "timeSelector.H"

applications/utilities/mesh/manipulation/transformPoints/transformPoints.C

@@ -68,7 +68,7 @@ Usage
 #include "pointFields.H"
 #include "transformField.H"
 #include "transformGeometricField.H"
-#include "IStringStream.H"
+#include "StringStream.H"
 #include "mathematicalConstants.H"
 
 using namespace Foam;