diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2008-01-10 10:31:49 -0330 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2008-01-10 10:31:49 -0330 |
commit | 13a34584712343ed44f5c85dcc3d7d417e649a92 (patch) | |
tree | 1cae305e0e3e5705925da060db8e7d7a762e86b0 /cpp/src/Slice/Parser.cpp | |
parent | New fix for bug 1945 (diff) | |
download | ice-13a34584712343ed44f5c85dcc3d7d417e649a92.tar.bz2 ice-13a34584712343ed44f5c85dcc3d7d417e649a92.tar.xz ice-13a34584712343ed44f5c85dcc3d7d417e649a92.zip |
Some more changes wrt use of mcpp
Diffstat (limited to 'cpp/src/Slice/Parser.cpp')
-rw-r--r-- | cpp/src/Slice/Parser.cpp | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index e2bea935547..afa1c60dbf9 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -4994,88 +4994,6 @@ Slice::Unit::nextLine() _currentLine++; } -#ifdef _WIN32 -// -// On Windows mcpp output does not maintain filename capitalization -// so we have to manually fix it up. -// -string -fixCapitalization(const string& path) -{ - if(!isAbsolute(path)) - { - return path; - } - - vector<string> result; - IceUtilInternal::splitString(path, "/", result); - string currentPath = result[0]; - for(unsigned int i = 1; i < result.size(); ++i) - { - const wstring fs = IceUtil::stringToWstring(currentPath + "/*"); - -#ifdef __BCPLUSPLUS__ - struct _wffblk data; - int h = _wfindfirst(fs.c_str(), &data, FA_DIREC); - if(h == -1) - { - return path; - } - - while(true) - { - string name = IceUtil::wstringToString(data.ff_name); - assert(!name.empty()); - - if(_stricmp(name.c_str(), result[i].c_str()) == 0) - { - currentPath += "/" + name; - _wfindclose(&data); - break; - } - - if(_wfindnext(&data) == -1) - { - _wfindclose(&data); - return path; - } - } -#else - struct _wfinddata_t data; -# if defined(_MSC_VER) && (_MSC_VER < 1300) - long h = _wfindfirst(fs.c_str(), &data); -# else - intptr_t h = _wfindfirst(fs.c_str(), &data); -# endif - if(h == -1) - { - return path; - } - - while(true) - { - string name = IceUtil::wstringToString(data.name); - assert(!name.empty()); - - if(_stricmp(name.c_str(), result[i].c_str()) == 0) - { - currentPath += "/" + name; - _findclose(h); - break; - } - - if(_wfindnext(h, &data) == -1) - { - _findclose(h); - return path; - } - } -#endif - } - return currentPath; -} -#endif - void Slice::Unit::scanPosition(const char* s) { @@ -5117,9 +5035,6 @@ Slice::Unit::scanPosition(const char* s) } } -#ifdef _WIN32 - currentFile = fixCapitalization(currentFile); -#endif currentFile = normalizePath(currentFile, false); enum LineType { File, Push, Pop }; |