aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLefteris Karapetsas <lefteris@refu.co>2014-12-18 23:49:56 +0800
committerLefteris Karapetsas <lefteris@refu.co>2014-12-18 23:49:56 +0800
commit89f5b8669299ffb943a7c2fb9834e0dcb52d5572 (patch)
tree8c273f4c1ad201a48292088bf4f569a23b3ae307
parentfc981d5d799c28207d464e273524650c8a166243 (diff)
parent5dbe2f198c32c67cb0b714edf1c55fafda5c4ca2 (diff)
downloaddexon-solidity-89f5b8669299ffb943a7c2fb9834e0dcb52d5572.tar.gz
dexon-solidity-89f5b8669299ffb943a7c2fb9834e0dcb52d5572.tar.zst
dexon-solidity-89f5b8669299ffb943a7c2fb9834e0dcb52d5572.zip
Merge branch 'develop' into sol_natspecMultiline
-rw-r--r--SolidityABIJSON.cpp (renamed from solidityJSONInterfaceTest.cpp)0
-rw-r--r--SolidityCompiler.cpp (renamed from solidityCompiler.cpp)0
-rw-r--r--SolidityEndToEndTest.cpp (renamed from solidityEndToEndTest.cpp)2
-rw-r--r--SolidityExpressionCompiler.cpp (renamed from solidityExpressionCompiler.cpp)0
-rw-r--r--SolidityNameAndTypeResolution.cpp (renamed from solidityNameAndTypeResolution.cpp)0
-rw-r--r--SolidityNatspecJSON.cpp (renamed from solidityNatspecJSON.cpp)0
-rw-r--r--SolidityOptimizer.cpp (renamed from solidityOptimizerTest.cpp)2
-rw-r--r--SolidityParser.cpp (renamed from solidityParser.cpp)0
-rw-r--r--SolidityScanner.cpp (renamed from solidityScanner.cpp)0
9 files changed, 2 insertions, 2 deletions
diff --git a/solidityJSONInterfaceTest.cpp b/SolidityABIJSON.cpp
index c734009c..c734009c 100644
--- a/solidityJSONInterfaceTest.cpp
+++ b/SolidityABIJSON.cpp
diff --git a/solidityCompiler.cpp b/SolidityCompiler.cpp
index 385a3e57..385a3e57 100644
--- a/solidityCompiler.cpp
+++ b/SolidityCompiler.cpp
diff --git a/solidityEndToEndTest.cpp b/SolidityEndToEndTest.cpp
index 26f5528a..aa74f818 100644
--- a/solidityEndToEndTest.cpp
+++ b/SolidityEndToEndTest.cpp
@@ -36,7 +36,7 @@ namespace solidity
namespace test
{
-BOOST_FIXTURE_TEST_SUITE(SolidityCompilerEndToEndTest, ExecutionFramework)
+BOOST_FIXTURE_TEST_SUITE(SolidityEndToEndTest, ExecutionFramework)
BOOST_AUTO_TEST_CASE(smoke_test)
{
diff --git a/solidityExpressionCompiler.cpp b/SolidityExpressionCompiler.cpp
index 9c375418..9c375418 100644
--- a/solidityExpressionCompiler.cpp
+++ b/SolidityExpressionCompiler.cpp
diff --git a/solidityNameAndTypeResolution.cpp b/SolidityNameAndTypeResolution.cpp
index 0bda0a1f..0bda0a1f 100644
--- a/solidityNameAndTypeResolution.cpp
+++ b/SolidityNameAndTypeResolution.cpp
diff --git a/solidityNatspecJSON.cpp b/SolidityNatspecJSON.cpp
index 5b48a67c..5b48a67c 100644
--- a/solidityNatspecJSON.cpp
+++ b/SolidityNatspecJSON.cpp
diff --git a/solidityOptimizerTest.cpp b/SolidityOptimizer.cpp
index 388e0579..ef5c6f9b 100644
--- a/solidityOptimizerTest.cpp
+++ b/SolidityOptimizer.cpp
@@ -71,7 +71,7 @@ protected:
Address m_nonOptimizedContract;
};
-BOOST_FIXTURE_TEST_SUITE(SolidityOptimizerTest, OptimizerTestFramework)
+BOOST_FIXTURE_TEST_SUITE(SolidityOptimizer, OptimizerTestFramework)
BOOST_AUTO_TEST_CASE(smoke_test)
{
diff --git a/solidityParser.cpp b/SolidityParser.cpp
index f978cdd9..f978cdd9 100644
--- a/solidityParser.cpp
+++ b/SolidityParser.cpp
diff --git a/solidityScanner.cpp b/SolidityScanner.cpp
index 355ea9e2..355ea9e2 100644
--- a/solidityScanner.cpp
+++ b/SolidityScanner.cpp