Commit 5d41d4cd authored by Andrew J. Burns (Cont's avatar Andrew J. Burns (Cont
Browse files

Merge branch 'master' of /data/Repository/Xdmf2 into ajb-dev

parents a72f4007 70882edb
...@@ -80,7 +80,7 @@ check_cxx_source_compiles(" ...@@ -80,7 +80,7 @@ check_cxx_source_compiles("
struct Base { virtual ~Base(){} }; struct Base { virtual ~Base(){} };
struct Derived : public Base {}; struct Derived : public Base {};
int main(int ac, char * av) int main(int ac, char ** av)
{ {
boost::shared_ptr<Base> ptr(new Base()); boost::shared_ptr<Base> ptr(new Base());
boost::shared_dynamic_cast<Derived>(ptr); boost::shared_dynamic_cast<Derived>(ptr);
......
...@@ -71,7 +71,10 @@ public: ...@@ -71,7 +71,10 @@ public:
void void
closeFile() closeFile()
{ {
// remove xpath info as it will not be valid for the new file
mXPath.clear(); mXPath.clear();
mXPathCount = 0;
mXPathString = "";
//this section writes to file //this section writes to file
std::ofstream fileStream; std::ofstream fileStream;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "XdmfTestDataGenerator.hpp" #include "XdmfTestDataGenerator.hpp"
int main(int, char *) int main(int, char **)
{ {
shared_ptr<XdmfExodusWriter> exodusWriter = XdmfExodusWriter::New(); shared_ptr<XdmfExodusWriter> exodusWriter = XdmfExodusWriter::New();
shared_ptr<XdmfUnstructuredGrid> hexahedron = shared_ptr<XdmfUnstructuredGrid> hexahedron =
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "XdmfUnstructuredGrid.hpp" #include "XdmfUnstructuredGrid.hpp"
#include "XdmfWriter.hpp" #include "XdmfWriter.hpp"
int main(int, char *) int main(int, char **)
{ {
shared_ptr<XdmfTopologyConverter> converter = shared_ptr<XdmfTopologyConverter> converter =
XdmfTopologyConverter::New(); XdmfTopologyConverter::New();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment