Skip to content

Commit be4e711

Browse files
committed
Convert DOS EOL to Unix EOL
Set execute permission on scripts with shebangs
1 parent 3bb7100 commit be4e711

File tree

10 files changed

+114
-101
lines changed

10 files changed

+114
-101
lines changed

ChangeLog

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2026-04-01 Mattias Ellert <mattias.ellert@physics.uu.se>
2+
3+
* inst/discovery/cxx0x.R: Set execute permissions for script
4+
with shebang
5+
* inst/examples/ConvolveBenchmarks/overhead.r: Idem
6+
* inst/examples/Misc/ifelseLooped.r: Idem
7+
* inst/examples/Misc/newFib.r: Idem
8+
* inst/examples/OpenMP/OpenMPandInline.r: Idem
9+
* inst/tinytest/test_dispatch.R: Idem
10+
* src/Makevars.win: Convert DOS EOF to Unix EOF
11+
* inst/tinytest/cpp/InternalFunction.cpp: Idem
12+
* inst/tinytest/cpp/InternalFunctionCPP11.cpp: Idem
13+
114
2026-03-26 Iñaki Ucar <iucar@fedoraproject.org>
215

316
* inst/include/Rcpp/internal/r_vector.h: Use dataptr() again to avoid an

inst/discovery/cxx0x.R

100644100755
File mode changed.

inst/examples/ConvolveBenchmarks/overhead.r

100644100755
File mode changed.

inst/examples/Misc/ifelseLooped.r

100644100755
File mode changed.

inst/examples/Misc/newFib.r

100644100755
File mode changed.

inst/examples/OpenMP/OpenMPandInline.r

100644100755
File mode changed.
Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
2-
//
3-
// InternalFunction.cpp: Rcpp R/C++ interface class library -- InternalFunction unit tests
4-
//
5-
// Copyright (C) 2014 Christian Authmann
6-
//
7-
// This file is part of Rcpp.
8-
//
9-
// Rcpp is free software: you can redistribute it and/or modify it
10-
// under the terms of the GNU General Public License as published by
11-
// the Free Software Foundation, either version 2 of the License, or
12-
// (at your option) any later version.
13-
//
14-
// Rcpp is distributed in the hope that it will be useful, but
15-
// WITHOUT ANY WARRANTY; without even the implied warranty of
16-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
// GNU General Public License for more details.
18-
//
19-
// You should have received a copy of the GNU General Public License
20-
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
21-
22-
23-
#include <Rcpp.h>
24-
25-
26-
int add(int a, int b) {
27-
return a + b;
28-
}
29-
30-
void dummy(int a, int b) {
31-
Rcpp::Rcout << "dummy called" << std::endl;
32-
}
33-
34-
// [[Rcpp::export]]
35-
Rcpp::InternalFunction getDummy() {
36-
return Rcpp::InternalFunction( &dummy );
37-
}
38-
39-
40-
// [[Rcpp::export]]
41-
Rcpp::InternalFunction getAdd() {
42-
return Rcpp::InternalFunction( &add );
43-
}
44-
45-
46-
std::string concatenate(std::string a, std::string b) {
47-
return a + b;
48-
}
49-
50-
// [[Rcpp::export]]
51-
Rcpp::InternalFunction getConcatenate() {
52-
return Rcpp::InternalFunction( &concatenate );
53-
}
54-
1+
// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
2+
//
3+
// InternalFunction.cpp: Rcpp R/C++ interface class library -- InternalFunction unit tests
4+
//
5+
// Copyright (C) 2014 Christian Authmann
6+
//
7+
// This file is part of Rcpp.
8+
//
9+
// Rcpp is free software: you can redistribute it and/or modify it
10+
// under the terms of the GNU General Public License as published by
11+
// the Free Software Foundation, either version 2 of the License, or
12+
// (at your option) any later version.
13+
//
14+
// Rcpp is distributed in the hope that it will be useful, but
15+
// WITHOUT ANY WARRANTY; without even the implied warranty of
16+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
// GNU General Public License for more details.
18+
//
19+
// You should have received a copy of the GNU General Public License
20+
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
21+
22+
23+
#include <Rcpp.h>
24+
25+
26+
int add(int a, int b) {
27+
return a + b;
28+
}
29+
30+
void dummy(int a, int b) {
31+
Rcpp::Rcout << "dummy called" << std::endl;
32+
}
33+
34+
// [[Rcpp::export]]
35+
Rcpp::InternalFunction getDummy() {
36+
return Rcpp::InternalFunction( &dummy );
37+
}
38+
39+
40+
// [[Rcpp::export]]
41+
Rcpp::InternalFunction getAdd() {
42+
return Rcpp::InternalFunction( &add );
43+
}
44+
45+
46+
std::string concatenate(std::string a, std::string b) {
47+
return a + b;
48+
}
49+
50+
// [[Rcpp::export]]
51+
Rcpp::InternalFunction getConcatenate() {
52+
return Rcpp::InternalFunction( &concatenate );
53+
}
54+
Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
2-
//
3-
// InternalFunction.cpp: Rcpp R/C++ interface class library -- InternalFunction unit tests
4-
//
5-
// Copyright (C) 2014 Christian Authmann
6-
//
7-
// This file is part of Rcpp.
8-
//
9-
// Rcpp is free software: you can redistribute it and/or modify it
10-
// under the terms of the GNU General Public License as published by
11-
// the Free Software Foundation, either version 2 of the License, or
12-
// (at your option) any later version.
13-
//
14-
// Rcpp is distributed in the hope that it will be useful, but
15-
// WITHOUT ANY WARRANTY; without even the implied warranty of
16-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
// GNU General Public License for more details.
18-
//
19-
// You should have received a copy of the GNU General Public License
20-
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
21-
22-
23-
#include <Rcpp.h>
24-
25-
26-
int add(int a, int b) {
27-
return a + b;
28-
}
29-
30-
31-
// [[Rcpp::export]]
32-
Rcpp::InternalFunction getAdd4() {
33-
std::function<int(int)> func = std::bind(add, 4, std::placeholders::_1);
34-
return Rcpp::InternalFunction( func );
35-
}
36-
37-
38-
// [[Rcpp::export]]
39-
Rcpp::InternalFunction getConcatenate() {
40-
std::function<std::string(std::string,std::string)> func = [] (std::string a, std::string b) -> std::string {
41-
return a + b;
42-
};
43-
return Rcpp::InternalFunction( func );
44-
}
45-
1+
// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
2+
//
3+
// InternalFunction.cpp: Rcpp R/C++ interface class library -- InternalFunction unit tests
4+
//
5+
// Copyright (C) 2014 Christian Authmann
6+
//
7+
// This file is part of Rcpp.
8+
//
9+
// Rcpp is free software: you can redistribute it and/or modify it
10+
// under the terms of the GNU General Public License as published by
11+
// the Free Software Foundation, either version 2 of the License, or
12+
// (at your option) any later version.
13+
//
14+
// Rcpp is distributed in the hope that it will be useful, but
15+
// WITHOUT ANY WARRANTY; without even the implied warranty of
16+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
// GNU General Public License for more details.
18+
//
19+
// You should have received a copy of the GNU General Public License
20+
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
21+
22+
23+
#include <Rcpp.h>
24+
25+
26+
int add(int a, int b) {
27+
return a + b;
28+
}
29+
30+
31+
// [[Rcpp::export]]
32+
Rcpp::InternalFunction getAdd4() {
33+
std::function<int(int)> func = std::bind(add, 4, std::placeholders::_1);
34+
return Rcpp::InternalFunction( func );
35+
}
36+
37+
38+
// [[Rcpp::export]]
39+
Rcpp::InternalFunction getConcatenate() {
40+
std::function<std::string(std::string,std::string)> func = [] (std::string a, std::string b) -> std::string {
41+
return a + b;
42+
};
43+
return Rcpp::InternalFunction( func );
44+
}
45+

inst/tinytest/test_dispatch.R

100644100755
File mode changed.

src/Makevars.win

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
PKG_CPPFLAGS = -I../inst/include/
2-
1+
PKG_CPPFLAGS = -I../inst/include/
2+

0 commit comments

Comments
 (0)