From 8076417ff654f38e172731aa9522a1ea241d06f2 Mon Sep 17 00:00:00 2001 From: debris Date: Thu, 8 Jan 2015 13:37:50 +0100 Subject: [PATCH] namespaces fixes for msvc --- mix/AssemblyDebuggerControl.cpp | 5 +++-- mix/CodeHighlighter.cpp | 4 ++-- mix/CodeModel.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mix/AssemblyDebuggerControl.cpp b/mix/AssemblyDebuggerControl.cpp index 136353dc6..2bd288a3c 100644 --- a/mix/AssemblyDebuggerControl.cpp +++ b/mix/AssemblyDebuggerControl.cpp @@ -33,6 +33,7 @@ #include "ContractCallDataEncoder.h" #include "CodeModel.h" + using namespace dev::eth; using namespace dev::mix; @@ -50,7 +51,7 @@ QString toQString(dev::u256 _value) return QString::fromStdString(s.str()); } -AssemblyDebuggerControl::AssemblyDebuggerControl(AppContext* _context): +AssemblyDebuggerControl::AssemblyDebuggerControl(dev::mix::AppContext* _context): Extension(_context, ExtensionDisplayBehavior::ModalDialog), m_running(false) { qRegisterMetaType("QVariableDefinition*"); @@ -111,7 +112,7 @@ void AssemblyDebuggerControl::debugState(QVariantMap _state) executeSequence(transactionSequence, balance); } -void AssemblyDebuggerControl::executeSequence(std::vector const& _sequence, u256 _balance) +void AssemblyDebuggerControl::executeSequence(std::vector const& _sequence, dev::u256 _balance) { if (m_running) throw (std::logic_error("debugging already running")); diff --git a/mix/CodeHighlighter.cpp b/mix/CodeHighlighter.cpp index 5c126d8e2..ab8a61ff5 100644 --- a/mix/CodeHighlighter.cpp +++ b/mix/CodeHighlighter.cpp @@ -64,7 +64,7 @@ namespace }; } -CodeHighlighter::FormatRange::FormatRange(CodeHighlighterSettings::Token _t, solidity::Location const& _location): +CodeHighlighter::FormatRange::FormatRange(CodeHighlighterSettings::Token _t, dev::solidity::Location const& _location): token(_t), start(_location.start), length(_location.end - _location.start) {} @@ -91,7 +91,7 @@ void CodeHighlighter::processSource(std::string const& _source) std::sort(m_formats.begin(), m_formats.end()); } -void CodeHighlighter::processAST(solidity::ASTNode const& _ast) +void CodeHighlighter::processAST(dev::solidity::ASTNode const& _ast) { HighlightVisitor visitor(&m_formats); _ast.accept(visitor); diff --git a/mix/CodeModel.cpp b/mix/CodeModel.cpp index 7d8b0442a..71439fa9e 100644 --- a/mix/CodeModel.cpp +++ b/mix/CodeModel.cpp @@ -48,7 +48,7 @@ CompilationResult::CompilationResult(): m_codeHighlighter(new CodeHighlighter()) {} -CompilationResult::CompilationResult(const solidity::CompilerStack& _compiler): +CompilationResult::CompilationResult(const dev::solidity::CompilerStack& _compiler): QObject(nullptr), m_successful(true), m_codeHash(qHash(QString()))