Merge pull request #5180 from ethereum/cpp-cleanup

Some C++ cleanup
This commit is contained in:
chriseth
2018-10-10 11:43:42 +02:00
committed by GitHub
13 changed files with 13 additions and 16 deletions
-1
View File
@@ -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>
+2 -2
View File
@@ -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;
-1
View File
@@ -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>
+1 -1
View File
@@ -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))
{