diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp index 9cdb878cdb..e4bb39c10a 100644 --- a/stepmania/src/RageSoundManager.cpp +++ b/stepmania/src/RageSoundManager.cpp @@ -293,7 +293,7 @@ void SoundMixBuffer::write(const Sint16 *buf, unsigned size) { if(mixbuf.size() < size) { - basic_string empty(size-mixbuf.size(), 0); + basic_string empty(size-mixbuf.size(), 0); mixbuf.insert(mixbuf.end(), empty.begin(), empty.end()); } diff --git a/stepmania/src/RageSoundManager.h b/stepmania/src/RageSoundManager.h index efc406e44a..c8d685e50e 100644 --- a/stepmania/src/RageSoundManager.h +++ b/stepmania/src/RageSoundManager.h @@ -68,7 +68,7 @@ public: /* This inputs and outputs 16-bit 44khz stereo input. */ class SoundMixBuffer { - basic_string mixbuf; + basic_string mixbuf; float vol; public: diff --git a/stepmania/src/SDL_utils.h b/stepmania/src/SDL_utils.h index 0cfd821a26..0a969def5c 100644 --- a/stepmania/src/SDL_utils.h +++ b/stepmania/src/SDL_utils.h @@ -28,9 +28,9 @@ SDL_Surface *SDL_CreateRGBSurfaceSane void FixHiddenAlpha(SDL_Surface *img); -struct char_traits_Sint32: public char_traits +template<> +struct char_traits { - static Sint32 *copy(Sint32 *s, const Sint32 *p, size_t n) { memcpy(s, p, n * sizeof(Sint32)); @@ -50,8 +50,6 @@ struct char_traits_Sint32: public char_traits { c1 = c2; } - - }; #endif