diff options
author | chriseth <c@ethdev.com> | 2015-04-07 23:08:49 +0800 |
---|---|---|
committer | chriseth <c@ethdev.com> | 2015-04-07 23:08:49 +0800 |
commit | 158795e48f4285d713b11f78cdd04de8c6d1f667 (patch) | |
tree | a4194b4dfbac5bcbed9dbd6290e156c945fff56b /Compiler.h | |
parent | ff4d2cc7dc035a248de4698c2c59a8df14db2e82 (diff) | |
parent | 8e19eea7d5d6cd4bffa03f8617023a74268de608 (diff) | |
download | dexon-solidity-158795e48f4285d713b11f78cdd04de8c6d1f667.tar dexon-solidity-158795e48f4285d713b11f78cdd04de8c6d1f667.tar.gz dexon-solidity-158795e48f4285d713b11f78cdd04de8c6d1f667.tar.bz2 dexon-solidity-158795e48f4285d713b11f78cdd04de8c6d1f667.tar.lz dexon-solidity-158795e48f4285d713b11f78cdd04de8c6d1f667.tar.xz dexon-solidity-158795e48f4285d713b11f78cdd04de8c6d1f667.tar.zst dexon-solidity-158795e48f4285d713b11f78cdd04de8c6d1f667.zip |
Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
Diffstat (limited to 'Compiler.h')
-rw-r--r-- | Compiler.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -94,8 +94,8 @@ private: std::vector<eth::AssemblyItem> m_continueTags; ///< tag to jump to for a "continue" statement eth::AssemblyItem m_returnTag; ///< tag to jump to for a "return" statement unsigned m_modifierDepth = 0; - FunctionDefinition const* m_currentFunction; - unsigned m_stackCleanupForReturn; ///< this number of stack elements need to be removed before jump to m_returnTag + FunctionDefinition const* m_currentFunction = nullptr; + unsigned m_stackCleanupForReturn = 0; ///< this number of stack elements need to be removed before jump to m_returnTag // arguments for base constructors, filled in derived-to-base order std::map<FunctionDefinition const*, std::vector<ASTPointer<Expression>> const*> m_baseArguments; }; |