Commit 583c14de authored by Andrew J. Burns (Cont's avatar Andrew J. Burns (Cont

removed a PARENT_SCOPE that was unessesary, added some missing includes, fixed cxx11 typecasting

parent 1ff6108c
......@@ -120,7 +120,6 @@ HAVE_CXX11_SHARED_PTR)
# Cxx11 does not work with swig due to an issue with swig
if (HAVE_CXX11_SHARED_PTR AND NOT XDMF_WRAP_PYTHON)
set(HAVE_CXX11_SHARED_PTR ${HAVE_CXX11_SHARED_PTR} PARENT_SCOPE)
add_definitions(-DHAVE_CXX11_SHARED_PTR)
endif ()
......
......@@ -147,7 +147,6 @@ int main(int ac, char * av[])
HAVE_CXX11_SHARED_PTR)
if (HAVE_CXX11_SHARED_PTR AND NOT XDMF_WRAP_PYTHON)
set(HAVE_CXX11_SHARED_PTR ${HAVE_CXX11_SHARED_PTR} PARENT_SCOPE)
add_definitions(-DHAVE_CXX11_SHARED_PTR)
endif ()
......
......@@ -1622,7 +1622,7 @@ XdmfHDF5Writer::write(XdmfArray & array)
newDataController->setArrayOffset(curArrayOffset);
array.insert(newDataController);
array.insert(shared_dynamic_cast<XdmfHeavyDataController>(newDataController));
fileNameWalker++;
datasetWalker++;
......
......@@ -31,6 +31,7 @@
#include "XdmfHDF5ControllerDSM.hpp"
#include "XdmfHDF5WriterDSM.hpp"
#include "XdmfError.hpp"
#include "cstring"
#include "stdio.h"
......
......@@ -82,7 +82,7 @@ int main(int, char **)
array2->pushBack(i + 5);
}
shared_ptr<XdmfHDF5Controller> controller1 =
shared_ptr<XdmfHeavyDataController> controller1 =
XdmfHDF5Controller::New("TestXdmfHDF5Visit.h5",
"Test Dataset1",
array1->getArrayType(),
......@@ -91,7 +91,7 @@ int main(int, char **)
std::vector<unsigned int>(1, 10),
std::vector<unsigned int>(1, 10));
shared_ptr<XdmfHDF5Controller> controller2 =
shared_ptr<XdmfHeavyDataController> controller2 =
XdmfHDF5Controller::New("TestXdmfHDF5Visit.h5",
"Test Dataset2",
array2->getArrayType(),
......
......@@ -53,9 +53,9 @@ int main(int, char **)
TIFFClose(tif);
shared_ptr<XdmfTIFFController> controller = XdmfTIFFController::New("compressedstripoutput.tif",
XdmfArrayType::UInt32(),
std::vector<unsigned int>(1, 1000 * 1000));
shared_ptr<XdmfHeavyDataController> controller = XdmfTIFFController::New("compressedstripoutput.tif",
XdmfArrayType::UInt32(),
std::vector<unsigned int>(1, 1000 * 1000));
shared_ptr<XdmfArray> checkarray = XdmfArray::New();
......@@ -74,7 +74,7 @@ int main(int, char **)
// printf("\n");
}
shared_ptr<XdmfTIFFController> hyperslabcontroller = XdmfTIFFController::New("compressedstripoutput.tif",
shared_ptr<XdmfHeavyDataController> hyperslabcontroller = XdmfTIFFController::New("compressedstripoutput.tif",
XdmfArrayType::UInt32(),
std::vector<unsigned int>(2, 0),
std::vector<unsigned int>(2, 2),
......@@ -97,7 +97,7 @@ int main(int, char **)
// printf("\n");
}
shared_ptr<XdmfTIFFController> hyperslabcontroller2 = XdmfTIFFController::New("compressedstripoutput.tif",
shared_ptr<XdmfHeavyDataController> hyperslabcontroller2 = XdmfTIFFController::New("compressedstripoutput.tif",
XdmfArrayType::UInt32(),
std::vector<unsigned int>(1, 0),
std::vector<unsigned int>(1, 2),
......@@ -202,7 +202,7 @@ int main(int, char **)
dirdataspace.push_back(1000);
dirdataspace.push_back(10);
shared_ptr<XdmfTIFFController> dircontroller = XdmfTIFFController::New("compresseddirectories.tif",
shared_ptr<XdmfHeavyDataController> dircontroller = XdmfTIFFController::New("compresseddirectories.tif",
XdmfArrayType::UInt32(),
dirstarts,
dirstrides,
......@@ -233,7 +233,7 @@ int main(int, char **)
dirdims[2] = 5;
shared_ptr<XdmfTIFFController> dircontroller2 = XdmfTIFFController::New("compresseddirectories.tif",
shared_ptr<XdmfHeavyDataController> dircontroller2 = XdmfTIFFController::New("compresseddirectories.tif",
XdmfArrayType::UInt32(),
dirstarts,
dirstrides,
......@@ -260,7 +260,7 @@ int main(int, char **)
// printf("\n\n");
}
shared_ptr<XdmfTIFFController> dircontroller3 = XdmfTIFFController::New("compresseddirectories.tif",
shared_ptr<XdmfHeavyDataController> dircontroller3 = XdmfTIFFController::New("compresseddirectories.tif",
XdmfArrayType::UInt32(),
std::vector<unsigned int>(1, 0),
std::vector<unsigned int>(1, 1),
......@@ -287,7 +287,7 @@ int main(int, char **)
// printf("\n\n");
}
shared_ptr<XdmfTIFFController> dircontroller4 = XdmfTIFFController::New("compresseddirectories.tif",
shared_ptr<XdmfHeavyDataController> dircontroller4 = XdmfTIFFController::New("compresseddirectories.tif",
XdmfArrayType::UInt32(),
std::vector<unsigned int>(1, 2),
std::vector<unsigned int>(1, 6),
......
......@@ -24,6 +24,7 @@
#include <cmath>
#include <iomanip>
#include <iostream>
#include <assert.h>
#include "XdmfArray.hpp"
#include "XdmfArrayType.hpp"
#include "XdmfDiff.hpp"
......
This diff is collapsed.
#include <math.h>
#include <iostream>
#include <assert.h>
#include "XdmfArray.hpp"
#include "XdmfArrayType.hpp"
#include "XdmfAttribute.hpp"
......
#include <cmath>
#include <iostream>
#include <iomanip>
#include <assert.h>
#include "XdmfArray.hpp"
#include "XdmfArrayType.hpp"
#include "XdmfGeometry.hpp"
......
#include <math.h>
#include <iostream>
#include <assert.h>
#include "XdmfArray.hpp"
#include "XdmfArrayType.hpp"
#include "XdmfGeometry.hpp"
......
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