From 19649bfeaa5a204cc765c7b0a66789919d6681d9 Mon Sep 17 00:00:00 2001 From: Nicolay Korslund Date: Fri, 25 Jun 2010 15:20:04 +0200 Subject: [PATCH] Minor -Wall warning fixes, expanded a comment --- stream/clients/ogre_datastream.hpp | 2 +- stream/filters/buffer_stream.hpp | 2 +- tools/str_exception.hpp | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/stream/clients/ogre_datastream.hpp b/stream/clients/ogre_datastream.hpp index 80c37fee7..7b4106001 100644 --- a/stream/clients/ogre_datastream.hpp +++ b/stream/clients/ogre_datastream.hpp @@ -32,7 +32,7 @@ class Mangle2OgreStream : public Ogre::DataStream /// Constructor for a named data stream Mangle2OgreStream(const Ogre::String &name, StreamPtr _inp) - : inp(_inp), Ogre::DataStream(name) { init(); } + : Ogre::DataStream(name), inp(_inp) { init(); } // Only implement the DataStream functions we have to implement diff --git a/stream/filters/buffer_stream.hpp b/stream/filters/buffer_stream.hpp index 0d22798d0..63b70000e 100644 --- a/stream/filters/buffer_stream.hpp +++ b/stream/filters/buffer_stream.hpp @@ -37,7 +37,7 @@ class BufferStream : public MemoryStream { // We DON'T know how big the stream is. We'll have to read // it in increments. - const int ADD = 32*1024; + const unsigned int ADD = 32*1024; size_t len=0, newlen; while(!input->eof()) diff --git a/tools/str_exception.hpp b/tools/str_exception.hpp index 39120a3f9..269501055 100644 --- a/tools/str_exception.hpp +++ b/tools/str_exception.hpp @@ -4,7 +4,13 @@ #include #include -/// A simple exception that takes and holds a string +/** @brief A simple exception that takes and holds a string + + Usage: + + throw str_exception("message"); + + */ class str_exception : public std::exception { std::string msg;