Commit fc905144 authored by Marcin Kolny's avatar Marcin Kolny

Merge branch 'patch-2' into 'master'

Change the parameter names of constructors, to prevent member shadowing

See merge request !2
parents eb91e116 757d06fa
......@@ -261,11 +261,11 @@ IteratorBase<CppType>::IteratorBase(const IteratorBase<CppType>& other)
}
template<class CppType>
IteratorBase<CppType>::IteratorBase(GstIterator* castitem, bool take_ownership)
IteratorBase<CppType>::IteratorBase(GstIterator* castitem, bool _take_ownership)
: current(G_VALUE_INIT),
current_result(Gst::ITERATOR_OK),
cobject_(castitem),
take_ownership(take_ownership)
take_ownership(_take_ownership)
{}
template<class CppType>
......
......@@ -194,7 +194,7 @@ public:
/** Constructs a Gst::Range (min - max).
*/
Range(T min, T max) : min(min), max(max) {}
Range(T _min, T _max) : min(_min), max(_max) {}
/** Constructs an Gst::Range from another range.
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment