Changeset 903

Show
Ignore:
Timestamp:
03/19/08 21:57:59
Author:
robert
Message:

Changed getcwd to getCurrentWorkingDirectory to avoid silly #define problems in CPL headers

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/applications/osgdem/osgdem.cpp

    r901 r903  
    100100            osg::notify(osg::NOTICE)<<"Error: osgdem running on \""<<vpb::getLocalHostName()<<"\", could not find source file \""<<sourceName<<"\""<<std::endl; 
    101101            char str[2048];  
    102             if (vpb::getcwd( str, sizeof(str) )) 
     102            if (vpb::getCurrentWorkingDirectory( str, sizeof(str) )) 
    103103            { 
    104104                osg::notify(osg::NOTICE)<<"       current working directory at time of error = "<<str<<std::endl; 

  • trunk/include/vpb/FileUtils

    r901 r903  
    7171extern VPB_EXPORT int mkdir(const char *path, int mode); 
    7272extern VPB_EXPORT int chdir(const char *path); 
    73 extern VPB_EXPORT char *getcwd(char *path, int len); 
     73extern VPB_EXPORT char *getCurrentWorkingDirectory(char *path, int len); 
    7474 
    7575extern VPB_EXPORT int mkpath(const char *path, int mode); 

  • trunk/src/vpb/FileUtils.cpp

    r901 r903  
    4444                                                                  } 
    4545    int     vpb::chdir(const char *path)                          { return ::_chdir(path); } 
    46     char *  vpb::getcwd(char *path, int nbyte)                    { return ::_getcwd(path, nbyte); } 
     46    char *  vpb::getCurrentWorkingDirectory(char *path, int nbyte){ return ::_getcwd(path, nbyte); } 
    4747 
    4848#else // WIN32 
    …… 
    6868    int     vpb::mkdir(const char *path, int mode)                { return ::mkdir(path,mode); } 
    6969    int     vpb::chdir(const char *path)                          { return ::chdir(path); } 
    70     char *  vpb::getcwd(char *path, int nbyte)                    { return ::getcwd(path, nbyte); } 
     70    char *  vpb::getCurrentWorkingDirectory(char *path, int nbyte){ return ::getcwd(path, nbyte); } 
    7171 
    7272#endif  // WIN32 

  • trunk/src/vpb/TaskManager.cpp

    r902 r903  
    3838 
    3939    char str[2048];  
    40     _runPath = vpb::getcwd ( str, sizeof(str)); 
     40    _runPath = vpb::getCurrentWorkingDirectory( str, sizeof(str)); 
    4141     
    4242    _defaultSignalAction = COMPLETE_RUNNING_TASKS_THEN_EXIT;