diff options
| author | chriseth <chris@ethereum.org> | 2017-01-13 20:05:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 20:05:02 +0800 |
| commit | 60cc1668517f56ce6ca8225555472e7a27eab8b0 (patch) | |
| tree | 8eac35131efc4beeee921356052375233edd7102 /libsolidity/interface/CompilerStack.h | |
| parent | 822622cf5bf23e79a6e2292cb837d1a39ca1c419 (diff) | |
| parent | e22672b7c739dde9f37a919e63245abda4b1fc89 (diff) | |
| download | dexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.tar.gz dexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.tar.zst dexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.zip | |
Merge pull request #1561 from ethereum/develop
Merge develop into release for 0.4.8
Diffstat (limited to 'libsolidity/interface/CompilerStack.h')
| -rw-r--r-- | libsolidity/interface/CompilerStack.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h index f98a457a..d49a8df1 100644 --- a/libsolidity/interface/CompilerStack.h +++ b/libsolidity/interface/CompilerStack.h @@ -29,6 +29,7 @@ #include <vector> #include <functional> #include <boost/noncopyable.hpp> +#include <boost/filesystem.hpp> #include <json/json.h> #include <libdevcore/Common.h> #include <libdevcore/FixedHash.h> @@ -234,12 +235,14 @@ private: bool checkLibraryNameClashes(); /// @returns the absolute path corresponding to @a _path relative to @a _reference. std::string absolutePath(std::string const& _path, std::string const& _reference) const; + /// Helper function to return path converted strings. + std::string sanitizePath(std::string const& _path) const { return boost::filesystem::path(_path).generic_string(); } + /// Compile a single contract and put the result in @a _compiledContracts. void compileContract( ContractDefinition const& _contract, std::map<ContractDefinition const*, eth::Assembly const*>& _compiledContracts ); - void link(); Contract const& contract(std::string const& _contractName = "") const; |