Changeset 587

Show
Ignore:
Timestamp:
07/03/08 12:54:40 (5 months ago)
Author:
scott
Message:

unmerge my changes back out

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/common/math-vector.h

    r584 r587  
    145145inline bool equal( const vec3 &v0, const vec3 &v1, float tol ) { return fabsf( v0.x - v1.x ) <= tol && fabsf( v0.y - v1.y ) <= tol && fabsf( v0.z - v1.z ) <= tol; } 
    146146 
    147 ALIGN(16) struct vec4 
     147__declspec( align( 16 ) ) struct vec4 
    148148{ 
    149149public: 

  • trunk/common/util.h

    r584 r587  
    150150{ 
    151151public: 
    152         bad_int_cast( void ) : std::exception( ) { } 
    153         virtual ~bad_int_cast( void ) throw() { } 
     152        bad_int_cast( void ) : std::exception( "Integer conversion caused loss of data." ) { } 
     153        virtual ~bad_int_cast( void ) { } 
    154154}; 
    155155 
    …… 
    158158{ 
    159159private: 
    160         template< size_t num_bits2 > 
     160        template< size_t num_bits > 
    161161        struct signed_max 
    162162        { 

  • trunk/common/x42_file.h

    r584 r587  
    402402 
    403403#endif 
    404