diff --git a/include/TessesFramework/Date/Date.hpp b/include/TessesFramework/Date/Date.hpp index ee1075d..bc2aacb 100644 --- a/include/TessesFramework/Date/Date.hpp +++ b/include/TessesFramework/Date/Date.hpp @@ -123,32 +123,32 @@ namespace Tesses::Framework::Date }; - DateTime operator+(const DateTime& dt, const TimeSpan& ts) + inline DateTime operator+(const DateTime& dt, const TimeSpan& ts) { DateTime dt2(dt.ToEpoch() + ts.TotalSeconds()); if(dt.IsLocal()) dt2.SetToLocal(); return dt2; } - DateTime operator+(const TimeSpan& ts,const DateTime& dt) + inline DateTime operator+(const TimeSpan& ts,const DateTime& dt) { DateTime dt2(dt.ToEpoch() + ts.TotalSeconds()); if(dt.IsLocal()) dt2.SetToLocal(); return dt2; } - TimeSpan operator+(const TimeSpan& ts, const TimeSpan& ts2) + inline TimeSpan operator+(const TimeSpan& ts, const TimeSpan& ts2) { return (int64_t)ts + (int64_t)ts2; } - DateTime operator-(const DateTime& dt, const TimeSpan& ts) + inline DateTime operator-(const DateTime& dt, const TimeSpan& ts) { DateTime dt2(dt.ToEpoch() - ts.TotalSeconds()); if(dt.IsLocal()) dt2.SetToLocal(); return dt2; } - TimeSpan operator-(const DateTime& dt, const DateTime& dt2) + inline TimeSpan operator-(const DateTime& dt, const DateTime& dt2) { return (int64_t)dt - (int64_t)dt2; } diff --git a/include/TessesFramework/Filesystem/VFS.hpp b/include/TessesFramework/Filesystem/VFS.hpp index 05b3eaf..76cad32 100644 --- a/include/TessesFramework/Filesystem/VFS.hpp +++ b/include/TessesFramework/Filesystem/VFS.hpp @@ -61,17 +61,9 @@ namespace Tesses::Framework::Filesystem VFSPath MakeRelative(VFSPath toMakeRelativeTo) const; }; VFSPath operator/(VFSPath p, VFSPath p2); - VFSPath operator/(VFSPath p, std::string p2); - VFSPath operator/(std::string p, VFSPath p2); VFSPath operator+(VFSPath p, VFSPath p2); - VFSPath operator+(VFSPath p, std::string p2); - VFSPath operator+(std::string p, VFSPath p2); bool operator==(VFSPath p,VFSPath p2); bool operator!=(VFSPath p,VFSPath p2); - bool operator==(std::string p,VFSPath p2); - bool operator!=(std::string p,VFSPath p2); - bool operator==(VFSPath p,std::string p2); - bool operator!=(VFSPath p,std::string p2); class VFSPathEnumeratorData { public: VFSPathEnumeratorData(std::function moveNext, std::function destroy) diff --git a/src/Filesystem/VFS.cpp b/src/Filesystem/VFS.cpp index 64e8852..465079b 100644 --- a/src/Filesystem/VFS.cpp +++ b/src/Filesystem/VFS.cpp @@ -111,14 +111,7 @@ namespace Tesses::Framework::Filesystem { return VFSPath(p,p2); } - VFSPath operator/(VFSPath p, std::string p2) - { - return VFSPath(p,p2); - } - VFSPath operator/(std::string p, VFSPath p2) - { - return VFSPath(p,p2); - } + VFSPath operator+(VFSPath p, VFSPath p2) { VFSPath pout; @@ -146,14 +139,7 @@ namespace Tesses::Framework::Filesystem return pout; } - VFSPath operator+(VFSPath p, std::string p2) - { - return p + VFSPath(p2); - } - VFSPath operator+(std::string p, VFSPath p2) - { - return VFSPath(p) + p2; - } + bool operator==(VFSPath p,VFSPath p2) { if(p.relative != p2.relative) return false; @@ -171,22 +157,6 @@ namespace Tesses::Framework::Filesystem return false; } - bool operator==(std::string p,VFSPath p2) - { - return VFSPath(p) == p2; - } - bool operator!=(std::string p,VFSPath p2) - { - return VFSPath(p) != p2; - } - bool operator==(VFSPath p,std::string p2) - { - return p == VFSPath(p2); - } - bool operator!=(VFSPath p,std::string p2) - { - return p != VFSPath(p2); - } VFSPath VFS::ReadLink(VFSPath path) { return VFSPath("/");