Remove a couple more MSVC 2008 workarounds

This commit is contained in:
Celtic Minstrel 2016-07-29 14:05:19 -04:00
parent d1728ea0c5
commit 8fa73053b8
6 changed files with 3 additions and 52 deletions

View file

@ -113,7 +113,7 @@ public:
* Since we need to return true if found we always return true.
*/
template <class T>
bool oper(tevent)
bool operator()(tevent)
{
return true;
}

View file

@ -144,9 +144,8 @@ struct tdispatcher_implementation
*
* @returns Whether or not the handler is found.
*/
// not called operator() to work around a problem in MSVC 2008.
template <class T>
bool oper(tevent event)
bool operator()(tevent event)
{
if((event_type_ & tdispatcher::pre)
&& !event_signal<T>(dispatcher_, event).pre_child.empty()) {
@ -198,8 +197,7 @@ struct find<false>
boost::value_initialized<arg> x;
if(boost::get(x) == event) {
// MSVC 2008 doesn't like operator() here so changed the name.
return functor.template oper<item>(event);
return functor.template operator()<item>(event);
} else {
typedef typename boost::mpl::next<itor>::type titor;
return find<std::is_same<titor, end>::value>::execute(

View file

@ -38,22 +38,6 @@
static lg::log_domain log_engine_sf("engine/side_filter");
#define ERR_NG LOG_STREAM(err, log_engine_sf)
#ifdef _MSC_VER
// This is a workaround for a VC bug; this constructor is never called
// and so we don't care about the warnings this quick fix generates
#pragma warning(push)
#pragma warning(disable:4413)
side_filter::side_filter()
: cfg_(vconfig::unconstructed_vconfig())
, flat_()
, side_string_()
, fc_(nullptr)
{
assert(false);
}
#pragma warning(pop)
#endif
side_filter::~side_filter() {}
side_filter::side_filter(const vconfig& cfg, const filter_context * fc, bool flat_tod)

View file

@ -32,12 +32,6 @@ class team;
class side_filter {
public:
#ifdef _MSC_VER
// This constructor is required for MSVC 9 SP1 due to a bug there
// see http://social.msdn.microsoft.com/forums/en-US/vcgeneral/thread/34473b8c-0184-4750-a290-08558e4eda4e
// other compilers don't need it.
side_filter();
#endif
~side_filter();
side_filter(const std::string &side_string, const filter_context * fc, bool flat_tod = false);

View file

@ -44,24 +44,6 @@ terrain_filter::~terrain_filter()
{
}
#ifdef _MSC_VER
// This is a workaround for a VC bug; this constructor is never called
// and so we don't care about the warnings this quick fix generates
#pragma warning(push)
#pragma warning(disable:4413)
terrain_filter::terrain_filter():
cfg_(vconfig::unconstructed_vconfig()),
fc_(nullptr),
cache_(),
max_loop_(),
flat_()
{
assert(false);
}
#pragma warning(pop)
#endif
terrain_filter::terrain_filter(const vconfig& cfg, const filter_context * fc,
const bool flat_tod, const size_t max_loop) :
cfg_(cfg),

View file

@ -31,13 +31,6 @@ class team;
class terrain_filter : public xy_pred {
public:
#ifdef _MSC_VER
// This constructor is required for MSVC 9 SP1 due to a bug there
// see http://social.msdn.microsoft.com/forums/en-US/vcgeneral/thread/34473b8c-0184-4750-a290-08558e4eda4e
// other compilers don't need it.
terrain_filter();
#endif
terrain_filter(const vconfig& cfg,
const filter_context * fc, const bool flat_tod=false, const size_t max_loop=game_config::max_loop);
terrain_filter(const vconfig& cfg, const terrain_filter& original);