diff options
| author | chriseth <chris@ethereum.org> | 2017-08-09 20:53:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 20:53:24 +0800 |
| commit | 4b0ea1fba071a0c874c592912c8eaa5706847487 (patch) | |
| tree | 7312f760bac4bdb45e8e8def4f54c2aef0428bf3 | |
| parent | 81b1ecb7be4218f3d5b6e5a5376bba73d4caf146 (diff) | |
| parent | 3e2f0b589d384ff264bbbb05bb5cbe003a63f936 (diff) | |
| download | dexon-solidity-4b0ea1fba071a0c874c592912c8eaa5706847487.tar.gz dexon-solidity-4b0ea1fba071a0c874c592912c8eaa5706847487.tar.zst dexon-solidity-4b0ea1fba071a0c874c592912c8eaa5706847487.zip | |
Merge pull request #2718 from ethereum/globals
Remove some global symbols
| -rw-r--r-- | solc/jsonCompiler.cpp | 5 | ||||
| -rw-r--r-- | solc/main.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index de797b3c..ab928ac0 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -38,6 +38,9 @@ extern "C" { typedef void (*CStyleReadFileCallback)(char const* _path, char** o_contents, char** o_error); } +namespace +{ + ReadFile::Callback wrapReadCallback(CStyleReadFileCallback _readCallback = nullptr) { ReadFile::Callback readCallback; @@ -260,6 +263,8 @@ string compileStandardInternal(string const& _input, CStyleReadFileCallback _rea return compiler.compile(_input); } +} + static string s_outputBuffer; extern "C" diff --git a/solc/main.cpp b/solc/main.cpp index c61da6e9..6d559542 100644 --- a/solc/main.cpp +++ b/solc/main.cpp @@ -40,7 +40,7 @@ specified default locale if it is valid, and if not then it will modify the environment the process is running in to use a sensible default. This also means that users do not need to install language packs for their OS. */ -void setDefaultOrCLocale() +static void setDefaultOrCLocale() { #if __unix__ if (!std::setlocale(LC_ALL, "")) |