Shane Grant
6f24fac7d5
SizeTag and Map changes for #96
...
still need to do NVP
2014-04-30 16:01:47 -07:00
Shane Grant
d974f3e5b1
Merge branch 'issue81' into develop
...
Conflicts:
include/cereal/archives/json.hpp
2014-04-15 12:16:03 -07:00
Shane Grant
99be96876a
tidy up
2014-04-15 12:13:30 -07:00
Randolph Voorhies
0022152a85
Adding cases for integer types for JSON load.
...
This refs #81
2014-04-15 12:09:31 -07:00
Shane Grant
83abae0906
fix cmake files, accidentally removed quotes from earlier commit
2014-04-15 12:07:24 -07:00
Shane Grant
a2d3b3c9e6
Merge branch 'fix_merge' into develop
2014-04-15 12:00:19 -07:00
Shane Grant
b2730c6351
Fixing merge problem
2014-04-15 11:59:41 -07:00
Shane Grant
00abd7a068
Merge branch 'mattyclarkson-capitalization' into develop
2014-04-15 11:29:22 -07:00
Shane Grant
f6d01d5b07
adding size() to speed up copy
2014-04-01 11:18:53 -07:00
Joel Holdsworth
2b2e80cda1
XMLOutputArchive: Do not take c_str from a temporary string
2014-04-01 11:14:48 -07:00
Shane Grant
6824a6f46f
Adding quotes to cmake stuff
...
Also made it so that performance actually gets built
see #84
2014-03-28 14:24:28 -07:00
Shane Grant
da79a37a48
removed deprecated things in doxygen config
2014-03-28 14:20:05 -07:00
Shane Grant
631aace6cf
Adding macros for minimal functions
...
Also added some documentation to macros.hpp
relates #60
2014-03-26 17:09:16 -07:00
Shane Grant
f56a51b2f1
Merge branch 'capitalization' of https://github.com/mattyclarkson/cereal into mattyclarkson-capitalization
...
Conflicts:
include/cereal/types/common.hpp
2014-03-26 14:45:39 -07:00
Randolph Voorhies
798a598f48
Commenting out OS X fixes for now.
...
This breaks the build on travis, so I'll need to wait until I can use an
Ubuntu machine to check this out further. Relevant to issue #81 .
2014-03-24 15:07:47 -07:00
Randolph Voorhies
8230f54bb4
Better checking for long on OS X for JSON
2014-03-24 14:44:56 -07:00
Randolph Voorhies
8934f65578
Accidently committed commented out version.
...
This actually does address issue #81 .
2014-03-24 14:19:37 -07:00
Randolph Voorhies
0001a31100
(unsigned)long JSONInputArchive::loadValue overloads
...
Adding overloads for cereal::JSONINputArchive(long & value) and
cereal::JSONINputArchive(unsigned long & value) to fix a compile issue
on OS X with clang 3.3 and libc++. This addresses issue #81 . Please
check to make sure this works on the rest of the standard compilers
before closing.
2014-03-24 14:15:20 -07:00
Shane Grant
57fe08f7df
Update README.md
...
mailing list
2014-03-23 16:36:52 -07:00
Shane Grant
d5f9a8a22b
Merge branch 'master' into develop
2014-03-22 21:52:48 -07:00
Shane Grant
a8b106d33c
Update README.md
2014-03-22 12:33:48 -07:00
Shane Grant
1dab31e215
target gh-pages instead of gh-pages-1.0
2014-03-21 17:14:31 -07:00
Shane Grant
3bbe6bde37
makefile no longer needed, using cmake
2014-03-21 16:55:04 -07:00
Shane Grant
5a8e3ce934
Merge branch 'develop'
...
Conflicts:
.travis.yml
2014-03-21 16:54:22 -07:00
Shane Grant
b6026f6e32
Merge branch 'issue23_new' into develop
2014-03-20 23:12:36 -07:00
Shane Grant
66542bffb6
Merge branch 'issue23_new' of github.com:USCiLab/cereal into issue23_new
2014-03-20 22:48:19 -07:00
Shane Grant
2c661a3cfe
iscript update
2014-03-20 22:43:26 -07:00
Shane Grant
06b4f467c1
update coverage script
2014-03-20 22:33:14 -07:00
Shane Grant
721c75c931
update coverage scrpt
2014-03-20 22:26:54 -07:00
Shane Grant
5d31ec2ee1
updating coverage scripts and build
2014-03-20 22:20:42 -07:00
Shane Grant
d1310e4459
Working on vs2013
...
see #23
2014-03-20 20:43:35 -07:00
Shane Grant
26d31872e3
Update copyright 2013 -> 2014
2014-03-20 20:36:04 -07:00
Shane Grant
074ab07bfe
removing unnecessary const
2014-03-20 20:03:19 -07:00
Shane Grant
4bc8dada80
Removing superflous template disambiguation
...
Also added some GCC 4.7.3 workaround, hurray for supporting more than one compiler!
2014-03-20 19:29:23 -07:00
Shane Grant
a088095518
cleanup
2014-03-20 15:07:54 -07:00
Shane Grant
4fb9e3bf73
removing dead code
2014-03-20 15:06:45 -07:00
Shane Grant
60e207faaa
Adding unit tests for #23 (minimal)
2014-03-20 14:37:14 -07:00
Shane Grant
348d2d763d
Updating unit tests to include minimal specializations
2014-03-20 14:18:56 -07:00
Shane Grant
41082f702d
minimal working with enums
...
see #23
2014-03-20 11:16:24 -07:00
Shane Grant
8abfa583b0
Nearly done with #23
...
Still some kinks to work out in regards to trait checks on a non-member
load_minimal that accepts everything as template parameters and does
enable_if style checks
2014-03-19 22:41:34 -07:00
Shane Grant
0423779b94
minimal serialize functions now take Archive as const ref parameter
...
Even though there is currently no need to use this archive parameter, it is now
passed to the various minimal serialization functions instead of simply being
a template parameter.
The reason for this was ultimately allow for correct name-lookup of the functions
using ADL when the type was unable to provide this (e.g. a generic serialize function
for enums written in the cereal namespace).
Also fixed some issues with GCC 4.7 and the various traits that warn if the type for the
load isn't passed by const ref. Had to use a workaround found here:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51213 (=delete instead of private).
2014-03-19 17:55:03 -07:00
Shane Grant
738da2bedb
about to make some changes
2014-03-19 14:25:03 -07:00
Shane Grant
267d489a03
doxygen updates
2014-03-18 21:52:11 -07:00
Shane Grant
084532fe53
traits now compiling properly for #23
2014-03-18 17:44:58 -07:00
Shane Grant
b915326877
Another attempt at #72
2014-03-18 12:05:27 -07:00
Shane Grant
12a70b1336
work on traits
...
revisit the static assert on line 691 of traits firing at the wrong time
2014-03-17 22:51:08 -07:00
Shane Grant
d0d23980d5
adding const check to versioned
2014-03-17 22:24:39 -07:00
Shane Grant
e4429f0df4
Putting in check for invalid load_minmal type parameter
2014-03-17 22:22:52 -07:00
Shane Grant
3a35be8ffc
adding traits for load_minimal non member versioned
2014-03-17 21:14:04 -07:00
Shane Grant
e6c3192b18
adding traits for load_minimal versioned member
2014-03-17 21:10:05 -07:00
