From b8f87a5b55387ad7b698742dcfcc1bc93538a053 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 5 Feb 2010 21:19:56 +0000 Subject: Convert C-style casts to C++ style casts. git-svn-id: http://svn.drobilla.net/lad/trunk/raul@2432 a436a847-0d15-0410-975c-d299462d15a1 --- src/Configuration.cpp | 2 +- src/SMFReader.cpp | 4 ++-- src/SMFWriter.cpp | 2 +- src/Thread.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Configuration.cpp b/src/Configuration.cpp index bc6cfbd..d8cbfbe 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -76,7 +76,7 @@ Configuration::set_value_from_string(Configuration::Option& option, const std::s char* endptr = NULL; switch (option.type) { case Atom::INT: - intval = (int)strtol(value.c_str(), &endptr, 10); + intval = static_cast(strtol(value.c_str(), &endptr, 10)); if (endptr && *endptr == '\0') { option.value = intval; } else { diff --git a/src/SMFReader.cpp b/src/SMFReader.cpp index 55d4020..e7dbcf0 100644 --- a/src/SMFReader.cpp +++ b/src/SMFReader.cpp @@ -244,7 +244,7 @@ SMFReader::read_event(size_t buf_len, last_size = *ev_size; } - buf[0] = (uint8_t)status; + buf[0] = static_cast(status); if (status == 0xFF) { *ev_size = 0; @@ -253,7 +253,7 @@ SMFReader::read_event(size_t buf_len, uint8_t type = fgetc(_fd); const uint32_t size = read_var_len(_fd); - if ((uint8_t)type == 0x2F) { + if (type == 0x2F) { return -1; // we hit the logical EOF anyway... } else { fseek(_fd, size, SEEK_CUR); diff --git a/src/SMFWriter.cpp b/src/SMFWriter.cpp index e07555b..6bf5444 100644 --- a/src/SMFWriter.cpp +++ b/src/SMFWriter.cpp @@ -124,7 +124,7 @@ SMFWriter::write_event(Raul::TimeStamp time, } assert(delta_ticks <= VAR_LEN_MAX); - stamp_size = write_var_len((uint32_t)delta_ticks); + stamp_size = write_var_len(static_cast(delta_ticks)); fwrite(ev, 1, ev_size, _fd); _last_ev_time = time; diff --git a/src/Thread.cpp b/src/Thread.cpp index 00bc616..9c1a920 100644 --- a/src/Thread.cpp +++ b/src/Thread.cpp @@ -74,7 +74,7 @@ Thread::get() void* Thread::_static_run(void* thread) { - Thread* me = (Thread*)thread; + Thread* me = static_cast(thread); pthread_setspecific(me->_thread_key, thread); me->_run(); me->_pthread_exists = false; -- cgit v1.2.1