diff options
| author | chriseth <chris@ethereum.org> | 2016-09-01 07:16:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-01 07:16:59 +0800 |
| commit | 4a26adfb7d4e962de094f4c6f02139181fac1699 (patch) | |
| tree | aa99e555baaa3b49421a4fc064410a63839109b1 | |
| parent | 52d9f897126394dcc7388277d4fbd3ef7b4df38a (diff) | |
| parent | 9c3fae823fa5bd2fcf0c4cf651859270c132bb84 (diff) | |
| download | dexon-solidity-4a26adfb7d4e962de094f4c6f02139181fac1699.tar dexon-solidity-4a26adfb7d4e962de094f4c6f02139181fac1699.tar.gz dexon-solidity-4a26adfb7d4e962de094f4c6f02139181fac1699.tar.bz2 dexon-solidity-4a26adfb7d4e962de094f4c6f02139181fac1699.tar.lz dexon-solidity-4a26adfb7d4e962de094f4c6f02139181fac1699.tar.xz dexon-solidity-4a26adfb7d4e962de094f4c6f02139181fac1699.tar.zst dexon-solidity-4a26adfb7d4e962de094f4c6f02139181fac1699.zip | |
Merge pull request #987 from winsvega/develop
fix CompilerStack::absolutePath
| -rw-r--r-- | appveyor.yml | 1 | ||||
| -rw-r--r-- | libsolidity/interface/CompilerStack.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index 28d53062..afc2914f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -59,7 +59,6 @@ test_script: - cd %APPVEYOR_BUILD_FOLDER%\build\test\%CONFIGURATION% - copy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\msvc*.dll" . - soltest.exe -- --ipcpath \\.\pipe\geth.ipc - - ps: Stop-Process -Id $ethProc.Id artifacts: - path: solidity-windows.zip diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp index bd79bb73..ec6b5d2e 100644 --- a/libsolidity/interface/CompilerStack.cpp +++ b/libsolidity/interface/CompilerStack.cpp @@ -555,7 +555,7 @@ string CompilerStack::absolutePath(string const& _path, string const& _reference result = result.parent_path(); else if (*it != ".") result /= *it; - return result.string(); + return result.generic_string(); } void CompilerStack::compileContract( |