diff options
| author | 2016-08-29 02:02:04 +1000 | |
|---|---|---|
| committer | 2016-08-29 02:02:04 +1000 | |
| commit | c960435d3e22ff596dd0f1c7f02ec1d3269336e5 (patch) | |
| tree | 387e677a4fd1aaf7f97a921e877980aca6ccfe06 /src/lib | |
| parent | 2101fe044ef61f056a6b64dd8b5875b9652419f8 (diff) | |
srcclean and translation regeneration
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/formats/cassimg.cpp | 2 | ||||
| -rw-r--r-- | src/lib/formats/cassimg.h | 12 | ||||
| -rw-r--r-- | src/lib/netlist/nl_base.h | 2 | ||||
| -rw-r--r-- | src/lib/netlist/tools/nl_convert.cpp | 16 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/formats/cassimg.cpp b/src/lib/formats/cassimg.cpp index ad6ec84cf39..ac2e9f56900 100644 --- a/src/lib/formats/cassimg.cpp +++ b/src/lib/formats/cassimg.cpp @@ -909,7 +909,7 @@ cassette_image::error cassette_legacy_construct(cassette_image *cassette, bytes.resize(size); cassette_image_read(cassette, &bytes[0], 0, size); sample_count = args.chunk_sample_calc(&bytes[0], (int)size); - + // chunk_sample_calc functions report errors by returning negative numbers if (sample_count < 0) { diff --git a/src/lib/formats/cassimg.h b/src/lib/formats/cassimg.h index 51ad96ca9fe..0bf8865e6ff 100644 --- a/src/lib/formats/cassimg.h +++ b/src/lib/formats/cassimg.h @@ -87,12 +87,12 @@ struct cassette_image { enum class error { - SUCCESS, // no error - INTERNAL, // fatal internal error - UNSUPPORTED, // this operation is unsupported - OUT_OF_MEMORY, // ran out of memory - INVALID_IMAGE, // invalid image - READ_WRITE_UNSUPPORTED // read/write is not supported by this image format + SUCCESS, // no error + INTERNAL, // fatal internal error + UNSUPPORTED, // this operation is unsupported + OUT_OF_MEMORY, // ran out of memory + INVALID_IMAGE, // invalid image + READ_WRITE_UNSUPPORTED // read/write is not supported by this image format }; const struct CassetteFormat *format; diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index f76b7b8e673..f47ee3cbdae 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -144,7 +144,7 @@ class NETLIB_NAME(name) : public device_t #define NL_NOEXCEPT #else #define nl_assert(x) do { if (0) if (!(x)) { /*throw nl_exception(plib::pfmt("assert: {1}:{2}: {3}")(__FILE__)(__LINE__)(#x) ); */} } while (0) -#define NL_NOEXCEPT noexcept +#define NL_NOEXCEPT noexcept #endif #define nl_assert_always(x, msg) do { if (!(x)) throw nl_exception(plib::pfmt("Fatal error: {1}\nCaused by assert: {2}:{3}: {4}")(msg)(__FILE__)(__LINE__)(#x)); } while (0) diff --git a/src/lib/netlist/tools/nl_convert.cpp b/src/lib/netlist/tools/nl_convert.cpp index 978be90caaf..db1fb5bb3c9 100644 --- a/src/lib/netlist/tools/nl_convert.cpp +++ b/src/lib/netlist/tools/nl_convert.cpp @@ -492,14 +492,14 @@ void nl_convert_eagle_t::convert(const pstring &contents) } -/* token_id_t m_tok_HFA; - token_id_t m_tok_APP; - token_id_t m_tok_TIM; - token_id_t m_tok_TYP; - token_id_t m_tok_ADDC; - token_id_t m_tok_ATTC; - token_id_t m_tok_NET; - token_id_t m_tok_TER; +/* token_id_t m_tok_HFA; + token_id_t m_tok_APP; + token_id_t m_tok_TIM; + token_id_t m_tok_TYP; + token_id_t m_tok_ADDC; + token_id_t m_tok_ATTC; + token_id_t m_tok_NET; + token_id_t m_tok_TER; * */ void nl_convert_rinf_t::convert(const pstring &contents) |
