From e945c021518e2360a94e94913c68873556ec33e1 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 25 Jun 2012 14:21:32 +0000 Subject: [PATCH] Fix some warnings Originally committed to SVN as r6919. --- aegisub/libaegisub/common/cajun/reader.cpp | 3 ++- aegisub/libaegisub/include/libaegisub/log.h | 3 --- aegisub/libaegisub/unix/io.cpp | 2 +- aegisub/src/audio_player_alsa.cpp | 14 ++++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aegisub/libaegisub/common/cajun/reader.cpp b/aegisub/libaegisub/common/cajun/reader.cpp index ee54c55fe..e7a0061fb 100644 --- a/aegisub/libaegisub/common/cajun/reader.cpp +++ b/aegisub/libaegisub/common/cajun/reader.cpp @@ -340,7 +340,8 @@ UnknownElement Reader::ParseNumber(Reader::TokenStream& tokenStream) { // If there's still stuff left in the token then it's malformed if (!iStr.eof()) - throw ParseException("Unexpected character in NUMBER token: " + iStr.peek(), currentToken.locBegin, currentToken.locEnd); + throw ParseException(std::string("Unexpected character in NUMBER token: ") + (char)iStr.peek(), + currentToken.locBegin, currentToken.locEnd); return dValue; } diff --git a/aegisub/libaegisub/include/libaegisub/log.h b/aegisub/libaegisub/include/libaegisub/log.h index ad83ac0f7..7dbbd836d 100644 --- a/aegisub/libaegisub/include/libaegisub/log.h +++ b/aegisub/libaegisub/include/libaegisub/log.h @@ -104,9 +104,6 @@ typedef std::deque Sink; /// Log sink, single destination for all messages class LogSink { - /// Size of current sink, this is only an estimate that is used for trimming. - int64_t size; - /// Log sink Sink sink; diff --git a/aegisub/libaegisub/unix/io.cpp b/aegisub/libaegisub/unix/io.cpp index 23320f3af..4a4c91dbc 100644 --- a/aegisub/libaegisub/unix/io.cpp +++ b/aegisub/libaegisub/unix/io.cpp @@ -63,7 +63,7 @@ Save::Save(const std::string& file, bool binary): file_name(file) { // If the file doesn't exist we create a 0 byte file, this so so // util::Rename will find it, and to let users know something went // wrong by leaving a 0 byte file. - std::ofstream(file.c_str()); + (void)std::ofstream(file.c_str()); } /// @todo This is a temp hack, proper implementation needs to come after diff --git a/aegisub/src/audio_player_alsa.cpp b/aegisub/src/audio_player_alsa.cpp index 7738f6b10..f2b74307e 100644 --- a/aegisub/src/audio_player_alsa.cpp +++ b/aegisub/src/audio_player_alsa.cpp @@ -50,6 +50,8 @@ #ifndef AGI_PRE #include + +#include #endif class PthreadMutexLocker { @@ -286,12 +288,12 @@ do_setup: avail = std::min(tmp_pcm_avail, (snd_pcm_sframes_t)(ps.end_position-position)); if (avail < 0) { - printf("\n--------- avail was less than 0: %ld\n", avail); - printf("snd_pcm_avail(pcm): %ld\n", tmp_pcm_avail); - printf("original position: %ld\n", orig_position); - printf("current position: %ld\n", position); - printf("original ps.end_position: %ld\n", orig_ps_end_position); - printf("current ps.end_position: %ld\n", ps.end_position); + printf("\n--------- avail was less than 0: %" PRId64 "\n", avail); + printf("snd_pcm_avail(pcm): %" PRId64 "\n", tmp_pcm_avail); + printf("original position: %" PRId64 "\n", orig_position); + printf("current position: %" PRId64 "\n", position); + printf("original ps.end_position: %" PRId64 "\n", orig_ps_end_position); + printf("current ps.end_position: %" PRId64 "\n", ps.end_position); printf("---------\n\n"); continue; }