From 305ffbca2775f81939f068201c57e59139fd3210 Mon Sep 17 00:00:00 2001 From: Kenneth Leiter Date: Wed, 30 Jun 2010 15:33:16 -0400 Subject: [PATCH] ENH: Make ItemTag const so it is cannot be modified. --- XdmfAttribute.cpp | 2 +- XdmfAttribute.hpp | 2 +- XdmfDomain.cpp | 2 +- XdmfDomain.hpp | 2 +- XdmfGeometry.cpp | 2 +- XdmfGeometry.hpp | 2 +- XdmfGrid.cpp | 2 +- XdmfGrid.hpp | 2 +- XdmfGridCollection.cpp | 2 +- XdmfGridCollection.hpp | 2 +- XdmfSet.cpp | 2 +- XdmfSet.hpp | 2 +- XdmfTopology.cpp | 2 +- XdmfTopology.hpp | 2 +- core/XdmfArray.cpp | 2 +- core/XdmfArray.hpp | 2 +- core/tests/Cxx/CMakeLists.txt | 1 - core/tests/Cxx/TestXdmfDataItem.cpp | 8 -------- 18 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 core/tests/Cxx/TestXdmfDataItem.cpp diff --git a/XdmfAttribute.cpp b/XdmfAttribute.cpp index 05830637..6cf8d676 100644 --- a/XdmfAttribute.cpp +++ b/XdmfAttribute.cpp @@ -22,7 +22,7 @@ XdmfAttribute::~XdmfAttribute() std::cout << "Deleted Attribute " << this << std::endl; } -std::string XdmfAttribute::ItemTag = "Attribute"; +const std::string XdmfAttribute::ItemTag = "Attribute"; boost::shared_ptr XdmfAttribute::getAttributeCenter() const { diff --git a/XdmfAttribute.hpp b/XdmfAttribute.hpp index 7da8e841..11e89aa3 100644 --- a/XdmfAttribute.hpp +++ b/XdmfAttribute.hpp @@ -22,7 +22,7 @@ public: virtual ~XdmfAttribute(); LOKI_DEFINE_VISITABLE(XdmfAttribute, XdmfDataItem) - static std::string ItemTag; + static const std::string ItemTag; /** * Get the XdmfAttributeCenter associated with this attribute. diff --git a/XdmfDomain.cpp b/XdmfDomain.cpp index 080c5c2a..54d88cbd 100644 --- a/XdmfDomain.cpp +++ b/XdmfDomain.cpp @@ -18,7 +18,7 @@ XdmfDomain::~XdmfDomain() std::cout << "Deleted Domain " << this << std::endl; } -std::string XdmfDomain::ItemTag = "Domain"; +const std::string XdmfDomain::ItemTag = "Domain"; void XdmfDomain::insert(const boost::shared_ptr grid) { diff --git a/XdmfDomain.hpp b/XdmfDomain.hpp index 880c4d9c..9bc57c5b 100644 --- a/XdmfDomain.hpp +++ b/XdmfDomain.hpp @@ -21,7 +21,7 @@ public: virtual ~XdmfDomain(); LOKI_DEFINE_VISITABLE(XdmfDomain, XdmfItem) - static std::string ItemTag; + static const std::string ItemTag; /** * Get a XdmfGrid attached to the domain. diff --git a/XdmfGeometry.cpp b/XdmfGeometry.cpp index bb82751b..365726c5 100644 --- a/XdmfGeometry.cpp +++ b/XdmfGeometry.cpp @@ -21,7 +21,7 @@ XdmfGeometry::~XdmfGeometry() std::cout << "Deleted Geometry " << this << std::endl; } -std::string XdmfGeometry::ItemTag = "Geometry"; +const std::string XdmfGeometry::ItemTag = "Geometry"; boost::shared_ptr XdmfGeometry::getGeometryType() const { diff --git a/XdmfGeometry.hpp b/XdmfGeometry.hpp index cea9398d..750e022c 100644 --- a/XdmfGeometry.hpp +++ b/XdmfGeometry.hpp @@ -22,7 +22,7 @@ public: virtual ~XdmfGeometry(); LOKI_DEFINE_VISITABLE(XdmfGeometry, XdmfDataItem) - static std::string ItemTag; + static const std::string ItemTag; /** * Get the XdmfGeometryType associated with this geometry. diff --git a/XdmfGrid.cpp b/XdmfGrid.cpp index 57b1ceb4..bf2db378 100644 --- a/XdmfGrid.cpp +++ b/XdmfGrid.cpp @@ -24,7 +24,7 @@ XdmfGrid::~XdmfGrid() std::cout << "Deleted Grid " << this << std::endl; } -std::string XdmfGrid::ItemTag = "Grid"; +const std::string XdmfGrid::ItemTag = "Grid"; boost::shared_ptr XdmfGrid::getAttribute(const unsigned int index) { diff --git a/XdmfGrid.hpp b/XdmfGrid.hpp index 548bf97d..40427dde 100644 --- a/XdmfGrid.hpp +++ b/XdmfGrid.hpp @@ -26,7 +26,7 @@ public: virtual ~XdmfGrid(); LOKI_DEFINE_VISITABLE(XdmfGrid, XdmfItem) - static std::string ItemTag; + static const std::string ItemTag; /** * Get an XdmfAttribute attached to this grid. diff --git a/XdmfGridCollection.cpp b/XdmfGridCollection.cpp index 1e7f9eab..3b66bf05 100644 --- a/XdmfGridCollection.cpp +++ b/XdmfGridCollection.cpp @@ -20,7 +20,7 @@ XdmfGridCollection::~XdmfGridCollection() std::cout << "Deleted Collection " << this << std::endl; } -std::string XdmfGridCollection::ItemTag = "Grid"; +const std::string XdmfGridCollection::ItemTag = "Grid"; boost::shared_ptr XdmfGridCollection::getGrid(const unsigned int index) { diff --git a/XdmfGridCollection.hpp b/XdmfGridCollection.hpp index d0c90fa8..172a6148 100644 --- a/XdmfGridCollection.hpp +++ b/XdmfGridCollection.hpp @@ -23,7 +23,7 @@ public: virtual ~XdmfGridCollection(); LOKI_DEFINE_VISITABLE(XdmfGridCollection, XdmfGrid) - static std::string ItemTag; + static const std::string ItemTag; /** * Get a grid from this collection. diff --git a/XdmfSet.cpp b/XdmfSet.cpp index e50e1172..6d62e0fb 100644 --- a/XdmfSet.cpp +++ b/XdmfSet.cpp @@ -20,7 +20,7 @@ XdmfSet::~XdmfSet() std::cout << "Deleted Set " << this << std::endl; } -std::string XdmfSet::ItemTag = "Set"; +const std::string XdmfSet::ItemTag = "Set"; std::string XdmfSet::getName() const { diff --git a/XdmfSet.hpp b/XdmfSet.hpp index dd1fe47d..a2cba4ca 100644 --- a/XdmfSet.hpp +++ b/XdmfSet.hpp @@ -23,7 +23,7 @@ public: virtual ~XdmfSet(); LOKI_DEFINE_VISITABLE(XdmfSet, XdmfDataItem) - static std::string ItemTag; + const static std::string ItemTag; /** * Get the XdmfSetType associated with this set. diff --git a/XdmfTopology.cpp b/XdmfTopology.cpp index 6ff9b7b5..c34ba8c3 100644 --- a/XdmfTopology.cpp +++ b/XdmfTopology.cpp @@ -22,7 +22,7 @@ XdmfTopology::~XdmfTopology() std::cout << "Deleted Topology " << this << std::endl; } -std::string XdmfTopology::ItemTag = "Topology"; +const std::string XdmfTopology::ItemTag = "Topology"; std::string XdmfTopology::getItemTag() const { diff --git a/XdmfTopology.hpp b/XdmfTopology.hpp index 65beaf06..c3423a8d 100644 --- a/XdmfTopology.hpp +++ b/XdmfTopology.hpp @@ -22,7 +22,7 @@ public: virtual ~XdmfTopology(); LOKI_DEFINE_VISITABLE(XdmfTopology, XdmfDataItem) - static std::string ItemTag; + static const std::string ItemTag; std::map getItemProperties() const; diff --git a/core/XdmfArray.cpp b/core/XdmfArray.cpp index 8720f02f..561a34e8 100644 --- a/core/XdmfArray.cpp +++ b/core/XdmfArray.cpp @@ -319,7 +319,7 @@ XdmfArray::~XdmfArray() std::cout << "Deleted Array " << this << std::endl; } -std::string XdmfArray::ItemTag = "DataItem"; +const std::string XdmfArray::ItemTag = "DataItem"; void XdmfArray::clear() { diff --git a/core/XdmfArray.hpp b/core/XdmfArray.hpp index a2fd0daf..3cd14261 100644 --- a/core/XdmfArray.hpp +++ b/core/XdmfArray.hpp @@ -54,7 +54,7 @@ public: LOKI_DEFINE_VISITABLE(XdmfArray, XdmfItem) friend class XdmfHDF5Writer; - static std::string ItemTag; + static const std::string ItemTag; /** * Copy values from an XdmfArray into this array. diff --git a/core/tests/Cxx/CMakeLists.txt b/core/tests/Cxx/CMakeLists.txt index 192de7dc..f466777c 100644 --- a/core/tests/Cxx/CMakeLists.txt +++ b/core/tests/Cxx/CMakeLists.txt @@ -1,7 +1,6 @@ set(XdmfCoreCxxTests TestXdmfArray TestXdmfArrayWriteRead - TestXdmfDataItem TestXdmfHDF5Writer ) diff --git a/core/tests/Cxx/TestXdmfDataItem.cpp b/core/tests/Cxx/TestXdmfDataItem.cpp deleted file mode 100644 index 9c3189b9..00000000 --- a/core/tests/Cxx/TestXdmfDataItem.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "XdmfDataItem.hpp" - -int main(int argc, char* argv[]) -{ - //boost::shared_ptr dataItem = XdmfDataItem::New(); - //int intArray[10] = {1,2,3,4,5,6,7,8,9,10}; - //dataItem->setValues(intArray); -} -- GitLab