diff options
author | Gav Wood <i@gavwood.com> | 2015-01-08 03:23:59 +0800 |
---|---|---|
committer | Gav Wood <i@gavwood.com> | 2015-01-08 03:23:59 +0800 |
commit | d18fa27b6a48540298e835ad324152566586c65c (patch) | |
tree | f4e018006495e4e8ad4f8e4cc10988b3cdc68ab7 | |
parent | 9be58474729c918fb40e4f264d25d74d7a162607 (diff) | |
parent | 1311633a8631c8df190519f01c3cdc73b46aa2b8 (diff) | |
download | dexon-solidity-d18fa27b6a48540298e835ad324152566586c65c.tar.gz dexon-solidity-d18fa27b6a48540298e835ad324152566586c65c.tar.zst dexon-solidity-d18fa27b6a48540298e835ad324152566586c65c.zip |
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
-rw-r--r-- | Compiler.h | 2 | ||||
-rw-r--r-- | CompilerStack.h | 2 | ||||
-rw-r--r-- | ExpressionCompiler.h | 6 | ||||
-rw-r--r-- | GlobalContext.h | 2 | ||||
-rw-r--r-- | NameAndTypeResolver.h | 2 |
5 files changed, 7 insertions, 7 deletions
@@ -30,7 +30,7 @@ namespace solidity { class Compiler: private ASTConstVisitor { public: - explicit Compiler(bool _optimize = false): m_optimize(_optimize), m_returnTag(m_context.newTag()) {} + explicit Compiler(bool _optimize = false): m_optimize(_optimize), m_context(), m_returnTag(m_context.newTag()) {} void compileContract(ContractDefinition const& _contract, std::vector<MagicVariableDeclaration const*> const& _magicGlobals, std::map<ContractDefinition const*, bytes const*> const& _contracts); diff --git a/CompilerStack.h b/CompilerStack.h index 358c8fb7..e7143b7b 100644 --- a/CompilerStack.h +++ b/CompilerStack.h @@ -113,7 +113,7 @@ private: struct Contract { - ContractDefinition const* contract; + ContractDefinition const* contract = nullptr; std::shared_ptr<Compiler> compiler; bytes bytecode; std::shared_ptr<InterfaceHandler> interfaceHandler; diff --git a/ExpressionCompiler.h b/ExpressionCompiler.h index 67b16aac..c0ee4ab4 100644 --- a/ExpressionCompiler.h +++ b/ExpressionCompiler.h @@ -146,12 +146,12 @@ private: private: CompilerContext* m_context; - LValueType m_type; + LValueType m_type = NONE; /// If m_type is STACK, this is base stack offset (@see /// CompilerContext::getBaseStackOffsetOfVariable) of a local variable. - unsigned m_baseStackOffset; + unsigned m_baseStackOffset = 0; /// Size of the value of this lvalue on the stack. - unsigned m_stackSize; + unsigned m_stackSize = 0; }; bool m_optimize; diff --git a/GlobalContext.h b/GlobalContext.h index 50a21f70..c6e35f50 100644 --- a/GlobalContext.h +++ b/GlobalContext.h @@ -56,7 +56,7 @@ public: private: std::vector<std::shared_ptr<MagicVariableDeclaration const>> m_magicVariables; - ContractDefinition const* m_currentContract; + ContractDefinition const* m_currentContract = nullptr; std::map<ContractDefinition const*, std::shared_ptr<MagicVariableDeclaration const>> mutable m_thisPointer; }; diff --git a/NameAndTypeResolver.h b/NameAndTypeResolver.h index 23ac5fe7..1032a87c 100644 --- a/NameAndTypeResolver.h +++ b/NameAndTypeResolver.h @@ -69,7 +69,7 @@ private: /// not contain code. std::map<ASTNode const*, DeclarationContainer> m_scopes; - DeclarationContainer* m_currentScope; + DeclarationContainer* m_currentScope = nullptr; }; /** |