4 files changed, 4 insertions, 20 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 486c2ae42dd..b97f44a2b5e 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -43,11 +43,7 @@ Slice::Gen::Gen(const string& name, const string& base,	const string& headerExte
 	}
     }
 
-    string::size_type pos = _base.rfind('/');
-    if(pos == string::npos)
-    {
-        pos = _base.rfind('\\');
-    }
+    string::size_type pos = _base.find_last_of("/\\");
     if(pos != string::npos)
     {
 	_base.erase(0, pos + 1);
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp
index 69a8279a9fe..627d1d12560 100644
--- a/cpp/src/slice2cppe/Gen.cpp
+++ b/cpp/src/slice2cppe/Gen.cpp
@@ -61,11 +61,7 @@ Slice::Gen::Gen(const string& name, const string& base,	const string& headerExte
 	}
     }
 
-    string::size_type pos = _base.rfind('/');
-    if(pos == string::npos)
-    {
-        pos = _base.rfind('\\');
-    }
+    string::size_type pos = _base.find_last_of("/\\");
     if(pos != string::npos)
     {
 	_base.erase(0, pos + 1);
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index ac459e16e77..986b98cf354 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -879,11 +879,7 @@ Slice::Gen::Gen(const string& name, const string& base, const vector<string>& in
 	string slash = cwd.find('/') == string::npos ? "\\" : "/";
 	free(p);
 
-	string::size_type pos = base.rfind('/');
-	if(pos == string::npos)
-	{
-	    pos = base.rfind('\\');
-	}
+	string::size_type pos = base.find_last_of("/\\");
 	if(pos != string::npos)
 	{
 	    string fileBase(base, pos + 1);
diff --git a/cpp/src/slice2vb/Gen.cpp b/cpp/src/slice2vb/Gen.cpp
index e0c1b5bf525..07062dde0c3 100755
--- a/cpp/src/slice2vb/Gen.cpp
+++ b/cpp/src/slice2vb/Gen.cpp
@@ -861,11 +861,7 @@ Slice::Gen::Gen(const string& name, const string& base, const vector<string>& in
 	string slash = cwd.find('/') == string::npos ? "\\" : "/";
 	free(p);
 
-	string::size_type pos = base.rfind('/');
-	if(pos == string::npos)
-	{
-	    pos = base.rfind('\\');
-	}
+	string::size_type pos = base.find_last_of("/\\");
 	if(pos != string::npos)
 	{
 	    string fileBase(base, pos + 1);