Browse Source

Warnings fixes.

Make Mix work with Qt 5.2
Minor other alterations.
cl-refactor
Gav Wood 10 years ago
parent
commit
bf8174ecee
  1. 6
      libevmcore/Assembly.cpp
  2. 3
      libsolidity/Types.h
  3. 1
      mix/AssemblyDebuggerModel.cpp
  4. 2
      mix/qml/StateDialog.qml
  5. 6
      mix/qml/StateList.qml
  6. 2
      mix/qml/TransactionDialog.qml
  7. 4
      mix/qml/main.qml

6
libevmcore/Assembly.cpp

@ -391,9 +391,9 @@ Assembly& Assembly::optimise(bool _enable)
if (matches(vr, &r.first))
{
auto rw = r.second(vr);
unsigned const vrSize = bytesRequiredBySlice(vr.begin(), vr.end());
unsigned const rwSize = bytesRequiredBySlice(rw.begin(), rw.end());
if (rwSize < vrSize || (rwSize == vrSize && popCountIncreased(vr, rw)))
unsigned const vrSizeInBytes = bytesRequiredBySlice(vr.begin(), vr.end());
unsigned const rwSizeInBytes = bytesRequiredBySlice(rw.begin(), rw.end());
if (rwSizeInBytes < vrSizeInBytes || (rwSizeInBytes == vrSizeInBytes && popCountIncreased(vr, rw)))
{
copt << vr << "matches" << AssemblyItemsConstRef(&r.first) << "becomes...";
copt << AssemblyItemsConstRef(&rw);

3
libsolidity/Types.h

@ -387,6 +387,9 @@ public:
protected:
virtual TypePointer binaryOperatorResultImpl(Token::Value _operator, TypePointer const& _this, TypePointer const& _other) const override
{
(void)_operator;
(void)_this;
(void)_other;
return TypePointer();
}
};

1
mix/AssemblyDebuggerModel.cpp

@ -74,7 +74,6 @@ DebuggingContent AssemblyDebuggerModel::executeTransaction(bytesConstRef const&
execution.go(onOp);
execution.finalize();
m_executiveState.completeMine();
DebuggingContent d;
d.returnValue = execution.out().toVector();

2
mix/qml/StateDialog.qml

@ -1,5 +1,5 @@
import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import QtQuick.Window 2.0

6
mix/qml/StateList.qml

@ -1,7 +1,7 @@
import QtQuick 2.2
import QtQuick.Controls.Styles 1.2
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Controls.Styles 1.1
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Layouts 1.1
Rectangle {

2
mix/qml/TransactionDialog.qml

@ -1,5 +1,5 @@
import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import QtQuick.Window 2.0

4
mix/qml/main.qml

@ -1,6 +1,6 @@
import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Layouts 1.1
import QtQuick.Window 2.1

Loading…
Cancel
Save