Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #825 Remove all warnings when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-09-15 10:27:26 +02:00
parent 554aeef7ba
commit 71da504731
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/sound/context_sound.h
View file

@ -174,7 +174,7 @@ class CContextSoundContainer : public IContextSoundContainer
return; return;
nlassertex(i==NbJoker, ("Error while adding sound '%s' into context sound container", NLMISC::CStringMapper::unmap(sound->getName()).c_str())); nlassertex(i==NbJoker, ("Error while adding sound '%s' into context sound container", NLMISC::CStringMapper::unmap(sound->getName()).c_str()));
int randomValue; sint randomValue = 0;
if (UseRandom) if (UseRandom)
{ {
bool ok = false; bool ok = false;

4
code/nel/src/misc/window_displayer.cpp
View file

@ -80,11 +80,11 @@ bool CWindowDisplayer::update ()
uint CWindowDisplayer::createLabel (const char *value) uint CWindowDisplayer::createLabel (const char *value)
{ {
int pos; uint pos;
{ {
CSynchronized<std::vector<CLabelEntry> >::CAccessor access (&_Labels); CSynchronized<std::vector<CLabelEntry> >::CAccessor access (&_Labels);
access.value().push_back (CLabelEntry(value)); access.value().push_back (CLabelEntry(value));
pos = (int)access.value().size()-1; pos = (uint)access.value().size()-1;
} }
return pos; return pos;
} }

2
code/nel/src/sound/driver/openal/music_channel_al.cpp
View file

@ -29,7 +29,7 @@ namespace NLSOUND
{ {
CMusicChannelAL::CMusicChannelAL(CSoundDriverAL *soundDriver) CMusicChannelAL::CMusicChannelAL(CSoundDriverAL *soundDriver)
: _MusicBuffer(NULL), _SoundDriver(soundDriver), _Gain(1.0), _Source(NULL), _Thread(NULL), _Async(false), _Playing(false), _Buffer(NULL) : _SoundDriver(soundDriver), _MusicBuffer(NULL), _Thread(NULL), _Buffer(NULL), _Source(NULL), _Playing(false), _Async(false), _Gain(1.0)
{ {
// create a default source for music streaming // create a default source for music streaming
_Source = static_cast<CSourceAL*>(_SoundDriver->createSource()); _Source = static_cast<CSourceAL*>(_SoundDriver->createSource());

4
code/nel/tools/memory/memlog/memlog.cpp
View file

@ -33,7 +33,7 @@ public:
bool readString (string &str, FILE *file) bool readString (string &str, FILE *file)
{ {
int c; int c;
while (c = fgetc (file)) while ((c = fgetc (file)))
{ {
if (c == EOF) if (c == EOF)
return false; return false;
@ -47,7 +47,7 @@ int main(int argc, char* argv[])
if (argc>1) if (argc>1)
{ {
char buffer[512]; char buffer[512];
while (gets (buffer)) while (fgets(buffer, 512, stdin))
{ {
uint32 address; uint32 address;
if (strcmp (buffer, "help") == 0) if (strcmp (buffer, "help") == 0)

6
code/ryzom/server/src/logger_service/log_query.h
View file

@ -788,6 +788,8 @@ struct TPredicateNode : public TQueryNode
ts.EndDate = ~0; ts.EndDate = ~0;
tl.push_back(ts); tl.push_back(ts);
break; break;
default:
break;
} }
return tl; return tl;
@ -1163,8 +1165,8 @@ public:
/// The iterator in the string where the error is detected /// The iterator in the string where the error is detected
iterator It; iterator It;
/// The error string /// The error string
char *ErrorStr; const char *ErrorStr;
EInvalidQuery(iterator it, char *erroStr) EInvalidQuery(iterator it, const char *erroStr)
: It(it), : It(it),
ErrorStr(erroStr) ErrorStr(erroStr)
{} {}