diff options
author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2014-12-11 19:08:51 +0800 |
---|---|---|
committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2014-12-11 19:08:51 +0800 |
commit | bea34ab0730c483e9b9b2465ea3b2e1b8186ef01 (patch) | |
tree | 1d31a694e3faa5856acc5a54b3f620703a70f2bf /GlobalContext.cpp | |
parent | f86187a6e804761d5eb9e3e2bc0fc6c9c1976b68 (diff) | |
parent | 222790ffab92aa1c18d27c2c8550221475654bee (diff) | |
download | dexon-solidity-bea34ab0730c483e9b9b2465ea3b2e1b8186ef01.tar dexon-solidity-bea34ab0730c483e9b9b2465ea3b2e1b8186ef01.tar.gz dexon-solidity-bea34ab0730c483e9b9b2465ea3b2e1b8186ef01.tar.bz2 dexon-solidity-bea34ab0730c483e9b9b2465ea3b2e1b8186ef01.tar.lz dexon-solidity-bea34ab0730c483e9b9b2465ea3b2e1b8186ef01.tar.xz dexon-solidity-bea34ab0730c483e9b9b2465ea3b2e1b8186ef01.tar.zst dexon-solidity-bea34ab0730c483e9b9b2465ea3b2e1b8186ef01.zip |
Merge branch 'macox_fixes' into build_enhancement
Conflicts:
test/solidityNatspecJSON.cpp
Diffstat (limited to 'GlobalContext.cpp')
-rw-r--r-- | GlobalContext.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/GlobalContext.cpp b/GlobalContext.cpp index 2d384a15..f4805b1f 100644 --- a/GlobalContext.cpp +++ b/GlobalContext.cpp @@ -33,7 +33,7 @@ namespace solidity { GlobalContext::GlobalContext(): -m_magicVariables(vector<shared_ptr<MagicVariableDeclaration>>{make_shared<MagicVariableDeclaration>("block", make_shared<MagicType>(MagicType::Kind::BLOCK)), +m_magicVariables(vector<shared_ptr<MagicVariableDeclaration const>>{make_shared<MagicVariableDeclaration>("block", make_shared<MagicType>(MagicType::Kind::BLOCK)), make_shared<MagicVariableDeclaration>("msg", make_shared<MagicType>(MagicType::Kind::MSG)), make_shared<MagicVariableDeclaration>("tx", make_shared<MagicType>(MagicType::Kind::TX)), make_shared<MagicVariableDeclaration>("suicide", @@ -68,16 +68,16 @@ void GlobalContext::setCurrentContract(ContractDefinition const& _contract) m_currentContract = &_contract; } -vector<Declaration*> GlobalContext::getDeclarations() const +vector<Declaration const*> GlobalContext::getDeclarations() const { - vector<Declaration*> declarations; + vector<Declaration const*> declarations; declarations.reserve(m_magicVariables.size() + 1); - for (ASTPointer<Declaration> const& variable: m_magicVariables) + for (ASTPointer<Declaration const> const& variable: m_magicVariables) declarations.push_back(variable.get()); return declarations; } -MagicVariableDeclaration* GlobalContext::getCurrentThis() const +MagicVariableDeclaration const* GlobalContext::getCurrentThis() const { if (!m_thisPointer[m_currentContract]) m_thisPointer[m_currentContract] = make_shared<MagicVariableDeclaration>( |