irc::tokenstream and irc::sepstream cleanup

irc::sepstream does not require virtual methods

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 4f706508105f9fbdbfe5bf52fec998f4dbe18e44..1f1e541d3aeabf3aac8d6a916bf747cfa7f9ebcd 100644 (file)
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -301,10 +301,6 @@ namespace irc
                 */
                tokenstream(const std::string &source);
 
-               /** Destructor
-                */
-               ~tokenstream();
-
                /** Fetch the next token from the stream as a std::string
                 * @param token The next token available, or an empty string if none remain
                 * @return True if tokens are left to be read, false if the last token was just retrieved.
@@ -355,25 +351,21 @@ namespace irc
                 */
                sepstream(const std::string &source, char seperator);
 
-               /** Destructor
-                */
-               virtual ~sepstream();
-
                /** Fetch the next token from the stream
                 * @param token The next token from the stream is placed here
                 * @return True if tokens still remain, false if there are none left
                 */
-               virtual bool GetToken(std::string &token);
+               bool GetToken(std::string& token);
 
                /** Fetch the entire remaining stream, without tokenizing
                 * @return The remaining part of the stream
                 */
-               virtual const std::string GetRemaining();
+               const std::string GetRemaining();
 
                /** Returns true if the end of the stream has been reached
                 * @return True if the end of the stream has been reached, otherwise false
                 */
-               virtual bool StreamEnd();
+               bool StreamEnd();
        };
 
        /** A derived form of sepstream, which seperates on commas

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 9fded8b4b303f559fea3d13e369ccab81744a0bc..b320f3546fa6b5a7dd507774d2a52c4719ec0d5f 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -245,10 +245,6 @@ irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_
        n = tokens.begin();
 }
 
-irc::tokenstream::~tokenstream()
-{
-}
-
 bool irc::tokenstream::GetToken(std::string &token)
 {
        std::string::iterator lsp = last_starting_position;
@@ -361,10 +357,6 @@ bool irc::sepstream::StreamEnd()
        return ((n + 1) == tokens.end());
 }
 
-irc::sepstream::~sepstream()
-{
-}
-
 irc::modestacker::modestacker(bool add) : adding(add)
 {
        sequence.clear();