Skip to content

Commit 78e0ede

Browse files
authored
Merge pull request #80 from andrjohns/sync-dev
Update cpp11 and QuickJS-NG sources for CRAN errors
2 parents bd3c2c6 + 728a2df commit 78e0ede

File tree

6 files changed

+11
-7
lines changed

6 files changed

+11
-7
lines changed

.github/workflows/R-CMD-check-special.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
- { label: "c23",
3232
name: "c23",
3333
container: "ghcr.io/r-hub/containers/c23:latest"}
34-
- { label: "gcc14",
35-
name: "gcc14",
36-
container: "ghcr.io/r-hub/containers/gcc14:latest"}
34+
- { label: "gcc15",
35+
name: "gcc15",
36+
container: "ghcr.io/r-hub/containers/gcc15:latest"}
3737
- { label: "clang20",
3838
name: "clang20",
3939
container: "ghcr.io/r-hub/containers/clang20:latest"}

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: QuickJSR
22
Title: Interface for the 'QuickJS' Lightweight 'JavaScript' Engine
3-
Version: 1.5.2
3+
Version: 1.6.0
44
Authors@R: c(
55
person(c("Andrew", "R."), "Johnson", , "andrew.johnson@arjohnsonau.com", role = c("aut", "cre"),
66
comment = c(ORCID = "0000-0001-7000-8065")),

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# QuickJSR 1.6.0
2+
* Sync bundled QuickJS-NG engine to 9d6e372 to address gcc-ubsan error
3+
* Patch bundled cpp11 headers for whitespace in literal operator declarations
4+
15
# QuickJSR 1.5.2
26
* Fix conversions of NULL/NA/undefined values between R and JS
37

inst/include/cpp11/R.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
namespace cpp11 {
5252
namespace literals {
5353

54-
constexpr R_xlen_t operator"" _xl(unsigned long long int value) { return value; }
54+
constexpr R_xlen_t operator""_xl(unsigned long long int value) { return value; }
5555

5656
} // namespace literals
5757

inst/include/cpp11/named_arg.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class named_arg {
4141

4242
namespace literals {
4343

44-
inline named_arg operator"" _nm(const char* name, std::size_t) { return named_arg(name); }
44+
inline named_arg operator""_nm(const char* name, std::size_t) { return named_arg(name); }
4545

4646
} // namespace literals
4747

0 commit comments

Comments
 (0)