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

BUGFIX: change internal boost namespace to boost_ to avoid ambiguities 

of boost:: in internal namespace (vs ::boost::)
This commit is contained in:
Sébastien Loriot 2011-06-17 13:22:42 +00:00
parent a618b1db81
commit f488e75869
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
STL_Extension/include/CGAL/Modifiable_priority_queue.h
View File

@ -33,9 +33,9 @@ template <class IndexedType,
class RandomAccessContainer = std::vector<IndexedType>, class RandomAccessContainer = std::vector<IndexedType>,
class Comp = std::less<typename RandomAccessContainer::value_type>, class Comp = std::less<typename RandomAccessContainer::value_type>,
class ID = ::boost::identity_property_map > class ID = ::boost::identity_property_map >
class mutable_queue_with_remove : public internal::boost::mutable_queue<IndexedType,RandomAccessContainer,Comp,ID> class mutable_queue_with_remove : public internal::boost_::mutable_queue<IndexedType,RandomAccessContainer,Comp,ID>
{ {
typedef internal::boost::mutable_queue<IndexedType,RandomAccessContainer,Comp,ID> Base; typedef internal::boost_::mutable_queue<IndexedType,RandomAccessContainer,Comp,ID> Base;
public: public:
typedef typename Base::size_type size_type; typedef typename Base::size_type size_type;
typedef typename Base::Node Node; typedef typename Base::Node Node;

4
STL_Extension/include/CGAL/internal/boost/array_binary_tree.hpp
View File

@ -24,7 +24,7 @@
#include <boost/config.hpp> #include <boost/config.hpp>
namespace CGAL { namespace internal { namespace CGAL { namespace internal {
namespace boost { namespace boost_ {
/* /*
* Note: array_binary_tree is a completey balanced binary tree. * Note: array_binary_tree is a completey balanced binary tree.
@ -185,6 +185,6 @@ struct compare_array_node {
Compare comp; Compare comp;
}; };
} } } //namespace CGAL::internal::boost } } } //namespace CGAL::internal::boost_
#endif /* CGAL_INTERNAL_ARRAY_BINARY_TREE_HPP */ #endif /* CGAL_INTERNAL_ARRAY_BINARY_TREE_HPP */

4
STL_Extension/include/CGAL/internal/boost/mutable_heap.hpp
View File

@ -40,7 +40,7 @@
namespace CGAL{ namespace internal { namespace CGAL{ namespace internal {
namespace boost { namespace boost_ {
template <class TreeNode, class Compare, class ExternalData> template <class TreeNode, class Compare, class ExternalData>
inline TreeNode up_heap(TreeNode x, const Compare& comp, ExternalData& edata) { inline TreeNode up_heap(TreeNode x, const Compare& comp, ExternalData& edata) {
@ -70,5 +70,5 @@ namespace boost {
(void)up_heap(x, comp, edata); (void)up_heap(x, comp, edata);
} }
} } } //namespace CGAL::internal::boost } } } //namespace CGAL::internal::boost_
#endif //CGAL_INTERNAL_BOOST_MUTABLE_HEAP_H #endif //CGAL_INTERNAL_BOOST_MUTABLE_HEAP_H

4
STL_Extension/include/CGAL/internal/boost/mutable_queue.hpp
View File

@ -28,7 +28,7 @@
#include <iterator> #include <iterator>
namespace CGAL { namespace internal { namespace CGAL { namespace internal {
namespace boost { namespace boost_ {
// The mutable queue whose elements are indexed // The mutable queue whose elements are indexed
// //
@ -149,5 +149,5 @@ namespace boost {
}; };
} } } //namespace CGAL::internal::boost } } } //namespace CGAL::internal::boost_
#endif // CGAL_INTERNAL_BOOST_MUTABLE_QUEUE_HPP #endif // CGAL_INTERNAL_BOOST_MUTABLE_QUEUE_HPP