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/stroke/StrokeIterators.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/stroke/StrokeIterators.h')
| -rw-r--r-- | source/blender/freestyle/intern/stroke/StrokeIterators.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/freestyle/intern/stroke/StrokeIterators.h b/source/blender/freestyle/intern/stroke/StrokeIterators.h index 1082adfbf41..a8ec529fbfa 100644 --- a/source/blender/freestyle/intern/stroke/StrokeIterators.h +++ b/source/blender/freestyle/intern/stroke/StrokeIterators.h @@ -66,9 +66,9 @@ public: _end = vi._end; } - StrokeVertexIterator(const ::Stroke::vertex_container::iterator& it, - const ::Stroke::vertex_container::iterator& begin, - const ::Stroke::vertex_container::iterator& end) + StrokeVertexIterator(const Stroke::vertex_container::iterator& it, + const Stroke::vertex_container::iterator& begin, + const Stroke::vertex_container::iterator& end) { _it = it; _begin = begin; @@ -208,15 +208,15 @@ public: // Not exported in Python // ////////////////////////////////////////////////// - const ::Stroke::vertex_container::iterator& getIt() + const Stroke::vertex_container::iterator& getIt() { return _it; } private: - ::Stroke::vertex_container::iterator _it; - ::Stroke::vertex_container::iterator _begin; - ::Stroke::vertex_container::iterator _end; + Stroke::vertex_container::iterator _it; + Stroke::vertex_container::iterator _begin; + Stroke::vertex_container::iterator _end; }; } // end of namespace StrokeInternal |