Skip to content

Commit a86ab1f

Browse files
committed
revert commits 3102b1e and 8fb7d0a
we do not deprecate the Vector ctor from string and char*
1 parent faa7fbc commit a86ab1f

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2014-09-02 Dirk Eddelbuettel <[email protected]>
2+
3+
* inst/include/Rcpp/vector/Vector.h: Reversing change from Aug 30: the
4+
Vector ctor from char* and string are used for CharacterVector()
5+
16
2014-09-02 JJ Allaire <[email protected]>
27

38
* R/Attributes.R: Include LinkingTo in DESCRIPTION fields scanned

inst/NEWS.Rd

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@
3636
\itemize{
3737
\item The \code{Rcpp-FAQ} vignette was updated with respect to OS X issues.
3838
}
39-
\item Deprecation of unused Rcpp featires:
40-
\itemize{
41-
\item The \code{Vector} class has two constructors from \code{std::string}
42-
and \code{const char*} which are not fully functional and will be
43-
withdrawn twelve months after this release.
44-
}
4539
}
4640
}
4741

inst/include/Rcpp/vector/Vector.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,15 @@ class Vector :
8989
fill( u ) ;
9090
}
9191

92+
// constructor for CharacterVector()
9293
Vector( const std::string& st ){
9394
RCPP_DEBUG_2( "Vector<%d>( const std::string& = %s )", RTYPE, st.c_str() )
94-
Rf_warning("The Vector(std::string) constructor is deprecated and will be removed in a future release.");
9595
Storage::set__( internal::vector_from_string<RTYPE>(st) ) ;
9696
}
97+
98+
// constructor for CharacterVector()
9799
Vector( const char* st ) {
98100
RCPP_DEBUG_2( "Vector<%d>( const char* = %s )", RTYPE, st )
99-
Rf_warning("The Vector(const char*) constructor is deprecated and will be removed in a future release.");
100101
Storage::set__(internal::vector_from_string<RTYPE>(st) ) ;
101102
}
102103

0 commit comments

Comments
 (0)