Skip to content

Commit c68f014

Browse files
romainfrancoisromainfrancois
committed
removed unused and move wrap in its own directory, where it will be split into several files
1 parent 5e16e12 commit c68f014

7 files changed

Lines changed: 4 additions & 76 deletions

File tree

‎inst/include/Rcpp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272

7373
// this stays at the very end, because it needs to
7474
// 'see' all versions of wrap
75-
#include <Rcpp/internal/wrap_end.h>
75+
#include <Rcpp/wrap/wrap_end.h>
7676

7777
#include <Rcpp/api/meat/meat.h>
7878

‎inst/include/Rcpp/api/meat/Vector.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ namespace Rcpp{
6161
return *this ;
6262
}
6363

64-
6564
template <int RTYPE>
6665
Vector<RTYPE>& Vector<RTYPE>::operator=(const Vector& other){
6766
RCPP_DEBUG_CLASS( Vector, "= %s()", DEMANGLE(Vector) )

‎inst/include/Rcpp/internal/SEXP_Iterator.h‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎inst/include/Rcpp/vector/Vector.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ class Vector :
103103
Vector( std::initializer_list<init_type> list ) : RObject(){
104104
assign( list.begin() , list.end() ) ;
105105
}
106+
Vector( std::initializer_list<typename traits::named_object<init_type>> list ) :
107+
Vector(wrap(list.begin(), list.end())){}
106108

107109
/**
108110
* Assignment operator. Grab the SEXP of the other vector

inst/include/Rcpp/internal/wrap_end.h renamed to inst/include/Rcpp/wrap/wrap_end.h

File renamed without changes.

inst/include/Rcpp/internal/wrap.h renamed to inst/include/Rcpp/wrap/wrap_impl.h

File renamed without changes.

‎inst/include/RcppCommon.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,9 @@ namespace Rcpp{
112112
#include <Rcpp/vector/VectorBase.h>
113113
#include <Rcpp/vector/MatrixBase.h>
114114

115-
#include <Rcpp/internal/wrap.h>
115+
#include <Rcpp/wrap/wrap.h>
116116

117117
#include <Rcpp/internal/Proxy_Iterator.h>
118-
#include <Rcpp/internal/SEXP_Iterator.h>
119118
#include <Rcpp/internal/converter.h>
120119

121120
#include <Rcpp/algo.h>

0 commit comments

Comments
 (0)