diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-05-14 02:58:27 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-05-14 02:58:27 +0400 |
| commit | 6ea2dec330a0d460deb1396f258c461be34fa3c8 (patch) | |
| tree | 567536490f059ab57592b5352b60f253b7e3ea1c /source/blender/freestyle/intern/system/BaseIterator.h | |
| parent | 1a91af691e984714204aa55326245c79a0b06fb8 (diff) | |
Added support for WITH_CXX_GUARDEDALLOC build option to the Freestyle module.
Diffstat (limited to 'source/blender/freestyle/intern/system/BaseIterator.h')
| -rw-r--r-- | source/blender/freestyle/intern/system/BaseIterator.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/system/BaseIterator.h b/source/blender/freestyle/intern/system/BaseIterator.h index 3398f08500c..f27bfb68b9f 100644 --- a/source/blender/freestyle/intern/system/BaseIterator.h +++ b/source/blender/freestyle/intern/system/BaseIterator.h @@ -30,6 +30,10 @@ #include <iterator> +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { // use for iterators defintions @@ -45,6 +49,10 @@ public: typedef const Element *pointer; typedef ptrdiff_t difference_type; typedef Nonconst_traits<Element> Non_const_traits; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Const_traits") +#endif }; template <class Element> @@ -56,18 +64,30 @@ public: typedef Element *pointer; typedef ptrdiff_t difference_type; typedef Nonconst_traits<Element> Non_const_traits; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Nonconst_traits") +#endif }; class InputIteratorTag_Traits { public: typedef std::input_iterator_tag iterator_category; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:InputIteratorTag_Traits") +#endif }; class BidirectionalIteratorTag_Traits { public: typedef std::bidirectional_iterator_tag iterator_category; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BidirectionalIteratorTag_Traits") +#endif }; template<class Traits, class IteratorTagTraits> @@ -87,6 +107,11 @@ public: protected: IteratorBase() {} + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:IteratorBase") +#endif }; } /* namespace Freestyle */ |