summaryrefslogtreecommitdiff
path: root/zen/string_base.h
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:22:55 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:22:55 +0200
commitc4182431ac7d9d306fdd2267e082fa4cec6fec2c (patch)
tree865cca543c062b7af2586f85cee19f9af4e7614d /zen/string_base.h
parent5.11 (diff)
downloadFreeFileSync-c4182431ac7d9d306fdd2267e082fa4cec6fec2c.tar.gz
FreeFileSync-c4182431ac7d9d306fdd2267e082fa4cec6fec2c.tar.bz2
FreeFileSync-c4182431ac7d9d306fdd2267e082fa4cec6fec2c.zip
5.12
Diffstat (limited to 'zen/string_base.h')
-rw-r--r--zen/string_base.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/zen/string_base.h b/zen/string_base.h
index bfe573e9..e4e21716 100644
--- a/zen/string_base.h
+++ b/zen/string_base.h
@@ -15,7 +15,6 @@
//Zbase - a policy based string class optimizing performance and genericity
-
namespace zen
{
/*
@@ -59,8 +58,8 @@ template <typename Char, //Character Type
void setLength(Char* ptr, size_t newLength)
*/
-template <typename Char, //Character Type
- class AP> //Allocator Policy
+template <class Char, //Character Type
+ class AP> //Allocator Policy
class StorageDeepCopy : public AP
{
protected:
@@ -112,8 +111,8 @@ private:
};
-template <typename Char, //Character Type
- class AP> //Allocator Policy
+template <class Char, //Character Type
+ class AP> //Allocator Policy
class StorageRefCountThreadSafe : public AP
{
protected:
@@ -169,7 +168,7 @@ private:
{
Descriptor(long rc, size_t len, size_t cap) :
refCount(rc),
- length(static_cast<std::uint32_t>(len)),
+ length (static_cast<std::uint32_t>(len)),
capacity(static_cast<std::uint32_t>(cap)) {}
boost::detail::atomic_count refCount; //practically no perf loss: ~0.2%! (FFS comparison)
@@ -181,8 +180,8 @@ private:
static Descriptor* descr( Char* ptr) { return reinterpret_cast< Descriptor*>(ptr) - 1; }
static const Descriptor* descr(const Char* ptr) { return reinterpret_cast<const Descriptor*>(ptr) - 1; }
};
-//################################################################################################################################################################
+//################################################################################################################################################################
//perf note: interstingly StorageDeepCopy and StorageRefCountThreadSafe show same performance in FFS comparison
@@ -386,7 +385,7 @@ size_t Zbase<Char, SP, AP>::find(const Zbase& str, size_t pos) const
assert(pos <= length());
const Char* thisEnd = end(); //respect embedded 0
const Char* it = std::search(begin() + pos, thisEnd,
- str.begin(), str.end());
+ str.begin(), str.end());
return it == thisEnd ? npos : it - begin();
}
@@ -397,7 +396,7 @@ size_t Zbase<Char, SP, AP>::find(const Char* str, size_t pos) const
assert(pos <= length());
const Char* thisEnd = end(); //respect embedded 0
const Char* it = std::search(begin() + pos, thisEnd,
- str, str + strLength(str));
+ str, str + strLength(str));
return it == thisEnd ? npos : it - begin();
}
@@ -433,7 +432,7 @@ size_t Zbase<Char, SP, AP>::rfind(const Char* str, size_t pos) const
const Char* currEnd = pos == npos ? end() : begin() + std::min(pos + strLen, length());
const Char* it = search_last(begin(), currEnd,
- str, str + strLen);
+ str, str + strLen);
return it == currEnd ? npos : it - begin();
}
bgstack15