diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2014-10-24 23:00:29 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2014-10-24 23:00:29 +0800 |
| commit | e262ebf49631710a5905816cbf047b3c03921234 (patch) | |
| tree | db8d4ae5dd154b936f47892d39f85985bcaa74d3 /TestHelperCrypto.h | |
| parent | ac3ac9095a6f949f10da1eb15bc4990b611d4cce (diff) | |
| parent | 08c45c85b49edad8451a03df4a31363f216db97c (diff) | |
| download | dexon-solidity-e262ebf49631710a5905816cbf047b3c03921234.tar.gz dexon-solidity-e262ebf49631710a5905816cbf047b3c03921234.tar.zst dexon-solidity-e262ebf49631710a5905816cbf047b3c03921234.zip | |
Merge branch 'develop' into mk_jsonrpc
Diffstat (limited to 'TestHelperCrypto.h')
| -rw-r--r-- | TestHelperCrypto.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/TestHelperCrypto.h b/TestHelperCrypto.h index cdc22ec3..01e97c21 100644 --- a/TestHelperCrypto.h +++ b/TestHelperCrypto.h @@ -21,23 +21,7 @@ #pragma once -//#include <ostream> - -#pragma warning(push) -#pragma warning(disable:4100 4244) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#pragma GCC diagnostic ignored "-Wunused-parameter" -#pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" -#pragma GCC diagnostic ignored "-Wextra" -#include <eccrypto.h> -#include <ecp.h> -#include <files.h> -#include <osrng.h> -#include <oids.h> -#pragma warning(pop) -#pragma GCC diagnostic pop +#include <libdevcrypto/CryptoPP.h> using namespace std; using namespace CryptoPP; |