From b02623f974d2112227d5b2b77dd2505ce063eca8 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 4 Oct 2017 16:49:45 +0200 Subject: [PATCH] STYLE: remove substring operator() (issue #554) - duplicate functionality to the substr() method and more difficult to notice when it is being used. --- src/OpenFOAM/primitives/strings/string/string.H | 15 +-------------- src/OpenFOAM/primitives/strings/string/stringI.H | 16 ---------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/src/OpenFOAM/primitives/strings/string/string.H b/src/OpenFOAM/primitives/strings/string/string.H index 78a25c00f2..3af6835f14 100644 --- a/src/OpenFOAM/primitives/strings/string/string.H +++ b/src/OpenFOAM/primitives/strings/string/string.H @@ -151,7 +151,7 @@ public: inline string(const char c); //- Construct from copies of a single character - inline string(const size_type, const char); + inline string(const size_type len, const char c); //- Construct from Istream string(Istream& is); @@ -267,19 +267,6 @@ public: // \return True when strings match literally. inline bool operator()(const std::string& text) const; - //- Return sub-string from the i-th character for \a n characters - inline string operator() - ( - const size_type i, - const size_type n - ) const; - - //- Return sub-string from the first character for \a n characters - inline string operator() - ( - const size_type n - ) const; - // IOstream Operators diff --git a/src/OpenFOAM/primitives/strings/string/stringI.H b/src/OpenFOAM/primitives/strings/string/stringI.H index 9c485deda3..89a36cc3ee 100644 --- a/src/OpenFOAM/primitives/strings/string/stringI.H +++ b/src/OpenFOAM/primitives/strings/string/stringI.H @@ -243,22 +243,6 @@ inline bool Foam::string::operator()(const std::string& text) const } -inline Foam::string Foam::string::operator() -( - const size_type i, - const size_type n -) const -{ - return substr(i, n); -} - - -inline Foam::string Foam::string::operator()(const size_type n) const -{ - return substr(0, n); -} - - inline unsigned Foam::string::hash::operator() ( const string& str,