Merge pull request #855 from romainfrancois/b-854

making string_proxy::operator==( string_proxy ) const to disambiguate
RcppCore · May 27, 2018 · 032d307 · 032d307
2 parents 8c360a8 + 9c8562a
commit 032d307
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 13 deletions.
diff --git a/inst/include/Rcpp/vector/string_proxy.h b/inst/include/Rcpp/vector/string_proxy.h
@@ -187,31 +187,33 @@ namespace internal{
 			std::for_each( begin(), end(), op );
 		}
 
-		bool operator==( const char* other){
+		bool operator==( const char* other) const {
 			return strcmp( begin(), other ) == 0 ;
 		}
-		bool operator!=( const char* other){
+		bool operator!=( const char* other) const {
 			return strcmp( begin(), other ) != 0 ;
 		}
 
-		bool operator==( const string_proxy& other){
+		template<template <class> class SP>
+		bool operator==( const string_proxy<STRSXP, SP>& other) const {
 			return strcmp( begin(), other.begin() ) == 0 ;
 		}
-		bool operator!=( const string_proxy& other){
+
+		template<template <class> class SP>
+		bool operator!=( const string_proxy<STRSXP,SP>& other) const {
 			return strcmp( begin(), other.begin() ) != 0 ;
 		}
 
-                bool operator==( SEXP other ) const {
-                    return get() == other;
-                }
-
-                bool operator!=( SEXP other ) const {
-                    return get() != other;
-                }
+        bool operator==( SEXP other ) const {
+            return get() == other;
+        }
 
+        bool operator!=( SEXP other ) const {
+            return get() != other;
+        }
 
-		private:
-			static std::string buffer ;
+	private:
+		static std::string buffer ;
 
 	} ;
 

diff --git a/inst/unitTests/cpp/Vector.cpp b/inst/unitTests/cpp/Vector.cpp
@@ -868,3 +868,21 @@ List ListNoProtect_crosspolicy(Vector<VECSXP, NoProtectStorage> data){
     data2[0] = data[0];
     return data2;
 }
+
+// [[Rcpp::export]]
+bool CharacterVector_test_equality(CharacterVector x, CharacterVector y) {
+    if (x.length() != y.length()) {
+        return false;
+    }
+
+    return std::equal(x.begin(), x.end(), y.begin());
+}
+
+// [[Rcpp::export]]
+bool CharacterVector_test_equality_crosspolicy(CharacterVector x, Vector<STRSXP,NoProtectStorage> y) {
+    if (x.length() != y.length()) {
+        return false;
+    }
+
+    return std::equal(x.begin(), x.end(), y.begin());
+}
diff --git a/inst/unitTests/runit.Vector.R b/inst/unitTests/runit.Vector.R
@@ -772,4 +772,9 @@ if (.runThisTest) {
         data2 <- ListNoProtect_crosspolicy(data)
         checkEquals(data, data2)
     }
+
+    test.CharacterVector_test_equality <- function(){
+        checkTrue( !CharacterVector_test_equality("foo", "bar") )
+        checkTrue( !CharacterVector_test_equality_crosspolicy("foo", "bar") )
+    }
 }