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

Fixed: Compilation with VC++ 2010 and 2012

Browse source
This commit is contained in:
kervala 2012-12-11 12:22:41 +01:00
parent 2cd7419f42
commit 2b4119c428
6 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/misc/smart_ptr.h
View file

@ -352,7 +352,7 @@ public:
}
};
#if defined(NL_COMP_VC8) || defined(NL_COMP_VC9) || defined(NL_COMP_VC10)
#if defined(NL_COMP_VC) && NL_COMP_VC_VERSION >= 80
// This operator only purpose is to compare with NULL value
template <class T>

4
code/nel/src/3d/fasthls_modifier.cpp
View file

@ -109,7 +109,7 @@ CRGBA CFastHLSModifier::convert(uint H, uint L, uint S)
return col;
}
#if defined(NL_COMP_VC71) || defined(NL_COMP_VC8) || defined(NL_COMP_VC9) || defined(NL_COMP_VC10)
#if defined(NL_COMP_VC) && NL_COMP_VC_VERSION >= 71
# pragma warning( push )
# pragma warning( disable : 4799 )
#endif
@ -262,7 +262,7 @@ uint16 CFastHLSModifier::applyHLSMod(uint16 colorIn, uint8 dHue, uint dLum, uin
#pragma managed(pop)
#endif
#if defined(NL_COMP_VC71) || defined(NL_COMP_VC8) || defined(NL_COMP_VC9) || defined(NL_COMP_VC10)
#if defined(NL_COMP_VC) && NL_COMP_VC_VERSION >= 71
# pragma warning( pop )
#endif

2
code/nel/tools/misc/extract_filename/extract_filename.cpp
View file

@ -23,7 +23,7 @@ using namespace NLMISC;
#ifdef NL_DEBUG
#define INFO nlinfo
#else // NL_DEBUG
# if defined(NL_COMP_VC71) || defined(NL_COMP_VC8) || defined(NL_COMP_VC9) || defined(NL_COMP_VC10)
# if defined(NL_COMP_VC) && NL_COMP_VC_VERSION >= 71
# define INFO __noop
# else
# define INFO 0&&

7
code/ryzom/common/src/game_share/welcome_service_itf.h
View file

@ -6,9 +6,6 @@
#ifndef WELCOME_SERVICE_ITF
#define WELCOME_SERVICE_ITF
#include "nel/misc/types_nl.h"
#ifdef NL_COMP_VC8
#include <memory>
#endif
#include "nel/misc/hierarchical_timer.h"
#include "nel/misc/string_conversion.h"
#include "nel/net/message.h"
@ -18,7 +15,9 @@
#include "nel/net/module_gateway.h"
#include "nel/net/login_cookie.h"
#include <memory>
namespace WS
{

2
code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.cpp
View file

@ -52,7 +52,7 @@ bool CEditListCtrl::create (DWORD wStyle, RECT &rect, CWnd *parent, uint dialog_
subRect.top = 0;
subRect.right = rect.right-rect.left;
subRect.bottom = rect.bottom-rect.top;
#if defined(NL_COMP_VC8) || defined(NL_COMP_VC9)
#if defined(NL_COMP_VC) && NL_COMP_VC_VERSION >= 80
if (ListCtrl.CreateEx ( WS_EX_CLIENTEDGE, /*WC_LISTVIEW, "",*/ WS_CHILD|LVS_REPORT, subRect, this, 0))
#else
if (ListCtrl.CreateEx ( WS_EX_CLIENTEDGE, WC_LISTVIEW, "", WS_CHILD|LVS_REPORT, subRect, this, 0))

2
code/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
View file

@ -54,7 +54,7 @@ bool CFileTreeCtrl::create( const RECT& rect, CWnd* pParentWnd, UINT nID )
if (CWnd::Create (className, "empty", WS_CHILD, rect, pParentWnd, nID ))
#if defined(NL_COMP_VC8) || defined(NL_COMP_VC9)
#if defined(NL_COMP_VC) && NL_COMP_VC_VERSION >= 80
if (_TreeCtrl.CreateEx (WS_EX_CLIENTEDGE, /*_T("SysTreeView32"), "",*/ TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTONS|TVS_EDITLABELS|WS_CHILD|WS_TABSTOP, rect, this, 0))
#else
if (_TreeCtrl.CreateEx (WS_EX_CLIENTEDGE, _T("SysTreeView32"), "", TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTONS|TVS_EDITLABELS|WS_CHILD|WS_TABSTOP, rect, this, 0))