paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes macro redefinition of FACILITY_VISUALCPP in VC2012 (it's defined in winerror.h).

Browse Source 
Removes obsolete hack for old Boost and VC2005 (broke VC2005 build with
modern Boost).

This was SVN commit r13433.
This commit is contained in:
historic_bruno 2013-05-28 01:14:41 +00:00
parent 4a8c7e72b5
commit d2b0d25457
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/lib/sysdep/os/win/wdll_delay_load.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010 Wildfire Games
/* Copyright (c) 2013 Wildfire Games
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -36,7 +36,10 @@ WINIT_REGISTER_LATE_SHUTDOWN2(wdll_Shutdown); // last - DLLs are unloaded here
//-----------------------------------------------------------------------------
// delay loading (modified from VC7 DelayHlp.cpp and DelayImp.h)
#if MSC_VERSION && MSC_VERSION >= 1700
// FACILITY_VISUALCPP is already defined in winerror.h in VC2012
# undef FACILITY_VISUALCPP
#endif
#define FACILITY_VISUALCPP ((LONG)0x6d)
#define VcppException(sev,status) ((sev) | (FACILITY_VISUALCPP<<16) | status)

9
source/simulation2/system/ComponentManagerSerialization.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2013 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -17,13 +17,6 @@
#include "precompiled.h"
// Ugly hack: Boost disables rand48's operator<< in VC2005 and older, but we'd quite
// like to use it, so remove the macro that disables it (before we include
// linear_congruential.hpp)
#if MSC_VERSION && MSC_VERSION <= 1400
#undef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
#endif
#include "ComponentManager.h"
#include "IComponent.h"
#include "ParamNode.h"