Changeset 3237

Show
Ignore:
Timestamp:
08/05/04 15:41:52 (9 years ago)
Author:
robert
Message:

From Marco Jez, VS.NET warning fixes.

Location:
OpenSceneGraph/trunk/src/osgPlugins
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osgPlugins/lib3ds/tracks.cpp

    r1563 r3237  
    468468  if (!k->next) { 
    469469    if (track->flags&LIB3DS_REPEAT) { 
    470       nt=(Lib3dsFloat)fmod(t, k->tcb.frame); 
     470      nt=(Lib3dsFloat)fmod(t, (float)k->tcb.frame); 
    471471      for (k=track->keyL; k->next!=0; k=k->next) { 
    472472        if ((nt>=(Lib3dsFloat)k->tcb.frame) && (nt<(Lib3dsFloat)k->next->tcb.frame)) { 
    … …  
    776776  if (!k->next) { 
    777777    if (track->flags&LIB3DS_REPEAT) { 
    778       nt=(Lib3dsFloat)fmod(t, k->tcb.frame); 
     778      nt=(Lib3dsFloat)fmod(t, (float)k->tcb.frame); 
    779779      for (k=track->keyL; k->next!=0; k=k->next) { 
    780780        if ((nt>=(Lib3dsFloat)k->tcb.frame) && (nt<(Lib3dsFloat)k->next->tcb.frame)) { 
    … …  
    11231123  if (!k->next) { 
    11241124    if (track->flags&LIB3DS_REPEAT) { 
    1125       nt=(Lib3dsFloat)fmod(t, k->tcb.frame); 
     1125      nt=(Lib3dsFloat)fmod(t, (float)k->tcb.frame); 
    11261126      for (k=track->keyL; k->next!=0; k=k->next) { 
    11271127        if ((nt>=k->tcb.frame) && (nt<k->next->tcb.frame)) { 

  • OpenSceneGraph/trunk/src/osgPlugins/txp/trpage_sys.h

    r3230 r3237  
    3838#include <windows.h> 
    3939 
    40 #ifdef __MSC_VER 
     40#ifdef _MSC_VER 
    4141// Microsoft Developer warnings that annoy me 
    4242#pragma warning ( disable : 4251) 
    4343#pragma warning ( disable : 4275) 
    4444#pragma warning ( disable : 4786) 
     45#pragma warning ( disable : 4251) 
    4546#endif 
    4647