Skip to content

Commit 4354338

Browse files
committed
v0.0.9
1 parent 7a04da8 commit 4354338

File tree

6 files changed

+28
-19
lines changed

6 files changed

+28
-19
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: kit
22
Type: Package
33
Title: Data Manipulation Functions Implemented in C
4-
Version: 0.0.8
5-
Date: 2021-08-21
4+
Version: 0.0.9
5+
Date: 2021-09-12
66
Authors@R: c(person("Morgan", "Jacob", role = c("aut", "cre", "cph"), email = "[email protected]"))
77
Author: Morgan Jacob [aut, cre, cph]
88
Maintainer: Morgan Jacob <[email protected]>

MD5

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
6071edd604dbeb75308cfbedc7790398 *cleanup
22
66d4daddd0163539f19e2cb783fc3bb9 *configure
3-
25392607154756ce2d58afb07245efaf *DESCRIPTION
4-
c5b117f07a0df5d90d1c66c5390ec626 *inst/NEWS.Rd
3+
032f497563062c67c360f2cbbabad526 *DESCRIPTION
4+
5c267ba48bdd845348c286ec3b08f5c1 *inst/NEWS.Rd
55
a87b0f223435ed35607e8514562b8bfe *LICENSE
66
6375b9e30533e0495b98f4b5b829706b *man/charToFact.Rd
77
8f19a2c9feb2f352580fd4892650f285 *man/count.Rd
@@ -16,14 +16,14 @@ a137f7855b41b074e2babaf8a1562551 *man/shareData.Rd
1616
54f91d543a10f8c9aef7082da2b86de7 *man/topn.Rd
1717
3c628c2a27764ec5df2b4980921c310f *man/vswitch.Rd
1818
640100c58f36cf06c14aacd7ff7a946a *NAMESPACE
19-
350a6c4fcd103db180ab34375cb04bcc *R/call.R
19+
a93eb67d15da2c12dde6b9a6de93e10b *R/call.R
2020
34ba4d931a5bd0ba120ddef7e5327313 *README.md
2121
4826023c3ffe528db5e2af5db2a84b5a *src/dup.c
2222
e86a1960c335e7d534a4683b52d8b70c *src/dupLen.c
2323
84dc17b4330566e5beb69626ad9d268e *src/fpos.c
2424
c362509861cd6835c1d8adbb0dce02b4 *src/iif.c
2525
253a8c2c729dc6e0557dd70cf6e7f530 *src/init.c
26-
791ba8c72656c5dc163fb9b5dfae6004 *src/kit.h
26+
4f0b51d262c28db77550bca462b21ffa *src/kit.h
2727
a52426250b954a335b1121948e057ee7 *src/Makevars.in
2828
95e3011e37d9dde0d75f3a3819b2acd3 *src/Makevars.win
2929
8e997b5d5d44af5cea7eafb48a4b9745 *src/nswitch.c

R/call.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ topn = function(vec, n=6L, decreasing=TRUE, hasna=TRUE,index=TRUE) if(ind
2020
uniqLen = function(x) .Call(CdupLenR, x)
2121
vswitch = function(x, values, outputs, default=NULL, nThread=getOption("kit.nThread"), checkEnc = TRUE) .Call(CvswitchR, x, values, outputs, default, nThread, checkEnc)
2222

23-
.onAttach = function(libname, pkgname) packageStartupMessage(paste0("Attaching kit 0.0.8 (OPENMP ",if(.Call(CompEnabledR)) "enabled" else "disabled"," using 1 thread)"))
23+
.onAttach = function(libname, pkgname) packageStartupMessage(paste0("Attaching kit 0.0.9 (OPENMP ",if(.Call(CompEnabledR)) "enabled" else "disabled"," using 1 thread)"))
2424
.onLoad = function(libname, pkgname) options("kit.nThread"=1L) #nocov
2525
.onUnload = function(libpath) library.dynam.unload("kit", libpath) #nocov
2626

inst/NEWS.Rd

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
\newcommand{\CRANpkg}{\href{https://CRAN.R-project.org/package=#1}{\pkg{#1}}}
66

7+
\section{version 0.0.9 (2021-09-12)}{
8+
\subsection{Notes}{
9+
\itemize{
10+
\item Re-organise header to prevent compilation errors with new version of Clang due to conflicts between R C headers and OpenMP.
11+
}
12+
}
13+
}
14+
715
\section{version 0.0.8 (2021-08-21)}{
816
\subsection{New Features}{
917
\itemize{

src/kit.h

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
#include <R.h>
2-
#include <R_ext/Rdynload.h>
3-
#include <Rversion.h>
4-
#if !defined(R_VERSION) || R_VERSION < R_Version(3, 5, 0)
5-
#define USE_RINTERNALS
6-
#define DATAPTR_RO(x) ((const void *)DATAPTR(x))
7-
#endif
8-
#include <Rinternals.h>
9-
#include <stdlib.h>
10-
#include <stdint.h>
11-
#include <stdbool.h>
121
#ifdef _OPENMP
132
#include<omp.h>
143
#define omp_enabled true
@@ -23,6 +12,18 @@
2312
#define OMP_PARALLEL_FOR(n)
2413
#endif
2514

15+
#include <R.h>
16+
#include <R_ext/Rdynload.h>
17+
#include <Rversion.h>
18+
#if !defined(R_VERSION) || R_VERSION < R_Version(3, 5, 0)
19+
#define USE_RINTERNALS
20+
#define DATAPTR_RO(x) ((const void *)DATAPTR(x))
21+
#endif
22+
#include <Rinternals.h>
23+
#include <stdlib.h>
24+
#include <stdint.h>
25+
#include <stdbool.h>
26+
2627
#if !defined SSIZE_MAX
2728
#define SSIZE_MAX LLONG_MAX
2829
#endif

tests/test_kit.Rout.save

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Type 'q()' to quit R.
5353
+ }
5454
>
5555
> library(kit); unloadNamespace("kit")
56-
Attaching kit 0.0.8 (OPENMP enabled using 1 thread)
56+
Attaching kit 0.0.9 (OPENMP enabled using 1 thread)
5757
>
5858
> topn = kit::topn
5959
> setlevels = kit::setlevels

0 commit comments

Comments
 (0)