aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-10-10 17:43:42 +0800
committerGitHub <noreply@github.com>2018-10-10 17:43:42 +0800
commit06200b4b64c911ea2e0b12076e0fa02093dacbf8 (patch)
tree5465e3be065998e506145d8e7272cc783d185427 /test
parentf6f0cecc2f64f4fcda3da467bbe306b5859729aa (diff)
parent6c3d12d85bc7977817e8dc1c5bd0af4b29406b58 (diff)
downloaddexon-solidity-06200b4b64c911ea2e0b12076e0fa02093dacbf8.tar.gz
dexon-solidity-06200b4b64c911ea2e0b12076e0fa02093dacbf8.tar.zst
dexon-solidity-06200b4b64c911ea2e0b12076e0fa02093dacbf8.zip
Merge pull request #5180 from ethereum/cpp-cleanup
Some C++ cleanup
Diffstat (limited to 'test')
-rw-r--r--test/libsolidity/ASTJSONTest.cpp1
-rw-r--r--test/libsolidity/LibSolc.cpp4
-rw-r--r--test/libsolidity/SyntaxTest.cpp1
-rw-r--r--test/tools/fuzzer.cpp2
4 files changed, 3 insertions, 5 deletions
diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index 05839c1f..be482d99 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -22,7 +22,6 @@
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/throw_exception.hpp>
-#include <cctype>
#include <fstream>
#include <memory>
#include <stdexcept>
diff --git a/test/libsolidity/LibSolc.cpp b/test/libsolidity/LibSolc.cpp
index 61e5ebba..94fed7e8 100644
--- a/test/libsolidity/LibSolc.cpp
+++ b/test/libsolidity/LibSolc.cpp
@@ -52,7 +52,7 @@ Json::Value compileMulti(string const& _input, bool _callback)
{
string output(
_callback ?
- compileJSONCallback(_input.c_str(), dev::test::Options::get().optimize, NULL) :
+ compileJSONCallback(_input.c_str(), dev::test::Options::get().optimize, nullptr) :
compileJSONMulti(_input.c_str(), dev::test::Options::get().optimize)
);
Json::Value ret;
@@ -62,7 +62,7 @@ Json::Value compileMulti(string const& _input, bool _callback)
Json::Value compile(string const& _input)
{
- string output(compileStandard(_input.c_str(), NULL));
+ string output(compileStandard(_input.c_str(), nullptr));
Json::Value ret;
BOOST_REQUIRE(jsonParseStrict(output, ret));
return ret;
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index 1de42300..91d1681f 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -20,7 +20,6 @@
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/throw_exception.hpp>
-#include <cctype>
#include <fstream>
#include <memory>
#include <stdexcept>
diff --git a/test/tools/fuzzer.cpp b/test/tools/fuzzer.cpp
index ce4b721f..f7b42b25 100644
--- a/test/tools/fuzzer.cpp
+++ b/test/tools/fuzzer.cpp
@@ -86,7 +86,7 @@ void testConstantOptimizer()
void runCompiler(string input)
{
- string outputString(compileStandard(input.c_str(), NULL));
+ string outputString(compileStandard(input.c_str(), nullptr));
Json::Value output;
if (!jsonParseStrict(outputString, output))
{