609 Commits

Author SHA1 Message Date
Shane Grant
8785741f41 Progress towards #46 2014-05-19 16:15:16 -07:00
Shane Grant
4ed9ef9e83 more cleanup for non member save
see #85
2014-05-19 15:27:05 -07:00
Shane Grant
4a0b06ec97 Consolidate save_minimal type trait checks
relates #85
2014-05-19 15:19:40 -07:00
Shane Grant
2e82e36f60 adding a few undefs to internal trait macros 2014-05-13 16:07:55 -07:00
Shane Grant
bbcc6f5aa9 formatting 2014-05-12 10:42:21 -07:00
Shane Grant
bf1bb9dc58 Changed nvp to new style 2014-05-12 10:36:37 -07:00
Shane Grant
876efe9f49 Merge branch 'Factoid-json_memory' into develop 2014-05-12 10:28:45 -07:00
Shane Grant
d85d8136e1 Fixing versioning for classes in namespaces
Fixes #99
2014-05-12 10:22:38 -07:00
Adrian Cheater
b4e7d222de Removed debugging std::cout 2014-05-10 00:11:52 -05:00
Adrian Cheater
dc80eabbbf Fixed up missing NVP calls for out of order deseriailization of std::unique_ptr and std::shared_ptr 2014-05-10 00:11:52 -05:00
Shane Grant
fd73e8066f Modify cmake so that performance gets built 2014-05-07 15:45:51 -07:00
Shane Grant
1d8deb2521 Combine non-member save tests
relates #85
2014-05-06 22:24:07 -07:00
Shane Grant
fe4b72314f combined traits for member save into one
relates #85
2014-05-06 11:25:11 -07:00
Shane Grant
d4704dedb3 comment out obsolete line in doxygen 2014-05-06 11:04:04 -07:00
Shane Grant
e6a3da0f87 More traits cleanup
Combined the non member tests, relates #85
2014-05-04 15:40:45 -07:00
Shane Grant
2056257177 Consolidated macro to create member tests
Got rid of the near identical versioned variant of the macro, just one macro that can be parameterized
to handle versioned functions now.

Relates to #85
2014-05-04 15:22:20 -07:00
Shane Grant
b957321659 Making some changes suggested by FlintPlusPlus
Replaced an occurence of NULL with nullptr.
Renamed _CEREAL_NVP to CEREAL_NVP_
Made exception constructors explicit
2014-05-03 11:27:40 -07:00
Shane Grant
7121e91e6a Update README.md
fix compilation error in example, see #97
2014-05-02 09:40:36 -07:00
Shane Grant
8217d7ecf6 Formatting and forwarding in helpers.
Closes #96
2014-05-01 10:32:53 -07:00
Shane Grant
5114eaaf25 nvp for #96 2014-04-30 17:09:48 -07:00
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 v1.0.0 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