480 Commits

Author SHA1 Message Date
Shane Grant
9a5a7134db Temporary fix for #105 2014-08-18 23:15:29 -07:00
Shane Grant
ba63d4a093 Merge branch 'volo-zyko-master' into issue_109 2014-08-18 17:10:25 -07:00
Shane Grant
0163d6cdd6 make isWhitespace xml_detail function instead of member 2014-08-18 17:08:51 -07:00
Volo Zyko
f8a871c7ff Another attempt to fix issue #109 now for any type that can contain whitespaces 2014-08-18 14:57:07 +03:00
Volo Zyko
c068ba2405 Reverted changes in xml.hpp for issue #109. 2014-08-13 22:24:55 +03:00
Volo Zyko
16bf75dedf Extended the fix for issue #109 and added a test. 2014-07-31 15:45:05 +03:00
Volo Zyko
b0d45bd565 Fixed issue #109. std::string is serialized/deserialized in XML with CDATA node. 2014-07-28 15:20:43 +03:00
Shane Grant
e423228dde Adding a clean way of dealing with #107 2014-07-07 14:26:30 -07:00
Shane Grant
f067ba6905 Fixing issue #79
Added a set of trait classes that can be used to get an input archive
from an output archive.  Requires specializing a struct for each direction or
alternatively using the new macro CEREAL_SETUP_ARCHIVE_TRAITS(InArchive, OutArchive).
This has already been added for all built in archive types.  This is currently only
used for minimal serialization.

load_minimal type traits now correctly use the output archive to check the existence of
a corresponding save_minimal and get its return type, using the new get_input_from_output
type class.

Added a test for this case into the minimal structs test.

Sandbox_vs needed the new macro to become compliant.
2014-05-22 10:59:13 -07:00
Shane Grant
5305078096 Consolidate non-member save_minimal relates #85 2014-05-21 16:20:02 -07:00
Shane Grant
6d738d7171 experimenting with a cast 2014-05-21 15:02:59 -07:00
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
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
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
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
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
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
b6026f6e32 Merge branch 'issue23_new' into develop 2014-03-20 23:12:36 -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
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