Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes compilation with CLang 3.2 and libc++.

This libc++ is the standard c++ library of the LLVM project.
Backport of 16b4210.
Fixes bug #21303.
  • Loading branch information...
commit adf0869fd27b9cedf0c3278c7b2142e51d3f80e9 1 parent 539de53
@Ja-MiT Ja-MiT authored
Showing with 4 additions and 3 deletions.
  1. +1 −0  changelog
  2. +2 −2 src/construct_dialog.hpp
  3. +1 −1  src/filechooser.cpp
View
1  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:
View
4 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;
View
2  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();
Please sign in to comment.
Something went wrong with that request. Please try again.