Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 2, 2008, 12:22:42 AM (16 years ago)
Author:
rgrieder
Message:

Merged r2101 (objecthierarchy) to trunk.

Location:
code/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • code/trunk/src/util

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • code/trunk/src/util/SignalHandler.h

    • Property svn:mergeinfo changed (with no actual effect on merging)
    r2087 r2103  
    7171    void registerCallback( SignalCallback cb, void * someData );
    7272
    73     void doCatch( const std::string & appName, const std::string & fileName );
     73    void doCatch( const std::string & appName, const std::string & filename );
    7474    void dontCatch();
    7575
     
    8585
    8686    std::string appName;
    87     std::string fileName;
     87    std::string filename;
    8888
    8989    // used to turn on KeyAutoRepeat if OIS crashes
     
    9797  public:
    9898    inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; };
    99     void doCatch( const std::string & appName, const std::string & fileName ) {};
     99    void doCatch( const std::string & appName, const std::string & filename ) {};
    100100    void dontCatch() {};
    101101    void registerCallback( SignalCallback cb, void * someData ) {};
Note: See TracChangeset for help on using the changeset viewer.