Mercurial > hg > svcore
comparison plugin/DSSIPluginFactory.cpp @ 1222:771a17925576 piper
Merge from branch 3.0-integration
| author | Chris Cannam |
|---|---|
| date | Thu, 20 Oct 2016 11:19:34 +0100 |
| parents | 6b847a59d908 |
| children | 48e9f538e6e9 |
comparison
equal
deleted
inserted
replaced
| 1214:77320e522253 | 1222:771a17925576 |
|---|---|
| 223 path.replace(f, 5, home); | 223 path.replace(f, 5, home); |
| 224 } | 224 } |
| 225 } | 225 } |
| 226 | 226 |
| 227 #ifdef _WIN32 | 227 #ifdef _WIN32 |
| 228 char *pfiles = getenv("ProgramFiles"); | 228 const char *pfiles = getenv("ProgramFiles"); |
| 229 if (!pfiles) pfiles = "C:\\Program Files"; | 229 if (!pfiles) pfiles = "C:\\Program Files"; |
| 230 { | 230 { |
| 231 std::string::size_type f; | 231 std::string::size_type f; |
| 232 while ((f = path.find("%ProgramFiles%")) != std::string::npos && | 232 while ((f = path.find("%ProgramFiles%")) != std::string::npos && |
| 233 f < path.length()) { | 233 f < path.length()) { |