Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 21:33:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Remove boost::shared_ptr from rendering library

Browse Source 
The remove boost::shared_ptr and the rendering library branches where
developed simultaneously, and thus some of the rendering library
implementation was using boost::shared_ptr like the old code. Bring up
to date with the rest of VTK-m by using std::shared_ptr instead.
This commit is contained in:
Kenneth Moreland 2016-09-12 11:08:06 -06:00
parent 0846d2c890
commit 5455608c69
13 changed files with 26 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/rendering/Actor.h
View File

@ -26,9 +26,7 @@
#include <vtkm/rendering/Canvas.h>
#include <vtkm/rendering/Mapper.h>
VTKM_THIRDPARTY_PRE_INCLUDE
#include <boost/shared_ptr.hpp>
VTKM_THIRDPARTY_POST_INCLUDE
#include <memory>
namespace vtkm {
namespace rendering {
@ -68,7 +66,7 @@ public:
private:
struct InternalsType;
boost::shared_ptr<InternalsType> Internals;
std::shared_ptr<InternalsType> Internals;
struct RangeFunctor;
};

6
vtkm/rendering/CanvasEGL.h
View File

@ -24,9 +24,7 @@
#include <vtkm/rendering/CanvasGL.h>
VTKM_THIRDPARTY_PRE_INCLUDE
#include <boost/shared_ptr.hpp>
VTKM_THIRDPARTY_POST_INCLUDE
#include <memory>
namespace vtkm {
namespace rendering {
@ -57,7 +55,7 @@ public:
vtkm::rendering::Canvas *NewCopy() const VTKM_OVERRIDE;
private:
boost::shared_ptr<detail::CanvasEGLInternals> Internals;
std::shared_ptr<detail::CanvasEGLInternals> Internals;
};
}} //namespace vtkm::rendering

6
vtkm/rendering/CanvasOSMesa.h
View File

@ -24,9 +24,7 @@
#include <vtkm/rendering/CanvasGL.h>
VTKM_THIRDPARTY_PRE_INCLUDE
#include <boost/shared_ptr.hpp>
VTKM_THIRDPARTY_POST_INCLUDE
#include <memory>
namespace vtkm {
namespace rendering {
@ -63,7 +61,7 @@ public:
vtkm::rendering::Canvas *NewCopy() const VTKM_OVERRIDE;
private:
boost::shared_ptr<detail::CanvasOSMesaInternals> Internals;
std::shared_ptr<detail::CanvasOSMesaInternals> Internals;
};
}} //namespace vtkm::rendering

4
vtkm/rendering/ColorTable.cxx
View File

@ -20,6 +20,7 @@
#include <vtkm/rendering/ColorTable.h>
#include <string>
#include <vector>
namespace vtkm {
@ -227,8 +228,7 @@ void ColorTable::Clear()
void ColorTable::Reverse()
{
boost::shared_ptr<detail::ColorTableInternals> oldInternals =
this->Internals;
std::shared_ptr<detail::ColorTableInternals> oldInternals = this->Internals;
this->Clear();

8
vtkm/rendering/ColorTable.h
View File

@ -24,11 +24,7 @@
#include <vtkm/rendering/Color.h>
#include <string>
VTKM_THIRDPARTY_PRE_INCLUDE
#include <boost/shared_ptr.hpp>
VTKM_THIRDPARTY_POST_INCLUDE
#include <memory>
namespace vtkm {
namespace rendering {
@ -49,7 +45,7 @@ struct ColorTableInternals;
class ColorTable
{
private:
boost::shared_ptr<detail::ColorTableInternals> Internals;
std::shared_ptr<detail::ColorTableInternals> Internals;
public:
VTKM_RENDERING_EXPORT

2
vtkm/rendering/MapperRayTracer.cxx
View File

@ -36,7 +36,7 @@ struct MapperRayTracer::InternalsType
{
vtkm::rendering::CanvasRayTracer *Canvas;
vtkm::cont::internal::RuntimeDeviceTracker DeviceTracker;
boost::shared_ptr<vtkm::cont::internal::SimplePolymorphicContainerBase>
std::shared_ptr<vtkm::cont::internal::SimplePolymorphicContainerBase>
RayTracerContainer;
VTKM_CONT_EXPORT

6
vtkm/rendering/MapperRayTracer.h
View File

@ -24,9 +24,7 @@
#include <vtkm/rendering/Mapper.h>
#include <vtkm/rendering/Camera.h>
VTKM_THIRDPARTY_PRE_INCLUDE
#include <boost/shared_ptr.hpp>
VTKM_THIRDPARTY_POST_INCLUDE
#include <memory>
namespace vtkm {
namespace rendering {
@ -61,7 +59,7 @@ public:
private:
struct InternalsType;
boost::shared_ptr<InternalsType> Internals;
std::shared_ptr<InternalsType> Internals;
struct RenderFunctor;
};

2
vtkm/rendering/MapperVolume.cxx
View File

@ -40,7 +40,7 @@ struct MapperVolume::InternalsType
{
vtkm::rendering::CanvasRayTracer *Canvas;
vtkm::cont::internal::RuntimeDeviceTracker DeviceTracker;
boost::shared_ptr<vtkm::cont::internal::SimplePolymorphicContainerBase>
std::shared_ptr<vtkm::cont::internal::SimplePolymorphicContainerBase>
RayTracerContainer;
VTKM_CONT_EXPORT

6
vtkm/rendering/MapperVolume.h
View File

@ -22,9 +22,7 @@
#include <vtkm/rendering/Mapper.h>
VTKM_THIRDPARTY_PRE_INCLUDE
#include <boost/shared_ptr.hpp>
VTKM_THIRDPARTY_POST_INCLUDE
#include <memory>
namespace vtkm {
namespace rendering {
@ -59,7 +57,7 @@ public:
private:
struct InternalsType;
boost::shared_ptr<InternalsType> Internals;
std::shared_ptr<InternalsType> Internals;
struct RenderFunctor;
};

4
vtkm/rendering/Scene.h
View File

@ -27,6 +27,8 @@
#include <vtkm/rendering/Canvas.h>
#include <vtkm/rendering/Mapper.h>
#include <memory>
namespace vtkm {
namespace rendering {
@ -55,7 +57,7 @@ public:
private:
struct InternalsType;
boost::shared_ptr<InternalsType> Internals;
std::shared_ptr<InternalsType> Internals;
};
}} //namespace vtkm::rendering

7
vtkm/rendering/TextureGL.h
View File

@ -26,12 +26,9 @@
#include <vtkm/rendering/ColorTable.h>
#include <memory>
#include <vector>
VTKM_THIRDPARTY_PRE_INCLUDE
#include <boost/shared_ptr.hpp>
VTKM_THIRDPARTY_POST_INCLUDE
namespace vtkm {
namespace rendering {
@ -60,7 +57,7 @@ public:
private:
struct InternalsType;
boost::shared_ptr<InternalsType> Internals;
std::shared_ptr<InternalsType> Internals;
};

8
vtkm/rendering/View.h
View File

@ -28,6 +28,8 @@
#include <vtkm/rendering/Mapper.h>
#include <vtkm/rendering/Scene.h>
#include <memory>
namespace vtkm {
namespace rendering {
@ -137,9 +139,9 @@ protected:
private:
vtkm::rendering::Scene Scene;
boost::shared_ptr<vtkm::rendering::Mapper> MapperPointer;
boost::shared_ptr<vtkm::rendering::Canvas> CanvasPointer;
boost::shared_ptr<vtkm::rendering::WorldAnnotator> WorldAnnotatorPointer;
std::shared_ptr<vtkm::rendering::Mapper> MapperPointer;
std::shared_ptr<vtkm::rendering::Canvas> CanvasPointer;
std::shared_ptr<vtkm::rendering::WorldAnnotator> WorldAnnotatorPointer;
vtkm::rendering::Camera Camera;
};

4
vtkm/worklet/testing/UnitTestCellAverage.cxx
View File

@ -24,10 +24,6 @@
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
VTKM_THIRDPARTY_PRE_INCLUDE
#include <boost/shared_ptr.hpp>
VTKM_THIRDPARTY_POST_INCLUDE
namespace {
void TestCellAverageUniform3D()