Fixed compile errors in TAM, diveRsity, dplyr, icd9, and kmisc

Author: dcdillon

inst/include/Rcpp/String.h

@@ -217,6 +217,14 @@ namespace Rcpp {
             setBuffer(); buffer += CHAR(proxy_sexp); valid = false;
             return *this;
         }
+        inline String& operator+=(const const_StringProxy& proxy) {
+            RCPP_STRING_DEBUG("String::operator+=(const StringProxy&)");
+            if (is_na()) return *this;
+            SEXP proxy_sexp = proxy;
+            if (proxy_sexp == NA_STRING) { data = Rcpp_ReplaceObject(data, NA_STRING); valid = true; buffer_ready = false; return *this;}
+            setBuffer(); buffer += CHAR(proxy_sexp); valid = false;
+            return *this;
+        }
         inline String& operator+=(SEXP x) {
             RCPP_STRING_DEBUG("String::operator+=(SEXP)");
             if (is_na()) return *this;

inst/include/Rcpp/internal/Proxy_Iterator.h

@@ -112,7 +112,7 @@ class Proxy_Iterator {
 
 		inline int index() const { return proxy.index ; }
 
-		inline PROXY operator[](R_xlen_t i){ return PROXY(*proxy.parent, proxy.index + i) ; }
+		inline PROXY operator[](R_xlen_t i) const { return PROXY(*proxy.parent, proxy.index + i) ; }
 
 private:
 	PROXY proxy ;