iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix some warnings 

Originally committed to SVN as r6919.
This commit is contained in:
Thomas Goyne 2012-06-25 14:21:32 +00:00
parent e4e80b4d3d
commit e945c02151
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aegisub/libaegisub/common/cajun/reader.cpp
View File

@ -340,7 +340,8 @@ UnknownElement Reader::ParseNumber(Reader::TokenStream& tokenStream) {
// If there's still stuff left in the token then it's malformed // If there's still stuff left in the token then it's malformed
if (!iStr.eof()) 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; return dValue;
} }

3
aegisub/libaegisub/include/libaegisub/log.h
View File

@ -104,9 +104,6 @@ typedef std::deque<SinkMessage*> Sink;
/// Log sink, single destination for all messages /// Log sink, single destination for all messages
class LogSink { class LogSink {
/// Size of current sink, this is only an estimate that is used for trimming.
int64_t size;
/// Log sink /// Log sink
Sink sink; Sink sink;

2
aegisub/libaegisub/unix/io.cpp
View File

@ -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 // 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 // util::Rename will find it, and to let users know something went
// wrong by leaving a 0 byte file. // 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 /// @todo This is a temp hack, proper implementation needs to come after

14
aegisub/src/audio_player_alsa.cpp
View File

@ -50,6 +50,8 @@
#ifndef AGI_PRE #ifndef AGI_PRE
#include <algorithm> #include <algorithm>
#include <inttypes.h>
#endif #endif
class PthreadMutexLocker { class PthreadMutexLocker {
@ -286,12 +288,12 @@ do_setup:
avail = std::min(tmp_pcm_avail, (snd_pcm_sframes_t)(ps.end_position-position)); avail = std::min(tmp_pcm_avail, (snd_pcm_sframes_t)(ps.end_position-position));
if (avail < 0) if (avail < 0)
{ {
printf("\n--------- avail was less than 0: %ld\n", avail); printf("\n--------- avail was less than 0: %" PRId64 "\n", avail);
printf("snd_pcm_avail(pcm): %ld\n", tmp_pcm_avail); printf("snd_pcm_avail(pcm): %" PRId64 "\n", tmp_pcm_avail);
printf("original position: %ld\n", orig_position); printf("original position: %" PRId64 "\n", orig_position);
printf("current position: %ld\n", position); printf("current position: %" PRId64 "\n", position);
printf("original ps.end_position: %ld\n", orig_ps_end_position); printf("original ps.end_position: %" PRId64 "\n", orig_ps_end_position);
printf("current ps.end_position: %ld\n", ps.end_position); printf("current ps.end_position: %" PRId64 "\n", ps.end_position);
printf("---------\n\n"); printf("---------\n\n");
continue; continue;
} }