From cc51298de62f3fa3c7bc256351983c99934627bc Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 2 Aug 2018 14:13:14 +0200
Subject: [PATCH] fixed warning about badly overloaded function in rsexpr.h

---
 libretroshare/src/retroshare/rsexpr.h | 22 +++++++++++-----------
 libretroshare/src/util/rsexpr.cc      |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libretroshare/src/retroshare/rsexpr.h b/libretroshare/src/retroshare/rsexpr.h
index 628e3f3c4..7c391a4be 100644
--- a/libretroshare/src/retroshare/rsexpr.h
+++ b/libretroshare/src/retroshare/rsexpr.h
@@ -181,7 +181,7 @@ public:
     StringExpression(enum StringOperator op, const std::list<std::string> &t, bool ic): Op(op),terms(t), IgnoreCase(ic){}
 
     virtual void linearize(LinearizedExpression& e) const ;
-	virtual std::string toStdString(const std::string& varstr) const;
+	virtual std::string toStdStringWithParam(const std::string& varstr) const;
 protected:
     bool evalStr(const std::string &str);
 
@@ -197,7 +197,7 @@ public:
     RelExpression(enum RelOperator op, T lv, T hv): Op(op), LowerValue(lv), HigherValue(hv) {}
 
     virtual void linearize(LinearizedExpression& e) const ;
-	virtual std::string toStdString(const std::string& typestr) const;
+	virtual std::string toStdStringWithParam(const std::string& typestr) const;
 protected:
     bool evalRel(T val);
 
@@ -229,7 +229,7 @@ bool RelExpression<T>::evalRel(T val) {
 }
 
 template <class T>
-std::string RelExpression<T>::toStdString(const std::string& typestr) const
+std::string RelExpression<T>::toStdStringWithParam(const std::string& typestr) const
 {
 	std::string LowerValueStr = RsUtil::NumberToString(LowerValue) ;
 
@@ -275,7 +275,7 @@ public:
         StringExpression(op,t,ic) {}
     bool eval(const ExpFileEntry& file);
 
-	virtual std::string toStdString() const { return StringExpression::toStdString("NAME"); }
+	virtual std::string toStdString() const { return StringExpression::toStdStringWithParam("NAME"); }
 
     virtual void linearize(LinearizedExpression& e) const
     {
@@ -290,7 +290,7 @@ public:
         StringExpression(op,t,ic) {}
     bool eval(const ExpFileEntry& file);
 
-	virtual std::string toStdString()const { return StringExpression::toStdString("PATH"); }
+	virtual std::string toStdString()const { return StringExpression::toStdStringWithParam("PATH"); }
 
     virtual void linearize(LinearizedExpression& e) const
     {
@@ -305,7 +305,7 @@ public:
         StringExpression(op,t,ic) {}
     bool eval(const ExpFileEntry& file);
 
-	virtual std::string toStdString()const { return StringExpression::toStdString("EXTENSION"); }
+	virtual std::string toStdString()const { return StringExpression::toStdStringWithParam("EXTENSION"); }
 
     virtual void linearize(LinearizedExpression& e) const
     {
@@ -320,7 +320,7 @@ public:
         StringExpression(op,t, true) {}
     bool eval(const ExpFileEntry& file);
 
-	virtual std::string toStdString() const { return StringExpression::toStdString("HASH"); }
+	virtual std::string toStdString() const { return StringExpression::toStdStringWithParam("HASH"); }
 
     virtual void linearize(LinearizedExpression& e) const
     {
@@ -342,7 +342,7 @@ public:
         RelExpression<int>(op,lv,hv) {}
     bool eval(const ExpFileEntry& file);
 
-	virtual std::string toStdString() const { return RelExpression<int>::toStdString("DATE"); }
+	virtual std::string toStdString() const { return RelExpression<int>::toStdStringWithParam("DATE"); }
 
     virtual void linearize(LinearizedExpression& e) const
     {
@@ -359,7 +359,7 @@ public:
         RelExpression<int>(op,lv,hv) {}
     bool eval(const ExpFileEntry& file);
 
-	virtual std::string toStdString() const { return RelExpression<int>::toStdString("SIZE"); }
+	virtual std::string toStdString() const { return RelExpression<int>::toStdStringWithParam("SIZE"); }
 
     virtual void linearize(LinearizedExpression& e) const
     {
@@ -376,7 +376,7 @@ public:
         RelExpression<int>(op,lv,hv) {}
     bool eval(const ExpFileEntry& file);
 
-	virtual std::string toStdString() const { return RelExpression<int>::toStdString("SIZE"); }
+	virtual std::string toStdString() const { return RelExpression<int>::toStdStringWithParam("SIZE"); }
 
     virtual void linearize(LinearizedExpression& e) const
     {
@@ -392,7 +392,7 @@ public:
     PopExpression(const LinearizedExpression& e) ;
     bool eval(const ExpFileEntry& file);
 
-	virtual std::string toStdString() const { return RelExpression<int>::toStdString("POPULARITY"); }
+	virtual std::string toStdString() const { return RelExpression<int>::toStdStringWithParam("POPULARITY"); }
 
     virtual void linearize(LinearizedExpression& e) const
     {
diff --git a/libretroshare/src/util/rsexpr.cc b/libretroshare/src/util/rsexpr.cc
index 73d441325..801e4fcb0 100644
--- a/libretroshare/src/util/rsexpr.cc
+++ b/libretroshare/src/util/rsexpr.cc
@@ -128,7 +128,7 @@ static bool StrContains( const std::string & str1, const std::string & str2,
 }
 
 
-std::string StringExpression::toStdString(const std::string& varstr) const
+std::string StringExpression::toStdStringWithParam(const std::string& varstr) const
 {
 	std::string strlist ;
 	for (auto iter = terms.begin(); iter != terms.end(); ++iter )