Skip to content

Commit

Permalink
Merge pull request #114 from eddelbuettel/feature/compilation_standard
Browse files Browse the repository at this point in the history
No longer set a default compilation standard
  • Loading branch information
lsilvest committed Mar 12, 2023
2 parents 1e4c2e3 + 2a8bdea commit 9085583
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 8 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2023-03-12 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll minor version

* src/Makevars: No longer set compilation standard
* src/Makevars.win: Idem
* src/Makevars.ucrt: Idem

2022-12-06 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll minor version
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: nanotime
Type: Package
Title: Nanosecond-Resolution Time Support for R
Version: 0.3.7.1
Date: 2022-12-06
Version: 0.3.7.2
Date: 2023-03-12
Author: Dirk Eddelbuettel and Leonardo Silvestri
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Description: Full 64-bit resolution date and time functionality with
Expand Down
6 changes: 6 additions & 0 deletions inst/NEWS.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
\newcommand{\ghpr}{\href{https://github.com/eddelbuettel/nanotime/pull/#1}{##1}}
\newcommand{\ghit}{\href{https://github.com/eddelbuettel/nanotime/issues/#1}{##1}}

\section{Changes in version 0.3.8 (2023-xx-yy)}{
\itemize{
\item Time format documentation now has a reference to \pkg{RcppCCTZ}
}
}

\section{Changes in version 0.3.7 (2022-10-23)}{
\itemize{
\item Update mkdocs for material docs generator (Dirk in \ghpr{102})
Expand Down
2 changes: 0 additions & 2 deletions src/Makevars
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
## We want C++11
CXX_STD = CXX11

## We need headers from our package, the directory is not automatically included
PKG_CXXFLAGS = -I../inst/include
2 changes: 0 additions & 2 deletions src/Makevars.ucrt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
## We want C++11
CXX_STD = CXX11

## We need headers from our package, the directory is not automatically included
PKG_CXXFLAGS = -I../inst/include -mno-ms-bitfields -D_POSIX_THREAD_SAFE_FUNCTIONS
2 changes: 0 additions & 2 deletions src/Makevars.win
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
## We want C++11
CXX_STD = CXX11

## We need headers from our package, the directory is not automatically included
PKG_CXXFLAGS = -I../inst/include -mno-ms-bitfields

0 comments on commit 9085583

Please sign in to comment.