diff options
| author | chriseth <chris@ethereum.org> | 2019-01-22 20:49:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 20:49:41 +0800 |
| commit | 10d17f245839f208ec5085309022a32cd2502f55 (patch) | |
| tree | b2c9f68980d0d418cd6f511e9f3f3f71369abe25 /solc | |
| parent | 1df8f40cd2fd7b47698d847907b8ca7b47eb488d (diff) | |
| parent | 0ecafe032a84cb6960545dd7f18733430c1f782d (diff) | |
| download | dexon-solidity-10d17f245839f208ec5085309022a32cd2502f55.tar.gz dexon-solidity-10d17f245839f208ec5085309022a32cd2502f55.tar.zst dexon-solidity-10d17f245839f208ec5085309022a32cd2502f55.zip | |
Merge pull request #5836 from ethereum/develop
Merge develop into release for 0.5.3.
Diffstat (limited to 'solc')
| -rw-r--r-- | solc/CommandLineInterface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index bda1b78a..4bf24901 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -731,7 +731,7 @@ bool CommandLineInterface::processInput() try { auto path = boost::filesystem::path(_path); - auto canonicalPath = weaklyCanonicalFilesystemPath(path); + auto canonicalPath = boost::filesystem::weakly_canonical(path); bool isAllowed = false; for (auto const& allowedDir: m_allowedDirectories) { |