[Bf-committers] [Bf-blender-cvs] [01a4a09] master: Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 4).
Tamito KAJIYAMA
rd6t-kjym at asahi-net.or.jp
Thu Apr 17 16:46:43 CEST 2014
Thank you all for fixing compilation issues with Freestyle!
You were much faster than me trying to set up a GCC testbed,
with which Freestyle compiles fine now. I should have tested
with GCC before committing many changes in C++...
--
KAJIYAMA, Tamito <rd6t-kjym at asahi-net.or.jp>
On 17/04/2014 17:18, Lukas Tönne wrote:
> Here's a fix for the protected constructor issue:
> http://www.pasteall.org/50894/diff
>
> The "Curve" type is ambiguous now, looks like the friend declaration
> actually uses the DNA struct instead of the Freestyle class now.
>
> The other errors seem to be mostly related to missing stdlib and similar
> headers, have to talk to Campbell about that.
>
>
> On Thu, Apr 17, 2014 at 9:56 AM, Bastien Montagne <montagne29 at wanadoo.fr>wrote:
>
>> Hi Tamito,
>>
>> Your changes of this morning broke Freestyle compilation on Linux (whole
>> bunch of messages, see http://www.pasteall.org/50892 ).
>>
>> I suspect the main breaking commit is
>> 01a4a09f29974ff7c5c381f399aed143df716cc9.
>>
>> Bastien
>>
>> On 17/04/2014 07:37, Tamito Kajiyama wrote:
>>> Commit: 01a4a09f29974ff7c5c381f399aed143df716cc9
>>> Author: Tamito Kajiyama
>>> Date: Thu Apr 17 12:43:11 2014 +0900
>>> https://developer.blender.org/rB01a4a09f29974ff7c5c381f399aed143df716cc9
>>>
>>> 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.
>>>
>>> ===================================================================
>>>
>>> M source/blender/freestyle/intern/stroke/CurveIterators.h
>>> M source/blender/freestyle/intern/stroke/StrokeIterators.h
>>> M source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
>>> M source/blender/freestyle/intern/view_map/ViewMapIterators.h
>>>
>>> ===================================================================
>>>
>>> diff --git a/source/blender/freestyle/intern/stroke/CurveIterators.h
>> b/source/blender/freestyle/intern/stroke/CurveIterators.h
>>> index f2272f2..c1bec1e 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 1082adf..a8ec529 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
>>> diff --git
>> a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
>> b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
>>> index a8c046c..8e98cab 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() {}
>>> diff --git a/source/blender/freestyle/intern/view_map/ViewMapIterators.h
>> b/source/blender/freestyle/intern/view_map/ViewMapIterators.h
>>> index 2794d90..469c2c3 100644
>>> --- a/source/blender/freestyle/intern/view_map/ViewMapIterators.h
>>> +++ b/source/blender/freestyle/intern/view_map/ViewMapIterators.h
>>> @@ -66,8 +66,8 @@ public:
>>> friend class ViewEdge;
>>>
>>> // FIXME
>>> - typedef ::TVertex::edge_pointers_container edge_pointers_container;
>>> - typedef ::NonTVertex::edges_container edges_container;
>>> + typedef TVertex::edge_pointers_container edge_pointers_container;
>>> + typedef NonTVertex::edges_container edges_container;
>>>
>>> protected:
>>> Nature::VertexNature _Nature; // the nature of the underlying
>> vertex
>>> @@ -184,7 +184,7 @@ public:
>>> /*! Returns a reference to the pointed orientedViewEdge.
>>> * In the scripting language, you must call "getObject()" instead.
>>> */
>>> - virtual ::ViewVertex::directedViewEdge& operator*() const
>>> + virtual ViewVertex::directedViewEdge& operator*() const
>>> {
>>> if (_Nature & Nature::T_VERTEX)
>>> //return _tvertex_iter;
>>> @@ -195,7 +195,7 @@ public:
>>> /*! Returns a pointer to the pointed orientedViewEdge.
>>> * Can't be called in the scripting language.
>>> */
>>> - virtual ::ViewVertex::directedViewEdge *operator->() const
>>> + virtual ViewVertex::directedViewEdge *operator->() const
>>> {
>>> return &(operator*());
>>> }
>>> @@ -205,11 +205,11 @@ public:
>>> virtual inline int increment()
>>> {
>>> if (_Nature & Nature::T_VERTEX) {
>>> - ::ViewVertex::directedViewEdge tmp =
>> (**_tvertex_iter);
>>> + ViewVertex::directedViewEdge tmp =
>> (**_tvertex_iter);
>>> ++_tvertex_iter;
>>> if (_tvertex_iter != _tend) {
>>> // FIXME : pquoi deja ?
>>> - ::ViewVertex::directedViewEdge tmp2 =
>> (**_tvertex_iter);
>>> + ViewVertex::directedViewEdge tmp2 =
>> (**_tvertex_iter);
>>> if (tmp2.first == tmp.first)
>>> ++_tvertex_iter;
>>> }
>>>
>>> _______________________________________________
>>> Bf-blender-cvs mailing list
>>> Bf-blender-cvs at blender.org
>>> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>>>
>>
>> _______________________________________________
>> Bf-committers mailing list
>> Bf-committers at blender.org
>> http://lists.blender.org/mailman/listinfo/bf-committers
>>
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
>
More information about the Bf-committers
mailing list