From 591c591af05f29bf42b8b162a4fcda5a9a8fae9f Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Wed, 9 May 2018 11:43:14 +0200
Subject: Do not use solAssert within libjulia

---
 libjulia/optimiser/MainFunction.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'libjulia/optimiser/MainFunction.cpp')

diff --git a/libjulia/optimiser/MainFunction.cpp b/libjulia/optimiser/MainFunction.cpp
index 0b3e674b..bcd2f178 100644
--- a/libjulia/optimiser/MainFunction.cpp
+++ b/libjulia/optimiser/MainFunction.cpp
@@ -22,11 +22,10 @@
 #include <libjulia/optimiser/MainFunction.h>
 
 #include <libjulia/optimiser/NameCollector.h>
+#include <libjulia/Exceptions.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
-#include <libsolidity/interface/Exceptions.h>
-
 #include <libdevcore/CommonData.h>
 
 using namespace std;
@@ -36,12 +35,12 @@ using namespace dev::solidity;
 
 void MainFunction::operator()(Block& _block)
 {
-	solAssert(_block.statements.size() >= 1, "");
-	solAssert(_block.statements[0].type() == typeid(Block), "");
+	assertThrow(_block.statements.size() >= 1, OptimizerException, "");
+	assertThrow(_block.statements[0].type() == typeid(Block), OptimizerException, "");
 	for (size_t i = 1; i < _block.statements.size(); ++i)
-		solAssert(_block.statements.at(i).type() == typeid(FunctionDefinition), "");
+		assertThrow(_block.statements.at(i).type() == typeid(FunctionDefinition), OptimizerException, "");
 	/// @todo this should handle scopes properly and instead of an assertion it should rename the conflicting function
-	solAssert(NameCollector(_block).names().count("main") == 0, "");
+	assertThrow(NameCollector(_block).names().count("main") == 0, OptimizerException, "");
 
 	Block& block = boost::get<Block>(_block.statements[0]);
 	FunctionDefinition main{
-- 
cgit v1.2.3