Eric Frias
7c88a95df1
Merge commit 'b94a338e56475943eb9bcc79be60ed6afd586796'
2017-06-21 16:19:49 -04:00
Eric Frias
772c2b2822
Merge commit 'e323862'
2017-06-20 19:06:22 -04:00
kinglaw
0c25cb568f
In order to pass compile in vs2013, fixed:
...
removed equihash from the cmakelists.txt.
Fix the inconsistencies of the template functions "from_variant" ,"unpack" and definitions that processes flat_map.
Signed-off-by: kinglaw <58291@qq.com>
2017-06-01 13:03:02 +08:00
Vikram Rajkumar
9d383077fa
Revert "change json seralization of map<string,T> to be object rather than array of pairs"
...
This reverts commit a421e28048
2017-01-13 13:35:48 -06:00
Daniel Larimer
fb4ddbac0d
addding improved support for serializing boost interprocss types
2016-09-28 11:55:51 -04:00
Daniel Larimer
e7d0d26fe2
adding fixed_string definition
2016-09-15 15:29:16 -04:00
Daniel Larimer
a421e28048
change json seralization of map<string,T> to be object rather than array of pairs
2016-03-17 17:24:25 -04:00
Eric Frias
fa2b8fd4d2
Merge branch 'cryptonomex_master'
...
# Conflicts:
# src/network/http/websocket.cpp
2016-02-26 11:16:10 -05:00
Daniel Larimer
bde8a7f424
fixes updates for deque to variant
2016-02-11 17:16:39 -05:00
Daniel Larimer
845f8388c4
add deque support to variant
2016-02-01 18:29:30 -05:00
Eric Frias
008dafe7d0
Merge branch 'github_master'
...
Conflicts:
src/asio.cpp
src/network/http/websocket.cpp
2015-09-18 16:03:34 -04:00
Eric Frias
ebf42fbbd4
Allow serializing std::maps that use non-standard comparison functions
2015-08-10 18:21:56 -04:00
Daniel Larimer
7fc2cc43f1
Adding multi_index to/from variant support
2015-07-23 13:16:19 -04:00
Eric Frias
55111ebbb5
Merge branch 'github_master'
2015-07-14 13:32:58 -04:00
Daniel Larimer
63677c47d9
helper for smart_ref
2015-07-08 16:43:25 -04:00
Eric Frias
541118d89d
Merge branch 'master' into syncad_master
2015-06-04 17:14:37 -04:00
theoreticalbts
0ad91391c7
variant.hpp: Prettify includes
2015-06-01 17:13:51 -04:00
theoreticalbts
b391ecb4c7
deque: Add std::deque to serialization / reflection
2015-06-01 17:13:51 -04:00
dnotestein
a62f7d2e87
allow reflecting a pqxx::result::size_type on windows
2015-04-08 09:59:15 -04:00
Daniel Larimer
a0192d1081
unique_ptr to/from variant
2015-04-01 17:24:33 -04:00
Daniel Larimer
0caac3fee9
update exceptions in static_variant and add header gaurd
2015-03-05 08:22:41 -05:00
Daniel Larimer
f9f965809b
bug fixes
2015-02-27 16:07:50 -05:00
Daniel Larimer
c0a4ed77b1
adding static_variant type
2015-02-27 13:41:55 -05:00
Daniel Larimer
537029f09f
fix build
2015-02-23 14:01:58 -05:00
Daniel Larimer
7e34d8fe56
Adding support for flat_map,flat_set
2015-02-23 09:06:04 -05:00
Daniel Larimer
ec66863902
added type for safe int ops
2015-02-19 11:39:17 -05:00
Daniel Larimer
dfe67a4494
adding blob type to variant
2014-10-15 23:32:37 -04:00
Nathan Hourt
21db937ba7
Add reflector for multimap
2014-09-04 19:14:23 -04:00
Vikram Rajkumar
a23f3a86be
Add missing integer variant conversions
2014-07-28 22:36:47 -04:00
Daniel Larimer
8e3163d4fb
extra helper variant constructor
2014-06-07 22:58:19 -04:00
Eric Frias
a6ca7042da
add to/from variant for fc::microseconds
2014-06-04 13:51:50 -04:00
Daniel Larimer
ac03a71f3d
improve variant cast error reporting
2014-05-25 14:18:26 -04:00
Daniel Larimer
17aefe29de
using explicit bool operator for optional
2014-05-20 11:25:31 -04:00
Daniel Larimer
013b9a867f
reflect typename of variant
2014-05-18 21:14:51 -04:00
Daniel Larimer
ac0f01843f
fix build on osx by disabling some keepalive params
2014-04-11 17:06:57 -04:00
Daniel Larimer
bdeefb48bf
adding std::map<> conversions to/from variant
2014-03-24 11:46:23 -04:00
Daniel Larimer
c0727f30b0
adding variant support for unordered maps
2014-01-14 03:51:17 -05:00
Daniel Larimer
cf37cd776b
update reflect
2013-10-22 22:02:55 -04:00
Daniel Larimer
105948ea65
json and variant bug fixes
2013-08-15 12:44:51 -04:00
Daniel Larimer
e7075f6b3a
fix bugs with variant
2013-08-15 10:56:25 -04:00
Daniel Larimer
6c3b31873c
linux port
2013-08-13 05:24:41 +00:00
Daniel Larimer
1201d1c1f6
adding time_point_sec
2013-07-22 14:03:34 -04:00
Daniel Larimer
fbcdd4fa5e
various bug fixes
2013-07-06 22:07:12 -04:00
Daniel Larimer
b8e08c97b2
adding support for std::set to variant/raw io
2013-07-05 20:29:36 -04:00
Daniel Larimer
b59fe17562
Merge branch 'phoenix' of github.com:bytemaster/fc into phoenix
...
Remove fc::vector and fc::string
2013-06-27 14:45:11 -04:00
Daniel Larimer
b07aed4a22
Update use of fc::string and fc::vector.
2013-06-27 14:19:08 -04:00
Daniel Larimer
cd28770deb
Updating crypto functions.
2013-06-27 14:18:02 -04:00
Daniel Larimer
1f3e6739c6
switch to std::vector from fc::vector
2013-06-06 22:49:30 -04:00
Daniel Larimer
59a121d64b
Updating FC with changes from phoenix-int
2013-06-05 15:19:00 -04:00
