From adf0869fd27b9cedf0c3278c7b2142e51d3f80e9 Mon Sep 17 00:00:00 2001
From: JaMiT <jt_coding@zoho.com>
Date: Sun, 23 Feb 2014 12:00:43 -0600
Subject: [PATCH] Fixes compilation with CLang 3.2 and libc++.

This libc++ is the standard c++ library of the LLVM project.
Backport of 16b4210fa9bf6ab811bb4b4620667fc1aeaec17f.
Fixes bug #21303.
---
 changelog                | 1 +
 src/construct_dialog.hpp | 4 ++--
 src/filechooser.cpp      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 5e526b76814a..334738d21111 100644
--- a/changelog
+++ b/changelog
@@ -24,6 +24,7 @@ Version 1.10.7+dev:
      persisting and escaping the sound source management code (bug #21426).
    * Fixed wmlindent and wmltools.py to not interpret Pango hexadecimal
      color codes as the start of a comment.
+   * Fixed: Compilation with CLang 3.2 and libc++.
 
 Version 1.10.7:
  * Add-ons server:
diff --git a/src/construct_dialog.hpp b/src/construct_dialog.hpp
index 5d9a54eb0d76..ddeec47ae466 100644
--- a/src/construct_dialog.hpp
+++ b/src/construct_dialog.hpp
@@ -190,11 +190,11 @@ class dialog {
 		int x, y;
 		SDL_Rect interior, message, textbox;
 		unsigned int menu_width;
-		std::map<preview_pane *const, SDL_Rect > panes;
+		std::map<preview_pane *, SDL_Rect > panes;
 		int label_x, label_y;
 		int menu_x, menu_y, menu_height;
 		int image_x, image_y, caption_x, caption_y;
-		std::map<dialog_button *const, std::pair<int,int> > buttons;
+		std::map<dialog_button *, std::pair<int,int> > buttons;
 		//use get_frame().get_layout() to check frame dimensions
 	};
 	typedef dialog_frame::style style;
diff --git a/src/filechooser.cpp b/src/filechooser.cpp
index 907aeb345b91..a5262dfbe185 100644
--- a/src/filechooser.cpp
+++ b/src/filechooser.cpp
@@ -96,7 +96,7 @@ gui::dialog::dimension_measurements file_dialog::layout(int xloc, int yloc)
 	//shift the extra buttons up
 	if (show_directory_buttons_)
 	{
-		std::map<gui::dialog_button *const, std::pair<int,int> >::iterator i;
+		std::map<gui::dialog_button *, std::pair<int,int> >::iterator i;
 		for(i = dim.buttons.begin(); i != dim.buttons.end(); ++i)
 		{
 			const int btn_h = i->first->height();