Skip to content

Commit dbb05c0

Browse files
author
nitrocaster
committed
Use final specifier instead of make_final, update type_traits.
1 parent 68ccea9 commit dbb05c0

34 files changed

+50
-252
lines changed

‎src/common/object_loader.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
////////////////////////////////////////////////////////////////////////////
88

99
#pragma once
10+
#include <type_traits>
1011

1112
template <class M, typename P>
1213
struct CLoader {
@@ -16,7 +17,7 @@ struct CLoader {
1617
template <bool a>
1718
IC static void load_data(T &data, M &stream, const P &p)
1819
{
19-
STATIC_CHECK (!is_polymorphic<T>::result,Cannot_load_polymorphic_classes_as_binary_data);
20+
STATIC_CHECK (!std::is_polymorphic<T>::value,Cannot_load_polymorphic_classes_as_binary_data);
2021
stream.r (&data,sizeof(T));
2122
}
2223

‎src/common/object_saver.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
////////////////////////////////////////////////////////////////////////////
88

99
#pragma once
10+
#include <type_traits>
1011

1112
template <class M, typename P>
1213
struct CSaver {
@@ -16,7 +17,7 @@ struct CSaver {
1617
template <bool a>
1718
IC static void save_data(const T &data, M &stream, const P &p)
1819
{
19-
STATIC_CHECK (!is_polymorphic<T>::result,Cannot_save_polymorphic_classes_as_binary_data);
20+
STATIC_CHECK (!std::is_polymorphic<T>::value,Cannot_save_polymorphic_classes_as_binary_data);
2021
stream.w (&data,sizeof(T));
2122
}
2223

‎src/common/object_type_traits.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@
154154

155155
enum {
156156
value =
157-
is_class<T1>::result &&
158-
is_class<T2>::result &&
157+
std::is_class<T1>::value &&
158+
std::is_class<T2>::value &&
159159
!is_same<T1,T2>::value &&
160160
sizeof(detail::yes) == sizeof(select((T2*)(0)))
161161
};

‎src/xrCDB/StdAfx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ IC void cdelete (T* &ptr)
5454
{
5555
if (ptr)
5656
{
57-
cspecial_free<is_polymorphic<T>::result,T>()(ptr);
57+
cspecial_free<std::is_polymorphic<T>::value,T>()(ptr);
5858
ptr = NULL;
5959
}
6060
}

‎src/xrCore/_stl_extensions.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
using std::swap;
55

6-
#include "_type_traits.h"
7-
86
#ifdef __BORLANDC__
97
#define M_NOSTDCONTAINERS_EXT
108
#endif

‎src/xrCore/_type_traits.h

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎src/xrCore/xrCore.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,6 @@
533533
<ClInclude Include="_std_extensions.h" />
534534
<ClInclude Include="_stl_extensions.h" />
535535
<ClInclude Include="_types.h" />
536-
<ClInclude Include="_type_traits.h" />
537536
<ClInclude Include="_vector2.h" />
538537
<ClInclude Include="_vector3d.h" />
539538
<ClInclude Include="_vector3d_ext.h" />

‎src/xrCore/xrCore.vcxproj.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,9 +479,6 @@
479479
<ClInclude Include="_stl_extensions.h">
480480
<Filter>Math\Extensions</Filter>
481481
</ClInclude>
482-
<ClInclude Include="_type_traits.h">
483-
<Filter>Math\Extensions</Filter>
484-
</ClInclude>
485482
<ClInclude Include="clsid.h">
486483
<Filter>Math\Extensions</Filter>
487484
</ClInclude>

‎src/xrCore/xrMemory_subst_msvc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ IC void xr_delete(T*& ptr)
168168
{
169169
if (ptr)
170170
{
171-
xr_special_free<is_polymorphic<T>::result, T>()(ptr);
171+
xr_special_free<std::is_polymorphic<T>::value, T>()(ptr);
172172
ptr = NULL;
173173
}
174174
}
@@ -177,7 +177,7 @@ IC void xr_delete(T* const& ptr)
177177
{
178178
if (ptr)
179179
{
180-
xr_special_free<is_polymorphic<T>::result, T>(ptr);
180+
xr_special_free<std::is_polymorphic<T>::value, T>(ptr);
181181
const_cast<T*&>(ptr) = NULL;
182182
}
183183
}

‎src/xrGame/cover_manager.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,9 @@ namespace smart_cover {
163163
void CCoverManager::remove_nearby_covers (smart_cover::cover const &cover, smart_cover::object const &object) const
164164
{
165165
m_nearest.clear ();
166-
typedef smart_cover::description::Loopholes::const_iterator const_iterator;
167-
const_iterator I = cover.loopholes().begin();
168-
const_iterator E = cover.loopholes().end();
169-
for ( ; I != E; ++I ) {
170-
Fvector position = cover.fov_position(**I);
166+
for (const smart_cover::loophole *loophole : cover.loopholes())
167+
{
168+
Fvector position = cover.fov_position(*loophole);
171169
m_covers->nearest (position, object.Radius() + 1.f, m_nearest);
172170

173171
m_nearest.erase(

‎src/xrGame/debug_make_final.hpp

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/xrGame/debug_make_final_test.cpp

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/xrGame/smart_cover.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ struct loophole_data {
2626
u32 m_level_vertex_id;
2727
};
2828

29-
class cover :
29+
class cover final :
3030
public CCoverPoint,
31-
private debug::make_final<cover>,
3231
private boost::noncopyable
3332
{
3433
public:

‎src/xrGame/smart_cover_action.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,10 @@
1313
#include "xrScriptEngine/script_space_forward.hpp"
1414
#include "ai_monster_space.h"
1515
#include "xrCore/Containers/AssociativeVector.hpp"
16-
#include "debug_make_final.hpp"
1716

1817
namespace smart_cover{
1918

20-
class action :
21-
private debug::make_final<action>,
22-
private boost::noncopyable
19+
class action final : private boost::noncopyable
2320
{
2421
private:
2522
class animation_predicate {

‎src/xrGame/smart_cover_animation_planner.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "smart_cover_detail.h"
1313
#include "action_planner_script.h"
1414
#include "stalker_decision_space.h"
15-
#include "debug_make_final.hpp"
1615

1716
class CAI_Stalker;
1817
struct SHit;
@@ -23,10 +22,9 @@ namespace smart_cover {
2322
class cover;
2423
class target_selector;
2524

26-
class animation_planner :
25+
class animation_planner final :
2726
public CActionPlannerScript<CAI_Stalker>,
28-
private boost::noncopyable,
29-
private debug::make_final<animation_planner>
27+
private boost::noncopyable
3028
{
3129
private:
3230
typedef CActionPlannerScript<CAI_Stalker> inherited;

‎src/xrGame/smart_cover_animation_selector.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ namespace smart_cover {
2424
class action_base;
2525
class wait_after_exit;
2626

27-
class animation_selector :
28-
private boost::noncopyable,
29-
private debug::make_final<animation_selector>
27+
class animation_selector final : private boost::noncopyable
3028
{
3129
private:
3230
CPropertyStorage *m_storage;

‎src/xrGame/smart_cover_default_behaviour_planner.hpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@
1111
#include <boost/noncopyable.hpp>
1212
#include "smart_cover_detail.h"
1313
#include "action_planner_action.h"
14-
#include "debug_make_final.hpp"
1514

1615
namespace smart_cover {
1716

1817
class animation_planner;
1918

20-
class default_behaviour_planner :
19+
class default_behaviour_planner final :
2120
public CActionPlannerAction<animation_planner>,
22-
private boost::noncopyable,
23-
private debug::make_final<default_behaviour_planner>
21+
private boost::noncopyable
2422
{
2523
private:
2624
typedef CActionPlannerAction<animation_planner> inherited;

‎src/xrGame/smart_cover_description.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <boost/noncopyable.hpp>
1212
#include "smart_cover_detail.h"
1313
#include "graph_abstract.h"
14-
#include "debug_make_final.hpp"
1514

1615
namespace smart_cover {
1716

@@ -22,8 +21,7 @@ namespace transitions {
2221
class action;
2322
}
2423

25-
class description :
26-
private debug::make_final<description>,
24+
class description final :
2725
private boost::noncopyable,
2826
public detail::intrusive_base_time
2927
{

‎src/xrGame/smart_cover_loophole.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ namespace smart_cover {
1919

2020
class object;
2121

22-
class loophole :
23-
private debug::make_final<loophole>,
24-
private boost::noncopyable
22+
class loophole final : private boost::noncopyable
2523
{
2624
private:
2725
class action_predicate {

‎src/xrGame/smart_cover_loophole_planner_actions.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ class loophole_action_no_sight : public loophole_action {
7474
virtual void finalize ();
7575
}; // class loophole_action_no_sight
7676

77-
class loophole_lookout :
78-
public loophole_action,
79-
private debug::make_final<loophole_lookout>
77+
class loophole_lookout final : public loophole_action
8078
{
8179
private:
8280
typedef loophole_action inherited;
@@ -88,9 +86,7 @@ class loophole_lookout :
8886
virtual void finalize ();
8987
};
9088

91-
class loophole_fire :
92-
public loophole_action,
93-
private debug::make_final<loophole_fire>
89+
class loophole_fire final : public loophole_action
9490
{
9591
private:
9692
typedef loophole_action inherited;
@@ -110,9 +106,7 @@ class loophole_fire :
110106
virtual void on_no_mark ();
111107
};
112108

113-
class loophole_reload :
114-
public loophole_action_no_sight,
115-
private debug::make_final<loophole_reload>
109+
class loophole_reload final : public loophole_action_no_sight
116110
{
117111
private:
118112
typedef loophole_action_no_sight inherited;

0 commit comments

Comments
 (0)