Skip to content

Commit 3405e8d

Browse files
committed
move stop into Rcpp namespace
small travis enhancement grammar correction for NEWS
1 parent 63785f0 commit 3405e8d

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ before_install:
1818
- ./travis-tool.sh bootstrap
1919

2020
install:
21-
- ./travis-tool.sh install_r RUnit inline rbenchmark highlight
21+
- ./travis-tool.sh install_aptget r-cran-runit
22+
- ./travis-tool.sh install_r inline rbenchmark highlight
2223

2324
script:
2425
- ./travis-tool.sh run_tests
2526

26-
after_script:
27+
after_failure:
2728
- ./travis-tool.sh dump_logs
2829

2930
notifications:

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2014-01-15 Dirk Eddelbuettel <edd@debian.org>
2+
3+
* inst/include/Rcpp/exceptions.h: Move stop() into Rcpp namespace
4+
15
2013-12-31 Dirk Eddelbuettel <edd@debian.org>
26

37
* vignettes/Rcpp.bib: Updated CRAN package references

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
3-
Version: 0.10.6.5
4-
Date: 2013-11-30
3+
Version: 0.10.6.7
4+
Date: 2014-01-15
55
Authors@R: c(
66
person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org" ),
77
person("Romain", "Francois", role = "aut", email = "romain@r-enthusiasts.com"),

inst/NEWS.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
been updated to better match \R (specifically with \code{Inf}, \code{-Inf},
2121
and \code{NaN}.)
2222
\item Applied two bug fixes to Vector \code{sort()} and \code{RObject}
23-
definition spotted and correct by Kevin Ushey
23+
definition spotted and corrected by Kevin Ushey
2424
}
2525
\item Changes in Rcpp documentation:
2626
\itemize{

inst/include/Rcpp/exceptions.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,11 @@ inline SEXP exception_to_try_error( const std::exception& ex){
191191
std::string demangle( const std::string& name) ;
192192
#define DEMANGLE(__TYPE__) demangle( typeid(__TYPE__).name() ).c_str()
193193

194-
inline void stop(const std::string& message) {
195-
throw Rcpp::exception(message.c_str());
196-
}
194+
namespace Rcpp{
195+
inline void stop(const std::string& message) {
196+
throw Rcpp::exception(message.c_str());
197+
}
198+
}
197199

198200
inline void forward_exception_to_r( const std::exception& ex){
199201
SEXP stop_sym = Rf_install( "stop" ) ;

0 commit comments

Comments
 (0)