From e1f168de110322e7024dfa334b97f3b433907ae1 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 23 Jul 2015 13:23:47 +0200
Subject: rename Marker class

Classes are in the global namespace.
OSX has a flat namespace and OSX32bit/Carbon has a Marker too.
---
 gtk2_ardour/editor_export_audio.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gtk2_ardour/editor_export_audio.cc')

diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index f92cf07150..c2abbca856 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -86,9 +86,9 @@ Editor::export_selection ()
 void
 Editor::export_range ()
 {
-	Marker* marker;
+	ArdourMarker* marker;
 
-	if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+	if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
 		fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
 		abort(); /*NOTREACHED*/
 	}
-- 
cgit v1.2.3