diff options
| author | Jeff Garzik <jeff@garzik.org> | 2011-05-09 14:00:14 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2011-05-09 14:00:14 -0400 |
| commit | b17be7e14b4a62b7935c75fe7e7645e736fd68d2 (patch) | |
| tree | be44c7310683df72aeb5781ec74a85451206cfbc /src/cryptopp/stdcpp.h | |
| parent | c0430f42b868dbf996a416d3a9d81d1c8c07e47c (diff) | |
| parent | 84c3fb07b0b8199c7f85c5de280e7100bad0786f (diff) | |
Manual merge of jaromil's source tree reorg commit.
Conflicts:
src/sha256.cpp
Diffstat (limited to 'src/cryptopp/stdcpp.h')
| -rw-r--r-- | src/cryptopp/stdcpp.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/cryptopp/stdcpp.h b/src/cryptopp/stdcpp.h new file mode 100644 index 0000000000..9a468ab61e --- /dev/null +++ b/src/cryptopp/stdcpp.h @@ -0,0 +1,27 @@ +#ifndef CRYPTOPP_STDCPP_H +#define CRYPTOPP_STDCPP_H + +#include <stddef.h> +#include <assert.h> +#include <limits.h> +#include <memory> +#include <string> +#include <exception> +#include <typeinfo> + + +#ifdef _MSC_VER +#include <string.h> // CodeWarrior doesn't have memory.h +#include <algorithm> +#include <map> +#include <vector> + +// re-disable this +#pragma warning(disable: 4231) +#endif + +#if defined(_MSC_VER) && defined(_CRTAPI1) +#define CRYPTOPP_MSVCRT6 +#endif + +#endif |