Skip to content

Commit

Permalink
mix msvc build
Browse files Browse the repository at this point in the history
msvc doesn't accept NULL/0 in the std::function constructor
  • Loading branch information
gfgtdf committed Apr 3, 2016
1 parent 1492a23 commit f96b4ad
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/gui/dialogs/multiplayer/mp_login.cpp
Expand Up @@ -74,7 +74,7 @@ tmp_login::tmp_login(const std::string& label, const bool focus_password)
register_text("password",
true,
&preferences::password,
NULL /* The password box returns '*' as value. */
nullptr /* The password box returns '*' as value. */
,
focus_password);

Expand Down
6 changes: 3 additions & 3 deletions src/gui/widgets/multi_page.cpp
Expand Up @@ -42,14 +42,14 @@ tmulti_page::tmulti_page()
void tmulti_page::add_page(const string_map& item)
{
assert(generator_);
generator_->create_item(-1, page_builder_, item, NULL);
generator_->create_item(-1, page_builder_, item, nullptr);
}

void tmulti_page::add_page(
const std::map<std::string /* widget id */, string_map>& data)
{
assert(generator_);
generator_->create_item(-1, page_builder_, data, NULL);
generator_->create_item(-1, page_builder_, data, nullptr);
}

void tmulti_page::remove_page(const unsigned page, unsigned count)
Expand Down Expand Up @@ -154,7 +154,7 @@ void swap_grid(tgrid* grid,
void tmulti_page::finalize(const std::vector<string_map>& page_data)
{
assert(generator_);
generator_->create_items(-1, page_builder_, page_data, NULL);
generator_->create_items(-1, page_builder_, page_data, nullptr);
swap_grid(nullptr, &grid(), generator_, "_content_grid");
}

Expand Down
2 changes: 1 addition & 1 deletion src/gui/widgets/stacked_widget.cpp
Expand Up @@ -100,7 +100,7 @@ tstacked_widget::finalize(std::vector<tbuilder_grid_const_ptr> widget_builder)
string_map empty_data;
for(const auto & builder : widget_builder)
{
generator_->create_item(-1, builder, empty_data, NULL);
generator_->create_item(-1, builder, empty_data, nullptr);
}
swap_grid(nullptr, &grid(), generator_, "_content_grid");

Expand Down
2 changes: 1 addition & 1 deletion src/gui/widgets/toggle_panel.cpp
Expand Up @@ -42,7 +42,7 @@ ttoggle_panel::ttoggle_panel()
, state_(ENABLED)
, state_num_(0)
, retval_(0)
, callback_state_change_(0)
, callback_state_change_(nullptr)
, callback_mouse_left_double_click_()
{
set_wants_mouse_left_double_click();
Expand Down
2 changes: 1 addition & 1 deletion src/intro.cpp
Expand Up @@ -53,7 +53,7 @@ void the_end(CVideo &video, std::string text, unsigned int duration)
if(n)
sdl::fill_rect(video.getSurface(),&area,0);

const SDL_Color col = create_color(n, n, n, n);
const SDL_Color col = create_color(uint8_t(n), uint8_t(n), uint8_t(n), uint8_t(n));
font::draw_text(&video,area,font_size,col,text,area.x,area.y);
update_rect(area);

Expand Down

0 comments on commit f96b4ad

Please sign in to comment.