diff options
author | Olivier Galibert <galibert@pobox.com> | 2018-04-05 15:27:30 +0200 |
---|---|---|
committer | Olivier Galibert <galibert@pobox.com> | 2018-04-05 15:29:27 +0200 |
commit | 2e509a3b48cc748b7efc109fc079ca508c8eecaa (patch) | |
tree | 670cf2a46454942aae3cca6c1559666d5cc0357b | |
parent | ebf703269656383209e81c87b5d1e76130d83c51 (diff) |
Clang is being annoying (nw)
-rw-r--r-- | src/devices/machine/gen_fifo.h | 6 | ||||
-rw-r--r-- | src/mame/drivers/model2.cpp | 35 | ||||
-rw-r--r-- | src/mame/machine/model1.cpp | 23 |
3 files changed, 40 insertions, 24 deletions
diff --git a/src/devices/machine/gen_fifo.h b/src/devices/machine/gen_fifo.h index 0ba80fd5fc7..69b398e3446 100644 --- a/src/devices/machine/gen_fifo.h +++ b/src/devices/machine/gen_fifo.h @@ -58,7 +58,7 @@ * (rasterizer, etc). * * - on_pop: - * Called when a new value was just pushed. That callback is + * Called when a new value was just popped. That callback is * usually not needed, but it can be useful when the source is not * an executable device but something hardcoded. * @@ -88,8 +88,8 @@ public: std::function<void ()> on_fifo_unempty, std::function<void ()> on_fifo_full_post_sync, std::function<void ()> on_fifo_unfull, - std::function<void ()> on_push = [](){}, - std::function<void ()> on_pop = [](){}) { + std::function<void ()> on_push, + std::function<void ()> on_pop) { m_on_fifo_empty_pre_sync = on_fifo_empty_pre_sync; m_on_fifo_empty_post_sync = on_fifo_empty_post_sync; m_on_fifo_unempty = on_fifo_unempty; diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index d67359ed049..6a8df767c43 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -195,13 +195,18 @@ MACHINE_START_MEMBER(model2_tgp_state,model2_tgp) [this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, - [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }); + [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, + [ ]() { }, + [ ]() { }); + m_copro_fifo_out->setup(16, [this]() { m_maincpu->i960_stall(); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, - [this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }); + [this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, + [ ]() { }, + [ ]() { }); } MACHINE_START_MEMBER(model2b_state,model2b) @@ -209,9 +214,9 @@ MACHINE_START_MEMBER(model2b_state,model2b) MACHINE_START_CALL_MEMBER(model2); m_copro_fifo_in->setup(16, - []() { }, - []() { }, - []() { }, + [ ]() { }, + [ ]() { }, + [ ]() { }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_copro_adsp->set_flag_input(0, m_copro_fifo_in->is_empty()); }, @@ -220,8 +225,8 @@ MACHINE_START_MEMBER(model2b_state,model2b) [this]() { m_maincpu->i960_stall(); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, - []() { }, - []() { }, + [ ]() { }, + [ ]() { }, [this]() { m_copro_adsp->set_flag_input(1, m_copro_fifo_in->is_full()); }, [this]() { m_copro_adsp->set_flag_input(1, m_copro_fifo_in->is_full()); }); } @@ -231,17 +236,21 @@ MACHINE_START_MEMBER(model2c_state,model2c) MACHINE_START_CALL_MEMBER(model2); m_copro_fifo_in->setup(16, - []() { }, - []() { }, - []() { }, + [ ]() { }, + [ ]() { }, + [ ]() { }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, - [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }); + [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, + [ ]() { }, + [ ]() { }); m_copro_fifo_out->setup(16, [this]() { m_maincpu->i960_stall(); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, - []() { }, - []() { }); + [ ]() { }, + [ ]() { }, + [ ]() { }, + [ ]() { }); } MACHINE_START_MEMBER(model2_tgp_state,srallyc) diff --git a/src/mame/machine/model1.cpp b/src/mame/machine/model1.cpp index 4c6b4c3fe2e..235fbb1097d 100644 --- a/src/mame/machine/model1.cpp +++ b/src/mame/machine/model1.cpp @@ -1749,13 +1749,17 @@ MACHINE_START_MEMBER(model1_state,model1) [this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, - [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }); + [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, + [ ]() { }, + [ ]() { }); m_copro_fifo_out->setup(16, [this]() { m_maincpu->stall(); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, - [this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }); + [this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, + [ ]() { }, + [ ]() { }); } else { bool is_swa = @@ -1773,18 +1777,21 @@ MACHINE_START_MEMBER(model1_state,model1) push_cb = [this]() { copro_hle_vf(); }; m_copro_fifo_in->setup(16, - [](){}, - [](){}, - [](){}, + [ ]() { }, + [ ]() { }, + [ ]() { }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, - push_cb); + push_cb, + [ ]() { }); m_copro_fifo_out->setup(16, [this]() { m_maincpu->stall(); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, - [](){}, - [](){}); + [ ]() { }, + [ ]() { }, + [ ]() { }, + [ ]() { }); } } |