songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move into AABB_tree sub-namespace

This commit is contained in:
Sébastien Loriot 2013-06-18 14:14:24 +02:00
parent b175d06c7d
commit e74c1b1df8
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
AABB_tree/include/CGAL/AABB_traits.h
View File

@ -39,18 +39,13 @@
namespace CGAL { namespace CGAL {
namespace internal{ namespace AABB_tree { namespace internal{ namespace AABB_tree {
template <class T> template <class T>
struct Remove_optional { typedef T type; }; struct Remove_optional { typedef T type; };
template <class T> template <class T>
struct Remove_optional< ::boost::optional<T> > { typedef T type; }; struct Remove_optional< ::boost::optional<T> > { typedef T type; };
} } //end of namespace internal::AABB_tree
namespace internal{
//helper controlling whether extra data should be stored in the AABB_tree traits class //helper controlling whether extra data should be stored in the AABB_tree traits class
template <class Primitive, bool has_shared_data=Has_nested_type_Shared_data<Primitive>::value> template <class Primitive, bool has_shared_data=Has_nested_type_Shared_data<Primitive>::value>
struct AABB_traits_base; struct AABB_traits_base;
@ -96,7 +91,7 @@ struct AABB_traits_base<Primitive,true>{
const typename Primitive::Shared_data& shared_data() const {return m_primitive_data;} const typename Primitive::Shared_data& shared_data() const {return m_primitive_data;}
}; };
} } } //end of namespace internal::AABB_tree
/// \addtogroup PkgAABB_tree /// \addtogroup PkgAABB_tree
/// @{ /// @{
@ -118,7 +113,7 @@ struct AABB_traits_base<Primitive,true>{
/// \sa `AABBPrimitive` /// \sa `AABBPrimitive`
template<typename GeomTraits, typename AABBPrimitive> template<typename GeomTraits, typename AABBPrimitive>
class AABB_traits: class AABB_traits:
public internal::AABB_traits_base<AABBPrimitive> public internal::AABB_tree::AABB_traits_base<AABBPrimitive>
{ {
typedef typename CGAL::Object Object; typedef typename CGAL::Object Object;
public: public: