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

Changed: Compilation with VC++ 2010 without STLport

Browse source
This commit is contained in:
kervala 2011-05-28 15:52:48 +02:00
parent 8226e000b2
commit 8208ec219b
19 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp
View file

@ -318,7 +318,7 @@ bool CDriverD3D::setupMaterial(CMaterial &mat)
if (!mat._MatDrvInfo)
{
// Insert into driver list. (so it is deleted when driver is deleted).
ItMatDrvInfoPtrList it= _MatDrvInfos.insert(_MatDrvInfos.end(), NULL);
ItMatDrvInfoPtrList it= _MatDrvInfos.insert(_MatDrvInfos.end(), (NL3D::IMaterialDrvInfos*)NULL);
*it = mat._MatDrvInfo = new CMaterialDrvInfosD3D(this, it);

2
code/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp
View file

@ -347,7 +347,7 @@ bool CDriverD3D::activeShader(CShader *shd)
if ( !shd->_DrvInfo )
{
// insert into driver list. (so it is deleted when driver is deleted).
ItShaderDrvInfoPtrList it= _ShaderDrvInfos.insert(_ShaderDrvInfos.end(), NULL);
ItShaderDrvInfoPtrList it= _ShaderDrvInfos.insert(_ShaderDrvInfos.end(), (NL3D::IShaderDrvInfos*)NULL);
// create and set iterator, for future deletion.
shaderInfo = new CShaderDrvInfosD3D(this, it);
*it= shd->_DrvInfo = shaderInfo;

2
code/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp
View file

@ -514,7 +514,7 @@ bool CDriverD3D::setupTextureEx (ITexture& tex, bool bUpload, bool &bAllUploaded
if ( !tex.TextureDrvShare )
{
// insert into driver list. (so it is deleted when driver is deleted).
ItTexDrvSharePtrList it= _TexDrvShares.insert(_TexDrvShares.end(), NULL);
ItTexDrvSharePtrList it= _TexDrvShares.insert(_TexDrvShares.end(), (NL3D::CTextureDrvShare*)NULL);
// create and set iterator, for future deletion.
*it= tex.TextureDrvShare= new CTextureDrvShare(this, it, &tex);

2
code/nel/src/3d/driver/opengl/driver_opengl_material.cpp
View file

@ -276,7 +276,7 @@ bool CDriverGL::setupMaterial(CMaterial& mat)
if (!mat._MatDrvInfo)
{
// insert into driver list. (so it is deleted when driver is deleted).
ItMatDrvInfoPtrList it= _MatDrvInfos.insert(_MatDrvInfos.end(), NULL);
ItMatDrvInfoPtrList it= _MatDrvInfos.insert(_MatDrvInfos.end(), (NL3D::IMaterialDrvInfos*)NULL);
// create and set iterator, for future deletion.
*it= mat._MatDrvInfo= new CShaderGL(this, it);

2
code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
View file

@ -626,7 +626,7 @@ bool CDriverGL::setupTextureEx (ITexture& tex, bool bUpload, bool &bAllUploaded,
{
//nldebug("3D: creating CTextureDrvShare()");
// insert into driver list. (so it is deleted when driver is deleted).
ItTexDrvSharePtrList it= _TexDrvShares.insert(_TexDrvShares.end(), NULL);
ItTexDrvSharePtrList it= _TexDrvShares.insert(_TexDrvShares.end(), (NL3D::CTextureDrvShare*)NULL);
// create and set iterator, for future deletion.
*it= tex.TextureDrvShare= new CTextureDrvShare(this, it, &tex);

2
code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
View file

@ -140,7 +140,7 @@ bool CDriverGL::setupVertexBuffer(CVertexBuffer& VB)
// 1. Retrieve/Create driver shader.
//==================================
// insert into driver list. (so it is deleted when driver is deleted).
ItVBDrvInfoPtrList it= _VBDrvInfos.insert(_VBDrvInfos.end(), NULL);
ItVBDrvInfoPtrList it= _VBDrvInfos.insert(_VBDrvInfos.end(), (NL3D::IVBDrvInfos*)NULL);
// create and set iterator, for future deletion.
CVBDrvInfosGL *info = new CVBDrvInfosGL(this, it, &VB);
*it= VB.DrvInfos = info;

6
code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
View file

@ -111,7 +111,7 @@ bool CDriverGL::activeNVVertexProgram (CVertexProgram *program)
}
// Insert into driver list. (so it is deleted when driver is deleted).
ItVtxPrgDrvInfoPtrList it= _VtxPrgDrvInfos.insert(_VtxPrgDrvInfos.end(), NULL);
ItVtxPrgDrvInfoPtrList it= _VtxPrgDrvInfos.insert(_VtxPrgDrvInfos.end(), (NL3D::IVertexProgramDrvInfos*)NULL);
// Create a driver info
*it = drvInfo = new CVertexProgamDrvInfosGL (this, it);
@ -1472,7 +1472,7 @@ bool CDriverGL::activeARBVertexProgram (CVertexProgram *program)
return false;
}
// Insert into driver list. (so it is deleted when driver is deleted).
ItVtxPrgDrvInfoPtrList it= _VtxPrgDrvInfos.insert(_VtxPrgDrvInfos.end(), NULL);
ItVtxPrgDrvInfoPtrList it= _VtxPrgDrvInfos.insert(_VtxPrgDrvInfos.end(), (NL3D::IVertexProgramDrvInfos*)NULL);
// Create a driver info
*it = drvInfo = new CVertexProgamDrvInfosGL (this, it);
@ -1554,7 +1554,7 @@ bool CDriverGL::activeEXTVertexShader (CVertexProgram *program)
*/
// Insert into driver list. (so it is deleted when driver is deleted).
ItVtxPrgDrvInfoPtrList it= _VtxPrgDrvInfos.insert(_VtxPrgDrvInfos.end(), NULL);
ItVtxPrgDrvInfoPtrList it= _VtxPrgDrvInfos.insert(_VtxPrgDrvInfos.end(), (NL3D::IVertexProgramDrvInfos*)NULL);
// Create a driver info
*it = drvInfo = new CVertexProgamDrvInfosGL (this, it);

1
code/nel/src/3d/packed_zone.cpp
View file

@ -29,6 +29,7 @@
#include "nel/misc/bit_mem_stream.h"
//
#include <limits>
#include <iterator>
//

2
code/nel/src/sound/audio_mixer_user.cpp
View file

@ -836,7 +836,7 @@ void CAudioMixerUser::buildSampleBankList()
nlinfo("Compiling sample bank [%s]", bankname.c_str());
std::string filename = buildSampleBank(bankDir[i], sbp, bankname);
if (bankFile.size() < i + 1) bankFile.resize(i + 1);
else bankFile.insert(bankFile.begin() + i, NULL);
else bankFile.insert(bankFile.begin() + i, std::string());
bankFile[i] = filename;
}
else if (bankname < CFile::getFilenameWithoutExtension(bankDir[i]))

2
code/nel/src/sound/simple_sound.cpp
View file

@ -77,7 +77,7 @@ void CSimpleSound::getSubSoundList(std::vector<std::pair<std::string, CSound*
{
// A little hack, we use the reference vector to tag unavailable sample.
if (!(_Buffername == CStringMapper::emptyId()) && const_cast<CSimpleSound*>(this)->getBuffer() == 0)
subsounds.push_back(pair<string, CSound*>(CStringMapper::unmap(_Buffername)+" (sample)", 0));
subsounds.push_back(pair<string, CSound*>(CStringMapper::unmap(_Buffername)+" (sample)", (CSound*)NULL));
}

1
code/nel/src/sound/stdsound.h
View file

@ -36,6 +36,7 @@
#include <limits>
#include <numeric>
#include <iomanip>
#include <iterator>
#include "nel/misc/vector.h"
#include "nel/misc/path.h"

4
code/ryzom/client/src/interface_v3/group_menu.cpp
View file

@ -1156,7 +1156,7 @@ void CGroupSubMenu::addSeparatorAtIndex(uint index, const std::string &id)
tmp.CheckBox = NULL;
tmp.RightArrow = NULL;
_Lines.insert(_Lines.begin() + index, tmp);
_SubMenus.insert(_SubMenus.begin() + index, NULL);
_SubMenus.insert(_SubMenus.begin() + index, (CGroupSubMenu*)NULL);
_GroupMenu->invalidateCoords();
}
@ -1304,7 +1304,7 @@ CViewTextMenu* CGroupSubMenu::addLineAtIndex(uint index, const ucstring &name,
_Lines.insert(_Lines.begin() + index, tmp);
// Add an empty sub menu by default
_SubMenus.insert(_SubMenus.begin() + index, NULL);
_SubMenus.insert(_SubMenus.begin() + index, (CGroupSubMenu*)NULL);
_GroupMenu->invalidateCoords();

6
code/ryzom/client/src/interface_v3/group_tab.cpp
View file

@ -155,7 +155,7 @@ void CGroupTab::addTab(CCtrlTabButton * tabB, sint index)
{
if(i==index)
{
tabB->setId(string("tab") + count);
tabB->setId("tab" + NLMISC::toString(count));
tabB->setParentPos(lastTab);
if(i==0)
tabB->setParentPosRef(Hotspot_TL);
@ -168,7 +168,7 @@ void CGroupTab::addTab(CCtrlTabButton * tabB, sint index)
count++;
}
buttons[i]->setId(string("tab") + count);
buttons[i]->setId("tab" + NLMISC::toString(count));
buttons[i]->setParentPos(lastTab);
if(i==0 && index!=0)
buttons[i]->setParentPosRef(Hotspot_TL);
@ -297,7 +297,7 @@ void CGroupTab::removeTab(sint index)
{
if(i!=index)
{
buttons[i]->setId(string("tab")+count);
buttons[i]->setId("tab"+NLMISC::toString(count));
buttons[i]->setParentPos(lastTab);
if((i==0) || (index==0 && i==1))
buttons[i]->setParentPosRef(Hotspot_TL);

2
code/ryzom/client/src/r2/displayer_visual_entity.cpp
View file

@ -986,7 +986,7 @@ void CDisplayerVisualEntity::updateName()
}
std::string firstPart = "";
if(actNb>0)
firstPart = CI18N::get("uiR2EDDefaultActTitle").toString() + " " + actNb;
firstPart = CI18N::get("uiR2EDDefaultActTitle").toString() + " " + NLMISC::toString(actNb);
if (act->isString("Name"))
actName = act->toString("Name");

1
code/ryzom/client/src/stdpch.h
View file

@ -37,6 +37,7 @@
#include <functional>
#include <memory>
#include <limits>
#include <iterator>
#include <nel/misc/common.h>
#include <nel/misc/debug.h>

1
code/ryzom/server/src/ai_service/stdpch.h
View file

@ -52,6 +52,7 @@
#include <utility>
#include <deque>
#include <limits>
#include <iterator>
//----------------------------------------------------------------

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

@ -21,6 +21,7 @@
#include "nel/misc/types_nl.h"
#include <memory>
#include <iterator>
#include "nel/misc/common.h"

2
code/ryzom/tools/leveldesign/mp_generator/main.cpp
View file

@ -1305,7 +1305,7 @@ void ItemNamesSave()
output = "i";
output += data.splitTo( "prospector", true );
set<CSString, CUnsensitiveSStringLessPred>::iterator it = itemNames.begin();
CSortedStringSet::const_iterator it = itemNames.begin();
while ( it != itemNames.end() )
{

1
code/ryzom/tools/translation_tools/main.cpp
View file

@ -78,6 +78,7 @@
#include <algorithm>
#include <stdio.h>
#include <time.h>
#include <iterator>
using namespace std;
using namespace NLMISC;