Skip to content

Commit

Permalink
version bump. Also "fprintf" replaced with "throw" in order to not up…
Browse files Browse the repository at this point in the history
…set CRAN.
  • Loading branch information
dselivanov committed Aug 7, 2017
1 parent d80e0be commit aca5897
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "inst/include"]
path = inst/include
url = https://github.com/greg7mdp/sparsepp.git
url = https://github.com/dselivanov/sparsepp.git
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: sparsepp
Type: Package
Title: 'Rcpp' Interface to 'sparsepp'
Version: 0.1.2
Date: 2017-01-22
Version: 0.2.0
Date: 2017-08-07
Authors@R: c(
person("Gregory", "Popovitch", role = c("aut", "cph"), email = "greg7mdp@gmail.com"),
person("Google Inc", role = c("aut", "cph")),
Expand All @@ -16,7 +16,7 @@ Description: Provides interface to 'sparsepp' - fast, memory efficient hash map.
memory usage (especially when the final size of the map is not known in advance).
License: BSD_3_clause + file LICENSE
Encoding: UTF-8
URL: https://github.com/greg7mdp/sparsepp, https://github.com/dselivanov/sparsepp
BugReports: https://github.com/dselivanov/sparsepp/issues
URL: https://github.com/greg7mdp/sparsepp, https://github.com/dselivanov/r-sparsepp
BugReports: https://github.com/dselivanov/r-sparsepp/issues
Suggests: Rcpp
RoxygenNote: 5.0.1
RoxygenNote: 6.0.1
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ To use C++ code from `sparsepp`:

1. In DESCRIPTION, add `LinkingTo: sparsepp`.
1. In the C++ file, add:
`#include <sparsepp.h>`
`#include <sparsepp/spp.h>`

## Simple example

```c++
#include <sparsepp.h>
#include <sparsepp/spp.h>
using spp::sparse_hash_map;
sparse_hash_map<string, int> smap;
```
Expand All @@ -27,7 +27,7 @@ sparse_hash_map<string, int> smap;
#include <iostream>
#include <functional>
#include <string>
#include <sparsepp.h>
#include <sparsepp/spp.h>

using std::string;

Expand Down
2 changes: 1 addition & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Test environments

* local OS X install, R 3.3.1
* local OS X install, R 3.4.0
* win-builder (devel)

## R CMD check results
Expand Down
18 changes: 18 additions & 0 deletions man/sparsepp-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit aca5897

Please sign in to comment.