Merge pull request #5635 from ethereum/cpp-default-ctors

[RFC] C++ `=default` ctors/dtors and the use of non-static member initializer syntax.

9 files changed, 23 insertions, 30 deletions

diff --git a/test/TestCase.h b/test/TestCase.h
index 3c05ae4e..27320009 100644
--- a/test/TestCase.h
+++ b/test/TestCase.h
@@ -36,7 +36,7 @@ class TestCase
 public:
 	using TestCaseCreator = std::unique_ptr<TestCase>(*)(std::string const&);
 
-	virtual ~TestCase() {}
+	virtual ~TestCase() = default;
 
 	/// Runs the test case.
 	/// Outputs error messages to @arg _stream. Each line of output is prefixed with @arg _linePrefix.
diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
index 6976755f..4e9040b9 100644
--- a/test/libevmasm/Assembler.cpp
+++ b/test/libevmasm/Assembler.cpp
@@ -56,11 +56,11 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 {
 	Assembly _assembly;
 	auto root_asm = make_shared<CharStream>("", "root.asm");
-	_assembly.setSourceLocation(SourceLocation(1, 3, root_asm));
+	_assembly.setSourceLocation({1, 3, root_asm});
 
 	Assembly _subAsm;
 	auto sub_asm = make_shared<CharStream>("", "sub.asm");
-	_subAsm.setSourceLocation(SourceLocation(6, 8, sub_asm));
+	_subAsm.setSourceLocation({6, 8, sub_asm});
 	_subAsm.append(Instruction::INVALID);
 	shared_ptr<Assembly> _subAsmPtr = make_shared<Assembly>(_subAsm);
 
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index 7d102948..c65d28d3 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -53,7 +53,7 @@ namespace
 		// add dummy locations to each item so that we can check that they are not deleted
 		AssemblyItems input = _input;
 		for (AssemblyItem& item: input)
-			item.setLocation(SourceLocation(1, 3, nullptr));
+			item.setLocation({1, 3, nullptr});
 		return input;
 	}
 
diff --git a/test/liblangutil/SourceLocation.cpp b/test/liblangutil/SourceLocation.cpp
index ef4103da..5bdce88e 100644
--- a/test/liblangutil/SourceLocation.cpp
+++ b/test/liblangutil/SourceLocation.cpp
@@ -37,12 +37,12 @@ BOOST_AUTO_TEST_CASE(test_fail)
 	auto const sourceA = std::make_shared<CharStream>("", "sourceA");
 	auto const sourceB = std::make_shared<CharStream>("", "sourceB");
 
-	BOOST_CHECK(SourceLocation() == SourceLocation());
-	BOOST_CHECK(SourceLocation(0, 3, sourceA) != SourceLocation(0, 3, sourceB));
-	BOOST_CHECK(SourceLocation(0, 3, source) == SourceLocation(0, 3, source));
-	BOOST_CHECK(SourceLocation(3, 7, source).contains(SourceLocation(4, 6, source)));
-	BOOST_CHECK(!SourceLocation(3, 7, sourceA).contains(SourceLocation(4, 6, sourceB)));
-	BOOST_CHECK(SourceLocation(3, 7, sourceA) < SourceLocation(4, 6, sourceB));
+	BOOST_CHECK(SourceLocation{} == SourceLocation{});
+	BOOST_CHECK((SourceLocation{0, 3, sourceA} != SourceLocation{0, 3, sourceB}));
+	BOOST_CHECK((SourceLocation{0, 3, source} == SourceLocation{0, 3, source}));
+	BOOST_CHECK((SourceLocation{3, 7, source}.contains(SourceLocation{4, 6, source})));
+	BOOST_CHECK((!SourceLocation{3, 7, sourceA}.contains(SourceLocation{4, 6, sourceB})));
+	BOOST_CHECK((SourceLocation{3, 7, sourceA} < SourceLocation{4, 6, sourceB}));
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
index 5d8c89a4..baa9bff1 100644
--- a/test/libsolidity/Assembly.cpp
+++ b/test/libsolidity/Assembly.cpp
@@ -165,19 +165,19 @@ BOOST_AUTO_TEST_CASE(location_test)
 	auto codegenCharStream = make_shared<CharStream>("", "--CODEGEN--");
 
 	vector<SourceLocation> locations =
-		vector<SourceLocation>(4, SourceLocation(2, 82, sourceCode)) +
-		vector<SourceLocation>(1, SourceLocation(8, 17, codegenCharStream)) +
-		vector<SourceLocation>(3, SourceLocation(5, 7, codegenCharStream)) +
-		vector<SourceLocation>(1, SourceLocation(30, 31, codegenCharStream)) +
-		vector<SourceLocation>(1, SourceLocation(27, 28, codegenCharStream)) +
-		vector<SourceLocation>(1, SourceLocation(20, 32, codegenCharStream)) +
-		vector<SourceLocation>(1, SourceLocation(5, 7, codegenCharStream)) +
-		vector<SourceLocation>(hasShifts ? 19 : 20, SourceLocation(2, 82, sourceCode)) +
-		vector<SourceLocation>(24, SourceLocation(20, 79, sourceCode)) +
-		vector<SourceLocation>(1, SourceLocation(49, 58, sourceCode)) +
-		vector<SourceLocation>(1, SourceLocation(72, 74, sourceCode)) +
-		vector<SourceLocation>(2, SourceLocation(65, 74, sourceCode)) +
-		vector<SourceLocation>(2, SourceLocation(20, 79, sourceCode));
+		vector<SourceLocation>(4, SourceLocation{2, 82, sourceCode}) +
+		vector<SourceLocation>(1, SourceLocation{8, 17, codegenCharStream}) +
+		vector<SourceLocation>(3, SourceLocation{5, 7, codegenCharStream}) +
+		vector<SourceLocation>(1, SourceLocation{30, 31, codegenCharStream}) +
+		vector<SourceLocation>(1, SourceLocation{27, 28, codegenCharStream}) +
+		vector<SourceLocation>(1, SourceLocation{20, 32, codegenCharStream}) +
+		vector<SourceLocation>(1, SourceLocation{5, 7, codegenCharStream}) +
+		vector<SourceLocation>(hasShifts ? 19 : 20, SourceLocation{2, 82, sourceCode}) +
+		vector<SourceLocation>(24, SourceLocation{20, 79, sourceCode}) +
+		vector<SourceLocation>(1, SourceLocation{49, 58, sourceCode}) +
+		vector<SourceLocation>(1, SourceLocation{72, 74, sourceCode}) +
+		vector<SourceLocation>(2, SourceLocation{65, 74, sourceCode}) +
+		vector<SourceLocation>(2, SourceLocation{20, 79, sourceCode});
 	checkAssemblyLocations(items, locations);
 }
 
diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
index 12c22604..d765d440 100644
--- a/test/libsolidity/GasMeter.cpp
+++ b/test/libsolidity/GasMeter.cpp
@@ -44,7 +44,6 @@ namespace test
 class GasMeterTestFramework: public SolidityExecutionFramework
 {
 public:
-	GasMeterTestFramework() { }
 	void compile(string const& _sourceCode)
 	{
 		m_compiler.reset(false);
diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp
index a8a67bca..63f2b3a6 100644
--- a/test/libsolidity/SolidityABIJSON.cpp
+++ b/test/libsolidity/SolidityABIJSON.cpp
@@ -38,8 +38,6 @@ namespace test
 class JSONInterfaceChecker
 {
 public:
-	JSONInterfaceChecker(): m_compilerStack() {}
-
 	void checkInterface(std::string const& _code, std::string const& _contractName, std::string const& _expectedInterfaceString)
 	{
 		m_compilerStack.reset(false);
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index d930f697..000a7938 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -39,8 +39,6 @@ namespace test
 class DocumentationChecker
 {
 public:
-	DocumentationChecker(): m_compilerStack() {}
-
 	void checkNatspec(
 		std::string const& _code,
 		std::string const& _contractName,
diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index f925d36e..b5ce6f2a 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -45,8 +45,6 @@ namespace test
 class OptimizerTestFramework: public SolidityExecutionFramework
 {
 public:
-	OptimizerTestFramework() { }
-
 	bytes const& compileAndRunWithOptimizer(
 		std::string const& _sourceCode,
 		u256 const& _value = 0,