Skip to content

Commit

Permalink
change to cxx14
Browse files Browse the repository at this point in the history
  • Loading branch information
@CreRecombinase
CreRecombinase committed Feb 22, 2018
1 parent 9308841 commit 0d4dd72
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 29 deletions.
5 changes: 0 additions & 5 deletions inst/include/EigenH5.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
#include <complex>
#include <iostream>
#include <range/v3/core.hpp>
#include <range/v3/view/iota.hpp>
#include <range/v3/view/take.hpp>
#include <range/v3/view/reverse.hpp>
#include <range/v3/view/any_view.hpp>
#include <range/v3/utility/copy.hpp>
#include <highfive/H5DataSet.hpp>
#include <highfive/H5Filter.hpp>
#include <highfive/H5DataSpace.hpp>
Expand Down
42 changes: 21 additions & 21 deletions inst/include/EigenH5_RcppExports.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
}

inline bool check_blosc() {
Expand All @@ -58,7 +58,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<bool >(rcpp_result_gen);
}

Expand All @@ -77,7 +77,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
}

inline bool is_transposed(const std::string filename, const std::string groupname, const std::string dataname) {
Expand All @@ -95,7 +95,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<bool >(rcpp_result_gen);
}

Expand All @@ -114,7 +114,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
}

inline Rcpp::IntegerMatrix parse_mat(Rcpp::CharacterVector inp) {
Expand All @@ -132,7 +132,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<Rcpp::IntegerMatrix >(rcpp_result_gen);
}

Expand All @@ -151,7 +151,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
}

inline void write_vec_chunk_h5(std::string filename, std::string groupname, std::string dataname, Eigen::VectorXd& data, const Rcpp::IntegerVector offsets = Rcpp::IntegerVector::create(), const Rcpp::IntegerVector chunksizes = Rcpp::IntegerVector::create()) {
Expand All @@ -169,7 +169,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
}

inline bool data_exists(const std::string& filename, const std::string& groupname, const std::string& dataname) {
Expand All @@ -187,7 +187,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<bool >(rcpp_result_gen);
}

Expand All @@ -206,7 +206,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<SEXPTYPE >(rcpp_result_gen);
}

Expand All @@ -225,7 +225,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<SEXP >(rcpp_result_gen);
}

Expand All @@ -244,7 +244,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<Rcpp::IntegerVector >(rcpp_result_gen);
}

Expand All @@ -263,7 +263,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<SEXP >(rcpp_result_gen);
}

Expand All @@ -282,7 +282,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<SEXP >(rcpp_result_gen);
}

Expand All @@ -301,7 +301,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
}

inline void create_matrix_h5(const std::string& filename, const std::string& groupname, const std::string& dataname, SEXP data, const bool doTranspose = false, const Rcpp::IntegerVector dims = Rcpp::IntegerVector::create(), const Rcpp::IntegerVector chunksizes = Rcpp::IntegerVector::create()) {
Expand All @@ -319,7 +319,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
}

inline void write_matrix_h5(const std::string& filename, const std::string& groupname, const std::string& dataname, SEXP data, const bool doTranspose = false, const Rcpp::IntegerVector offsets = Rcpp::IntegerVector::create(0,0), const Rcpp::IntegerVector chunksizes = Rcpp::IntegerVector::create()) {
Expand All @@ -337,7 +337,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
}

inline bool write_df_h5(Rcpp::DataFrame& df, const std::string groupname, const std::string outfile, Rcpp::IntegerVector deflate_level = Rcpp::IntegerVector::create(4)) {
Expand All @@ -355,7 +355,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<bool >(rcpp_result_gen);
}

Expand All @@ -374,7 +374,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<Rcpp::StringVector >(rcpp_result_gen);
}

Expand All @@ -393,7 +393,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<Rcpp::List >(rcpp_result_gen);
}

Expand All @@ -412,7 +412,7 @@ namespace EigenH5 {
if (rcpp_result_gen.inherits("interrupted-error"))
throw Rcpp::internal::InterruptedException();
if (rcpp_result_gen.inherits("try-error"))
throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
throw Rcpp::exception(as<std::string>(rcpp_result_gen).c_str());
return Rcpp::as<Rcpp::ListOf<Rcpp::IntegerVector> >(rcpp_result_gen);
}

Expand Down
4 changes: 2 additions & 2 deletions inst/include/eigenh5/MatSlices.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@


//[[depends(RcppEigen)]]
//[[Rcpp::plugins(cpp17)]]
//[[Rcpp::plugins(cpp14)]]
// [[Rcpp::depends(RcppProgress)]]
#include <progress.hpp>
#include <array>
#include<optional>



class MatSlices{
Expand Down
2 changes: 1 addition & 1 deletion src/Makevars
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CXX_STD = CXX17
CXX_STD = CXX14
RHDF5_LIBS=`echo 'Rhdf5lib::pkgconfig("PKG_C_LIBS")'|\
"${R_HOME}/bin/R" --vanilla --slave`
BLOSC_CFLAGS+=$(shell echo 'libblosc::pkgconfig("PKG_CFLAGS")'|\
Expand Down

0 comments on commit 0d4dd72

Please sign in to comment.