A few tweaks to make Ardour build in GCC -std=c++0x mode.

git-svn-id: svn://localhost/ardour2/branches/3.0@11983 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 13 insertions, 13 deletions

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 263fe29b7b..5a7f6ddd21 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -830,7 +830,7 @@ AutomationLine::reset_callback (const Evoral::ControlList& events)
 
 		model_to_view_coord (tx, ty);
 
-		if (isnan (tx) || isnan (ty)) {
+		if (std::isnan (tx) || std::isnan (ty)) {
 			warning << string_compose (_("Ignoring illegal points on AutomationLine \"%1\""),
 						   _name) << endmsg;
 			continue;
diff --git a/gtk2_ardour/editor_xpms b/gtk2_ardour/editor_xpms
index cb4a044cfd..c8b4e83a0c 100644
--- a/gtk2_ardour/editor_xpms
+++ b/gtk2_ardour/editor_xpms
@@ -3,7 +3,7 @@
 #define fader_cursor_height 25
 #define fader_cursor_x_hot 3
 #define fader_cursor_y_hot 21
-static const gchar fader_cursor_bits[] = {
+static const unsigned char fader_cursor_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00,
    0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0x02, 0x01,
    0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01,
@@ -15,7 +15,7 @@ static const gchar fader_cursor_bits[] = {
    0x00, 0x00, 0x00, 0x00 };
 
 /* Created with The GIMP */
-static const gchar fader_cursor_mask_bits[] = {
+static const unsigned char fader_cursor_mask_bits[] = {
    0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x78, 0x00,
    0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01,
    0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01,
@@ -31,7 +31,7 @@ static const gchar fader_cursor_mask_bits[] = {
 #define speaker_cursor_height 26
 #define speaker_cursor_x_hot 0
 #define speaker_cursor_y_hot 0
-static const gchar speaker_cursor_bits[] = {
+static const unsigned char speaker_cursor_bits[] = {
    0x00, 0xc0, 0x00, 0xc0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xcc, 0x00, 0xcc,
    0xff, 0xc3, 0xff, 0xc3, 0x03, 0xc0, 0x03, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0,
    0xc3, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0, 0x03, 0xc0, 0x03, 0xc0,
@@ -42,7 +42,7 @@ static const gchar speaker_cursor_bits[] = {
 #define speaker_cursor_mask_height 26
 #define speaker_cursor_mask_x_hot 0
 #define speaker_cursor_mask_y_hot 0
-static const gchar speaker_cursor_mask_bits[] = {
+static const unsigned char speaker_cursor_mask_bits[] = {
    0x00, 0xc0, 0x00, 0xc0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xfc, 0x00, 0xfc,
    0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff,
    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x3f, 0xff,
@@ -85,7 +85,7 @@ static const short cursor_timestretch_mask_bits[] = {
 #define cursor_zoom_height 16
 #define cursor_zoom_x_hot 6
 #define cursor_zoom_y_hot 6
-static const short cursor_zoom_bits[] = {
+static const unsigned short cursor_zoom_bits[] = {
    0x00e0, 0x0000, 0x03b8, 0x0000, 0x0604, 0x0000, 0x0806, 0x0000, 0x0842,
    0x0000, 0x1843, 0x0000, 0x11f1, 0x0000, 0x1843, 0x0000, 0x0842, 0x0000,
    0x1806, 0x0000, 0x2604, 0x0000, 0x4758, 0x0000, 0x88e0, 0x0000, 0x1000,
@@ -95,7 +95,7 @@ static const short cursor_zoom_bits[] = {
 #define cursor_zoom_mask_height 16
 #define cursor_zoom_mask_x_hot 6
 #define cursor_zoom_mask_y_hot 6
-static const short cursor_zoom_mask_bits[] = {
+static const unsigned short cursor_zoom_mask_bits[] = {
    0x00e0, 0x0000, 0x03f8, 0x0000, 0x07fc, 0x0000, 0x0ffe, 0x0000, 0x0ffe,
    0x0000, 0x1fff, 0x0000, 0x1fff, 0x0000, 0x1fff, 0x0000, 0x0ffe, 0x0000,
    0x1ffe, 0x0000, 0x3ffc, 0x0000, 0x7ff8, 0x0000, 0xf8e0, 0x0000, 0xf000,
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 72d69d5e43..04688f983a 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -112,7 +112,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
 	, RouteUI (sess)
 	, _mixer(mx)
 	, _mixer_owned (in_mixer)
-	, processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer)
+	, processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer)
 	, gpm (sess, 250)
 	, panners (sess)
 	, button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
diff --git a/gtk2_ardour/mouse_cursors.cc b/gtk2_ardour/mouse_cursors.cc
index 3cbe8342a7..fa3ce331d6 100644
--- a/gtk2_ardour/mouse_cursors.cc
+++ b/gtk2_ardour/mouse_cursors.cc
@@ -41,14 +41,14 @@ MouseCursors::MouseCursors ()
 	Color ffg ("#000000");
 
 	{
-		RefPtr<Bitmap> source = Bitmap::create (fader_cursor_bits, fader_cursor_width, fader_cursor_height);
-		RefPtr<Bitmap> mask = Bitmap::create (fader_cursor_mask_bits, fader_cursor_width, fader_cursor_height);
+		RefPtr<Bitmap> source = Bitmap::create ((char const *) fader_cursor_bits, fader_cursor_width, fader_cursor_height);
+		RefPtr<Bitmap> mask = Bitmap::create ((char const *) fader_cursor_mask_bits, fader_cursor_width, fader_cursor_height);
 		fader = new Cursor (source, mask, ffg, fbg, fader_cursor_x_hot, fader_cursor_y_hot);
 	}
 
 	{
-		RefPtr<Bitmap> source = Bitmap::create (speaker_cursor_bits, speaker_cursor_width, speaker_cursor_height);
-		RefPtr<Bitmap> mask = Bitmap::create (speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height);
+		RefPtr<Bitmap> source = Bitmap::create ((char const *) speaker_cursor_bits, speaker_cursor_width, speaker_cursor_height);
+		RefPtr<Bitmap> mask = Bitmap::create ((char const *) speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height);
 		speaker = new Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
 	}
 
diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index 085949539b..4c8adfd9c6 100644
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -63,7 +63,7 @@ class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
 
 	void set_session (ARDOUR::Session*);
 	void session_going_away ();
-	PluginSelector*  plugin_selector() { return _plugin_selector; }
+	PluginSelector* plugin_selector() { return _plugin_selector; }
 
   private:
 	Gtk::HBox                global_hpacker;