diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-05-20 12:25:59 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-05-20 12:25:59 (GMT) |
| commit | 24dfefcbc7f6c7e01146684ed02b21624d83d9e3 (patch) | |
| tree | a18f8f08eee67de4055dfc994115da505c7f9396 /src | |
| parent | 619d6c689561f1d73dd597ece8b5bfa61b565faa (diff) | |
| download | uscxml-24dfefcbc7f6c7e01146684ed02b21624d83d9e3.zip uscxml-24dfefcbc7f6c7e01146684ed02b21624d83d9e3.tar.gz uscxml-24dfefcbc7f6c7e01146684ed02b21624d83d9e3.tar.bz2 | |
Fixed issue77 with URL resolved from CWD on windows
Diffstat (limited to 'src')
| -rw-r--r-- | src/uscxml/util/URL.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/uscxml/util/URL.cpp b/src/uscxml/util/URL.cpp index cb3abe3..561b9aa 100644 --- a/src/uscxml/util/URL.cpp +++ b/src/uscxml/util/URL.cpp @@ -141,8 +141,12 @@ URL URLImpl::resolveWithCWD(URLImpl* relative) { currPath[sizeof(currPath) - 1] = '\0'; /* not really required? */ // without the trailing slash, last component is assumed a file - std::shared_ptr<URLImpl> cwdURL(new URLImpl(std::string("file://") + currPath + PATH_SEPERATOR)); - +#if WIN32 + std::shared_ptr<URLImpl> cwdURL(new URLImpl(std::string(currPath))); +#else + std::shared_ptr<URLImpl> cwdURL(new URLImpl(std::string("file://") + currPath + PATH_SEPERATOR)); +#endif + return resolve(relative, cwdURL.get()); } |