Eric Frias
0e6e86f273
Make FC's CMakeLists.txt provide a list of required DLLs to projects that use it
2014-03-14 14:11:56 -04:00
Daniel Larimer
d3c2f60fe0
adding extra operators
2014-03-13 20:04:47 -04:00
Daniel Larimer
b83a49298e
adding extra to_string
2014-03-11 11:29:29 -04:00
Daniel Larimer
4ed7659b2b
Merge branch 'phoenix' of github.com:InvictusInnovations/fc into phoenix
2014-03-10 22:23:19 -04:00
Daniel Larimer
a7b579e4e8
adding api helper
2014-03-10 22:22:31 -04:00
Eric Frias
e04d544016
Remove erroneous assert in fc::thread_d::check_for_timeouts()
...
I believe this assert was being triggered when the only task on
a thread did a fc::usleep (it might only have been when the
sleep was of very short duration).
2014-03-10 17:37:38 -04:00
Daniel Larimer
e3b43be2e7
Merge pull request #18 from HardFork/gitignore
...
add to gitignore
2014-03-09 23:42:09 -04:00
Tzadik Vanderhoof
4c8b63f834
ignores
2014-03-09 22:34:50 -04:00
Daniel Larimer
0fbe912e28
Merge pull request #16 from HackFisher/patch-1
...
This should be a typo, fix it.
2014-03-09 19:16:29 -04:00
HackFisher
8b73226312
This should be a typo, fix it.
...
move ">" before #endif
2014-03-09 16:18:00 +08:00
Eric Frias
f98a0d0623
Switch exception handling in win32 to /EHsc
2014-03-08 18:52:18 -05:00
Eric Frias
fdbaf88e5e
Provide a way to intercept Win32 structured exceptions in async tasks
...
Something about the stacks created by boost::context prevents global structured exception handlers
from being called. This allows the user to register a handler which will be called when there
is an unhandled structured exception in async task.
2014-03-08 18:48:19 -05:00
vogel76
07ba2d6d95
[BW]: [Fix] Include directories shall be specified through target_include_directories not just include_directories call.
2014-03-08 03:20:11 +01:00
vogel76
f5249dc2d6
[BW]: [Ign] Workaround for missing template aliasing feature in VS 2012 to make bts_wallet compiling.
2014-03-04 18:24:15 +01:00
vogel76
163be8a6d0
[BW]: [NIP] Added public_key::to_base58 text conversion to simplify contact display_name generation at bts side.
2014-03-03 11:31:08 +01:00
Daniel Larimer
ecba7c5076
Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix
2014-02-27 23:35:27 -05:00
Daniel Larimer
4b2d221c05
fix ecc point seralization
2014-02-27 23:35:24 -05:00
dnotestein
503b9033e8
fix infinite loop in windows when trying to read json variant from empty file
2014-02-27 21:56:46 -05:00
Daniel Larimer
5f36e9acac
Merge pull request #15 from BrownBear2/phoenix
...
added missing files: romix.[hc]pp
2014-02-27 12:40:08 -05:00
BrownBear
46bfcfe74d
added missing files: romix.[hc]pp
2014-02-27 12:37:23 +01:00
dnotestein
160b84487b
Disabled armory import code for now to get Bitshares and fc compiling.
2014-02-26 17:24:40 -05:00
dnotestein
71759891f1
Merge pull request #9 from BrownBear2/phoenix
...
added romix kdf and cfb for aes
2014-02-26 15:44:13 -05:00
BrownBear2
49ff83922b
added romix kdf and cfb for aes
2014-02-26 12:05:17 +01:00
dnotestein
90c0dea523
Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix
2014-02-25 09:23:25 -05:00
Daniel Larimer
6bf740c28f
Merge pull request #14 from tzadikv/phoenix
...
Adding binary constructor for hash.
2014-02-25 01:20:04 -05:00
Tzadik Vanderhoof
0761d32d01
safer sha256 binary constructor
2014-02-24 02:08:48 -05:00
Tzadik Vanderhoof
57769e4df9
BSX-21 Import Bitcoin Private Key from String
2014-02-24 00:47:00 -05:00
dnotestein
435e6b9926
Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix
2014-02-22 21:44:38 -05:00
dnotestein
63c6b2a02b
Merge pull request #13 from wackou/fix_macos_compile
...
Fix compilation on mac os with clang/libc++
2014-02-22 16:29:22 -05:00
Nicolas Wack
30ee9868e6
Fix compilation on mac os with clang/libc++
2014-02-22 19:27:53 +01:00
dnotestein
7df77777f1
Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix
2014-02-21 19:55:39 -05:00
Daniel Larimer
b203bfdab5
Merge pull request #12 from batmaninpink/osx
...
fix scrypt-jane OS X compile - again - revert the last changes and disab...
2014-02-21 16:32:46 -05:00
batmaninpink
cd0f0a5797
fix scrypt-jane OS X compile - again - revert the last changes and disable all assembler or we run in to problems with older LLVM versions
2014-02-21 22:24:04 +01:00
Daniel Larimer
c7baf276a1
scrypt code does not compile with clang
2014-02-21 15:10:34 -05:00
Daniel Larimer
afe9874cba
Merge pull request #11 from batmaninpink/osx
...
fix scrypt-jane OS X compile
2014-02-21 15:06:46 -05:00
batmaninpink
1b8b4da925
fix scrypt-jane OS X compile
2014-02-21 20:57:04 +01:00
dnotestein
bfb7c0e87b
Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix
2014-02-21 10:58:14 -05:00
Daniel Larimer
cfb2356ab2
remove script which doesn't build on OS X
2014-02-20 22:00:10 -05:00
dnotestein
ba9ad0e6e9
Move bad global include that was only included for Linux/Apple to be a private include that works for windows also (so that fc compiles under windows again).
2014-02-20 18:14:04 -05:00
Daniel Larimer
4a786fe6d5
Merge pull request #10 from batmaninpink/multiwallet
...
added support for scrypt key derivation needed for multibit wallet support
2014-02-19 14:05:50 -05:00
batmaninpink
1e509fa1a9
added support for scrypt key derivation needed for multibit wallet support
2014-02-18 08:59:17 +01:00
vogel76
1a461c08a5
[BW]: [Fix] Added local version of FindBoost.cmake to avoid building problems on Ubuntu which doesn't use patched version of cmake in the distro cmake package. Here is point to cmake bugreport:
...
http://public.kitware.com/Bug/view.php?id=14720
2014-02-17 12:04:05 +01:00
Daniel Larimer
5178ca8c1a
added api methods to encryption functions
2014-02-16 21:28:55 -05:00
Yuvaraj
a5c8a07dc6
App dir for Linux is the home directory.
2014-02-16 13:21:14 +05:30
Daniel Larimer
9b2190aa63
Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix
2014-02-16 01:17:35 -05:00
Daniel Larimer
0843aa6652
adding raw serialization for unordered_map
2014-02-16 01:17:31 -05:00
dnotestein
5b103e5754
Add get_typename for std::vector<char>
2014-02-15 22:48:09 -05:00
dnotestein
32b7b02b15
Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix
2014-02-15 17:34:53 -05:00
Daniel Larimer
2743b56b56
added utility to hide console echo for entering passwords
2014-02-15 14:06:35 -05:00
Daniel Larimer
ded475f45a
upgraded to boost::signals2 because signals is deprecated
2014-02-15 01:52:19 -05:00