[gstreamermm] Correct wrong syntax for object construction



commit fba7d3803a0af4b9b334c4c5d1b7d65bece09df2
Author: Daniel Elstner <danielk openismus com>
Date:   Sun May 30 22:40:25 2010 +0200

    Correct wrong syntax for object construction
    
    * tools/m4/convert_gst.m4 (GstIterator): Change conversions to use
    the correct C++ syntax for constructing objects; Iterator() instead
    of Iterator::Iterator().  The latter fails with GCC 4.5.  Reported
    by  Kacper Kowalik, GNOME bug #618565.
    * gstreamer/src/format.ccg (iterate_format_definitions): As above.

 ChangeLog                |   10 ++++++++++
 gstreamer/src/format.ccg |    2 +-
 tools/m4/convert_gst.m4  |   10 +++++-----
 3 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7d6314f..8d7d001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-05-30  Daniel Elstner  <danielk openismus com>
+
+	Correct wrong syntax for object construction
+
+	* tools/m4/convert_gst.m4 (GstIterator): Change conversions to use
+	the correct C++ syntax for constructing objects; Iterator() instead
+	of Iterator::Iterator().  The latter fails with GCC 4.5.  Reported
+	by  Kacper Kowalik, GNOME bug #618565.
+	* gstreamer/src/format.ccg (iterate_format_definitions): As above.
+
 2010-05-25  José Alburquerque  <jaalburqu svn gnome org>
 
 	Correct some typos.
diff --git a/gstreamer/src/format.ccg b/gstreamer/src/format.ccg
index 1302f7f..c8a7dcb 100644
--- a/gstreamer/src/format.ccg
+++ b/gstreamer/src/format.ccg
@@ -88,7 +88,7 @@ bool get_format_details(Format format, FormatDefinition& def)
 
 IteratorBasic<const FormatDefinition> iterate_format_definitions()
 {
-  return IteratorBasic<const FormatDefinition>::IteratorBasic(gst_format_iterate_definitions());
+  return IteratorBasic<const FormatDefinition>(gst_format_iterate_definitions());
 }
 
 } //namespace Gst
diff --git a/tools/m4/convert_gst.m4 b/tools/m4/convert_gst.m4
index d949bcb..1c295f8 100644
--- a/tools/m4/convert_gst.m4
+++ b/tools/m4/convert_gst.m4
@@ -107,11 +107,11 @@ dnl IndexFactory
 _CONVERSION(`GstIndexFactory*',`Glib::RefPtr<Gst::IndexFactory>',`Glib::wrap($3)')
 
 dnl Iterator
-_CONVERSION(`GstIterator*',`Gst::Iterator<Gst::Element>',`Gst::Iterator<Gst::Element>::Iterator($3)')
-_CONVERSION(`GstIterator*',`Gst::Iterator<const Gst::Element>',`Gst::Iterator<const Gst::Element>::Iterator($3)')
-_CONVERSION(`GstIterator*',`Gst::Iterator<Gst::Pad>',`Gst::Iterator<Gst::Pad>::Iterator($3)')
-_CONVERSION(`GstIterator*',`Gst::Iterator<const Gst::Pad>',`Gst::Iterator<const Gst::Pad>::Iterator($3)')
-_CONVERSION(`GstIterator*',`Gst::IteratorBasic<const Gst::QueryTypeDefinition>',`Gst::IteratorBasic<const Gst::QueryTypeDefinition>::IteratorBasic($3)')
+_CONVERSION(`GstIterator*',`Gst::Iterator<Gst::Element>',`Gst::Iterator<Gst::Element>($3)')
+_CONVERSION(`GstIterator*',`Gst::Iterator<const Gst::Element>',`Gst::Iterator<const Gst::Element>($3)')
+_CONVERSION(`GstIterator*',`Gst::Iterator<Gst::Pad>',`Gst::Iterator<Gst::Pad>($3)')
+_CONVERSION(`GstIterator*',`Gst::Iterator<const Gst::Pad>',`Gst::Iterator<const Gst::Pad>($3)')
+_CONVERSION(`GstIterator*',`Gst::IteratorBasic<const Gst::QueryTypeDefinition>',`Gst::IteratorBasic<const Gst::QueryTypeDefinition>($3)')
 
 dnl Message
 _CONVERSION(`GstMessage*',`Glib::RefPtr<Gst::Message>',`Gst::Message::wrap($3)')



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]