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.

2 files changed, 14 insertions, 14 deletions

diff --git a/source/blender/freestyle/intern/stroke/CurveIterators.h b/source/blender/freestyle/intern/stroke/CurveIterators.h
index f2272f2f9a9..c1bec1e3b65 100644
--- a/source/blender/freestyle/intern/stroke/CurveIterators.h
+++ b/source/blender/freestyle/intern/stroke/CurveIterators.h
@@ -43,15 +43,15 @@ namespace CurveInternal {
 class CurvePointIterator : public Interface0DIteratorNested
 { 
 public:
-	friend class ::Curve;
+	friend class Curve;
 
 public:
 	float _CurvilinearLength;
 	float _step;
-	::Curve::vertex_container::iterator __A;
-	::Curve::vertex_container::iterator __B;
-	::Curve::vertex_container::iterator _begin;
-	::Curve::vertex_container::iterator _end;
+	Curve::vertex_container::iterator __A;
+	Curve::vertex_container::iterator __B;
+	Curve::vertex_container::iterator _begin;
+	Curve::vertex_container::iterator _end;
 	int _n;
 	int _currentn;
 	float _t;
@@ -104,8 +104,8 @@ public:
 	virtual ~CurvePointIterator() {}
 
 protected:
-	inline CurvePointIterator(::Curve::vertex_container::iterator iA, ::Curve::vertex_container::iterator iB,
-	                          ::Curve::vertex_container::iterator ibegin, ::Curve::vertex_container::iterator iend,
+	inline CurvePointIterator(Curve::vertex_container::iterator iA, Curve::vertex_container::iterator iB,
+	                          Curve::vertex_container::iterator ibegin, Curve::vertex_container::iterator iend,
 	                          int currentn, int n, float iCurveLength, float step, float t = 0.0f,
 	                          float iCurvilinearLength = 0.0f)
 	: Interface0DIteratorNested()
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