Commit 4e2809fa879bf304a8d958470e617505a0ec7e9f
1 parent
6236289c
fixed an error produced when file lists are used without Boost in Unix
Showing
1 changed file
with
7 additions
and
8 deletions
Show diff stats
stim/parser/filename.h
| @@ -235,8 +235,8 @@ public: | @@ -235,8 +235,8 @@ public: | ||
| 235 | } | 235 | } |
| 236 | FindClose(hFind); | 236 | FindClose(hFind); |
| 237 | } | 237 | } |
| 238 | - return file_list; | ||
| 239 | -#else | 238 | + |
| 239 | +#elif BOOST_PRECOMPILED | ||
| 240 | 240 | ||
| 241 | boost::filesystem::path p(dir()); //create a path from the current filename | 241 | boost::filesystem::path p(dir()); //create a path from the current filename |
| 242 | std::vector<stim::filename> file_list; | 242 | std::vector<stim::filename> file_list; |
| @@ -265,13 +265,12 @@ public: | @@ -265,13 +265,12 @@ public: | ||
| 265 | 265 | ||
| 266 | } | 266 | } |
| 267 | 267 | ||
| 268 | - } | ||
| 269 | - return file_list; | ||
| 270 | - | ||
| 271 | - | ||
| 272 | -// std::cout<<"File lists aren't currently supported on Unix/Linux systems."<<std::endl; | ||
| 273 | -// exit(1); | 268 | + } |
| 269 | +#else | ||
| 270 | + std::cout<<"ERROR: UNIX systems don't support file lists without the Boost precompiled libraries."<<std::endl; | ||
| 271 | + exit(1); | ||
| 274 | #endif | 272 | #endif |
| 273 | + return file_list; | ||
| 275 | } | 274 | } |
| 276 | //************************************************************************************************** | 275 | //************************************************************************************************** |
| 277 | 276 |