From cc6fb941460931f4a17bebb5779e2c11eb99fc7a Mon Sep 17 00:00:00 2001 From: Robbbert Date: Sun, 24 Sep 2017 21:46:42 +1000 Subject: (nw) Housekeeping. --- src/mame/mame.lst | 4 +++- src/mame/mess.flt | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 37ae895bf62..a1c81dd54df 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -1074,8 +1074,10 @@ tnextspcj // A8003 'NS' (c) 1989 - Japan asma2k // asmapro // -@source:alphatro.cpp +@source:alphatpx.cpp alphatp3 // 1982 Triumph-Adler + +@source:alphatro.cpp alphatro // @source:altair.cpp diff --git a/src/mame/mess.flt b/src/mame/mess.flt index 31e386ff40d..20ec8452e9b 100644 --- a/src/mame/mess.flt +++ b/src/mame/mess.flt @@ -357,6 +357,7 @@ mccpm.cpp megadriv.cpp mekd2.cpp mephisto.cpp +mephisto_montec.cpp mes.cpp mice.cpp micral.cpp -- cgit v1.2.3 From dc66d78e8c7987db18d39408c8715ca4cc5c3d43 Mon Sep 17 00:00:00 2001 From: smf- Date: Sun, 24 Sep 2017 13:45:58 +0100 Subject: fix for clang 5 unused lambda capture errors (nw) --- src/emu/http.cpp | 2 +- src/frontend/mame/info.cpp | 2 +- src/frontend/mame/luaengine.cpp | 10 +++++----- src/frontend/mame/ui/state.cpp | 2 +- src/lib/util/server_http_impl.hpp | 2 +- src/lib/util/server_ws_impl.hpp | 6 +++--- src/tools/imgtool/library.cpp | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/emu/http.cpp b/src/emu/http.cpp index d7f77474bd1..fc14b0e75ae 100644 --- a/src/emu/http.cpp +++ b/src/emu/http.cpp @@ -272,7 +272,7 @@ http_manager::http_manager(bool active, short port, const char *root) auto& endpoint = m_wsserver->m_endpoint["/"]; - m_server->on_get([this, root](auto response, auto request) { + m_server->on_get([root](auto response, auto request) { std::string doc_root = root; auto request_impl = std::make_shared(request); diff --git a/src/frontend/mame/info.cpp b/src/frontend/mame/info.cpp index 6d1712e6ca4..6dbfd5a1afb 100644 --- a/src/frontend/mame/info.cpp +++ b/src/frontend/mame/info.cpp @@ -224,7 +224,7 @@ void info_xml_creator::output(FILE *out, std::vector const &pattern driver_enumerator drivlist(m_lookup_options); std::vector matched(patterns.size(), false); size_t exact_matches = 0; - auto const included = [&patterns, &drivlist, &matched, &exact_matches] (char const *const name) -> bool + auto const included = [&patterns, &matched, &exact_matches] (char const *const name) -> bool { if (patterns.empty()) return true; diff --git a/src/frontend/mame/luaengine.cpp b/src/frontend/mame/luaengine.cpp index 82e3f3f50ad..610b1947210 100644 --- a/src/frontend/mame/luaengine.cpp +++ b/src/frontend/mame/luaengine.cpp @@ -923,7 +923,7 @@ void lua_engine::initialize() */ emu.new_usertype("thread", sol::call_constructor, sol::constructors>(), - "start", [this](context &ctx, const char *scr) { + "start", [](context &ctx, const char *scr) { std::string script(scr); if(ctx.busy) return false; @@ -962,13 +962,13 @@ void lua_engine::initialize() th.detach(); return true; }, - "continue", [this](context &ctx, const char *val) { + "continue", [](context &ctx, const char *val) { if(!ctx.yield) return; ctx.result = val; ctx.sync.notify_all(); }, - "result", sol::property([this](context &ctx) -> std::string { + "result", sol::property([](context &ctx) -> std::string { if(ctx.busy && !ctx.yield) return ""; return ctx.result; @@ -1008,7 +1008,7 @@ void lua_engine::initialize() } return sol::make_object(sol(), ret); }, - "read_block", [this](save_item &item, int offset, sol::buffer *buff) { + "read_block", [](save_item &item, int offset, sol::buffer *buff) { if(!item.base || ((offset + buff->get_len()) > (item.size * item.count))) buff->set_len(0); else @@ -1267,7 +1267,7 @@ void lua_engine::initialize() * debug:wplist(space)[] - table of watchpoints */ sol().registry().new_usertype("device_debug", "new", sol::no_constructor, - "step", [this](device_debug &dev, sol::object num) { + "step", [](device_debug &dev, sol::object num) { int steps = 1; if(num.is()) steps = num.as(); diff --git a/src/frontend/mame/ui/state.cpp b/src/frontend/mame/ui/state.cpp index 27bbe24ed00..28d47040d60 100644 --- a/src/frontend/mame/ui/state.cpp +++ b/src/frontend/mame/ui/state.cpp @@ -175,7 +175,7 @@ void menu_load_save_state_base::populate(float &customtop, float &custombottom) std::sort( m_entries_vec.begin(), m_entries_vec.end(), - [this](const file_entry *a, const file_entry *b) + [](const file_entry *a, const file_entry *b) { return a->last_modified() > b->last_modified(); }); diff --git a/src/lib/util/server_http_impl.hpp b/src/lib/util/server_http_impl.hpp index e8b76ad2f74..4f909c023ef 100644 --- a/src/lib/util/server_http_impl.hpp +++ b/src/lib/util/server_http_impl.hpp @@ -220,7 +220,7 @@ namespace webpp { ///Use this function if you need to recursively send parts of a longer message void send(const std::shared_ptr &response, const std::function& callback=nullptr) const { - asio::async_write(*response->socket(), response->m_streambuf, [this, response, callback](const std::error_code& ec, size_t /*bytes_transferred*/) { + asio::async_write(*response->socket(), response->m_streambuf, [response, callback](const std::error_code& ec, size_t /*bytes_transferred*/) { if(callback) callback(ec); }); diff --git a/src/lib/util/server_ws_impl.hpp b/src/lib/util/server_ws_impl.hpp index 35f0043ed10..cbb6f9b4908 100644 --- a/src/lib/util/server_ws_impl.hpp +++ b/src/lib/util/server_ws_impl.hpp @@ -282,7 +282,7 @@ namespace webpp { else header_stream->put(static_cast(length)); - connection->strand.post([this, connection, header_stream, message_stream, callback]() { + connection->strand.post([connection, header_stream, message_stream, callback]() { connection->send_queue.emplace_back(header_stream, message_stream, callback); if(connection->send_queue.size()==1) connection->send_from_queue(connection); @@ -493,7 +493,7 @@ namespace webpp { //Close connection if unmasked message from client (protocol error) if(first_bytes[1]<128) { const std::string reason("message from client not masked"); - send_close(connection, 1002, reason, [this, connection](const std::error_code& /*ec*/) {}); + send_close(connection, 1002, reason, [connection](const std::error_code& /*ec*/) {}); connection_close(connection, endpoint, 1002, reason); return; } @@ -586,7 +586,7 @@ namespace webpp { } auto reason=message->string(); - send_close(connection, status, reason, [this, connection](const std::error_code& /*ec*/) {}); + send_close(connection, status, reason, [connection](const std::error_code& /*ec*/) {}); connection_close(connection, endpoint, status, reason); return; } diff --git a/src/tools/imgtool/library.cpp b/src/tools/imgtool/library.cpp index c534833da2e..9b04eecb03a 100644 --- a/src/tools/imgtool/library.cpp +++ b/src/tools/imgtool/library.cpp @@ -182,7 +182,7 @@ library::modulelist::iterator library::find(const std::string &module_name) return std::find_if( m_modules.begin(), m_modules.end(), - [this, module_name](std::unique_ptr &module) { return !module_name.compare(module->name); }); + [module_name](std::unique_ptr &module) { return !module_name.compare(module->name); }); } -- cgit v1.2.3 From 32857b2f4996ffaef8b328e6df16cf068d516b83 Mon Sep 17 00:00:00 2001 From: smf- Date: Sun, 24 Sep 2017 17:34:52 +0100 Subject: Changed the clang workround for ../../../../../3rdparty/compat/winsdk-override\wrl/internal.h:23:13: error: function declared 'noreturn' should not return [-Werror,-Winvalid-noreturn] to work with clang 5.0 (nw) --- 3rdparty/compat/winsdk-override/wrl/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/compat/winsdk-override/wrl/internal.h b/3rdparty/compat/winsdk-override/wrl/internal.h index e2dad542cc3..da989d189db 100644 --- a/3rdparty/compat/winsdk-override/wrl/internal.h +++ b/3rdparty/compat/winsdk-override/wrl/internal.h @@ -20,7 +20,7 @@ namespace Microsoft { inline void DECLSPEC_NORETURN RaiseException(HRESULT hr, DWORD flags = EXCEPTION_NONCONTINUABLE) throw() { ::RaiseException(static_cast(hr), flags, 0, NULL); - throw std::exception(); + std::abort(); } template -- cgit v1.2.3 From f57574c2389077546b6ccc49f38e468fc6b9a7f6 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 27 Sep 2017 11:30:10 +1000 Subject: version bump (nw) --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index bd1e1beab2e..397dce08615 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index e55d1485f43..145b21c701e 100644 --- a/makefile +++ b/makefile @@ -1546,14 +1546,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.189"' > $@ + @echo '#define BARE_BUILD_VERSION "0.190"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: $(GENDIR)/git_desc - @echo #define BARE_BUILD_VERSION "0.189" > $@ + @echo #define BARE_BUILD_VERSION "0.190" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ -- cgit v1.2.3