Merge pull request #4 from eddelbuettel/feature/cpptoml-sync

Feature/cpptoml sync
eddelbuettel · Dec 18, 2015 · e588d20 · e588d20
2 parents ee0dbd6 + 62ca0d7
commit e588d20
Show file tree

Hide file tree

Showing 8 changed files with 938 additions and 171 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-17  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/include/cpptoml.h: Sync'ed with cpptoml upstream
+
+	* src/parse.cpp: Small accomodations for changed cpptoml.h
+
 2015-07-16  Dirk Eddelbuettel  <edd@debian.org>
 
 	* DESCRIPTION: Release 0.0.4

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: RcppTOML
 Type: Package
 Title: 'Rcpp' Bindings to Parser for Tom's Obvious Markup Language
-Version: 0.0.4
-Date: 2015-07-16
+Version: 0.0.4.1
+Date: 2015-12-17
 Author: Dirk Eddelbuettel
 Maintainer: Dirk Eddelbuettel <edd@debian.org>
 Description: The configuration format defined by 'TOML' (which expands to