diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-17 07:43:11 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-17 09:37:09 +0400 |
commit | 01a4a09f29974ff7c5c381f399aed143df716cc9 (patch) | |
tree | 775896c3e80efccf3ea59272767bbb02b7641ba5 /source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h | |
parent | 77b37fa4615dc1e8d5656259744f0e8a1634e258 (diff) |
Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 4).
(See commit e1771e72fbbf828dbf5bed871b814288389f3611 for more detail of
the problem).
Fix for a C++ scope issue caused by 'using namespace Freestyle' that was assumed
even within the Freestyle namespace definition.
Diffstat (limited to 'source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h')
-rw-r--r-- | source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h index a8c046c4dc1..8e98cabd75b 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h @@ -53,21 +53,21 @@ namespace Freestyle { namespace ViewVertexInternal { -class edge_const_traits : public Const_traits< ::ViewVertex::directedViewEdge> +class edge_const_traits : public Const_traits<ViewVertex::directedViewEdge> { public: - typedef vector< ::ViewVertex::directedViewEdge> edges_container; + typedef vector<ViewVertex::directedViewEdge> edges_container; typedef edges_container::const_iterator edges_container_iterator; - typedef vector< ::ViewVertex::directedViewEdge*> edge_pointers_container; + typedef vector<ViewVertex::directedViewEdge*> edge_pointers_container; typedef edge_pointers_container::const_iterator edge_pointers_container_iterator; }; -class edge_nonconst_traits : public Nonconst_traits< ::ViewVertex::directedViewEdge> +class edge_nonconst_traits : public Nonconst_traits<ViewVertex::directedViewEdge> { public: - typedef vector< ::ViewVertex::directedViewEdge> edges_container; + typedef vector<ViewVertex::directedViewEdge> edges_container; typedef edges_container::iterator edges_container_iterator; - typedef vector< ::ViewVertex::directedViewEdge*> edge_pointers_container; + typedef vector<ViewVertex::directedViewEdge*> edge_pointers_container; typedef edge_pointers_container::iterator edge_pointers_container_iterator; }; @@ -377,14 +377,14 @@ public: _first = 0; } - inline edge_iterator_base(const edge_iterator_base<Nonconst_traits< ::ViewEdge*> >& iBrother) : parent_class() + inline edge_iterator_base(const edge_iterator_base<Nonconst_traits<ViewEdge*> >& iBrother) : parent_class() { _ViewEdge = iBrother._ViewEdge; _first = iBrother._first; _orientation = iBrother._orientation; } - inline edge_iterator_base(const edge_iterator_base<Const_traits< ::ViewEdge*> >& iBrother) : parent_class() + inline edge_iterator_base(const edge_iterator_base<Const_traits<ViewEdge*> >& iBrother) : parent_class() { _ViewEdge = iBrother._ViewEdge; _first = iBrother._first; @@ -521,7 +521,7 @@ public: value_type _FEdgeB; // last fedge of the view edge public: - friend class ::ViewEdge; + friend class ViewEdge; friend class fedge_iterator; inline fedge_iterator_base() : parent_class() {} |