Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 10, 2008, 5:35:49 PM (16 years ago)
Author:
rgrieder
Message:

merged input back into trunk
note: I have created an asylum with obsolete code, please check the files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/OrxonoxPlatform.h

    r1021 r1024  
    190190
    191191// Integer formats of fixed bit width
    192 typedef unsigned int uint32;
     192// FIXME: consider 64 bit platforms!
     193/*typedef unsigned int uint32;
    193194typedef unsigned short uint16;
    194 typedef unsigned char uint8;
     195typedef unsigned char uint8;*/
    195196
    196197#ifdef ORXONOX_DOUBLE_PRECISION
     
    232233// disable: 'MultiTypeString' : multiple assignment operators specified
    233234// Used in MultiType and works fine so far
    234 #   pragma warning (disable : 4522)
     235//#   pragma warning (disable : 4522)
    235236
    236237// disable: "non dll-interface class used as base for dll-interface class"
     
    270271} /* namespace orxonox */
    271272
     273// include visual leak detector to search for memory links
     274//#include <vld.h>
     275
    272276#endif /* _OrxonoxPlatform_H__ */
Note: See TracChangeset for help on using the changeset viewer.