From 602d1ef4e8b683bfb33adb2d3ade1e4cc61529f2 Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Fri, 13 Jun 2014 14:38:34 -0400 Subject: [PATCH] Added slight optimization. --- Jupiter/Readable_String_Imp.h | 2 ++ Release/Jupiter.lib | Bin 232600 -> 232600 bytes 2 files changed, 2 insertions(+) diff --git a/Jupiter/Readable_String_Imp.h b/Jupiter/Readable_String_Imp.h index 25a63e1..545bc4f 100644 --- a/Jupiter/Readable_String_Imp.h +++ b/Jupiter/Readable_String_Imp.h @@ -814,6 +814,8 @@ template size_t Jupiter::Readable_String::tokenCount(const T *tok { if (tokenLength == 0 || tokenLength > this->size()) return 0; + if (tokenLength == 1) + return this->tokenCount(*token); if (tokenLength == this->size()) return this->equals(token, tokenLength) ? 1 : 0; diff --git a/Release/Jupiter.lib b/Release/Jupiter.lib index 46e05805553b0d0a99c114968eef0b3a99856035..5d54d99d745983f433f623cd23461c26fcbebc6c 100644 GIT binary patch delta 16818 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 delta 16800 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