Skip to content

Commit 8440c41

Browse files
author
nitrocaster
committed
Remove boost::noncopyable references (#96).
1 parent 3da7a47 commit 8440c41

File tree

90 files changed

+177
-164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+177
-164
lines changed

src/Common/Noncopyable.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#pragma once
2+
3+
class Noncopyable
4+
{
5+
public:
6+
Noncopyable() = default;
7+
Noncopyable(Noncopyable &) = delete;
8+
Noncopyable &operator=(Noncopyable &) = delete;
9+
};

src/xrCore/xrCore.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@
294294
<ItemGroup>
295295
<ClInclude Include="..\common\GUID.hpp" />
296296
<ClInclude Include="..\common\LevelStructure.hpp" />
297+
<ClInclude Include="..\Common\Noncopyable.hpp" />
297298
<ClInclude Include="..\common\object_broker.h" />
298299
<ClInclude Include="..\common\object_cloner.h" />
299300
<ClInclude Include="..\common\object_comparer.h" />

src/xrCore/xrCore.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,9 @@
785785
<ClInclude Include="Debug\SymbolEngine.h">
786786
<Filter>Debug core</Filter>
787787
</ClInclude>
788+
<ClInclude Include="..\Common\Noncopyable.hpp">
789+
<Filter>Common</Filter>
790+
</ClInclude>
788791
</ItemGroup>
789792
<ItemGroup>
790793
<ResourceCompile Include="xrCore.rc">

src/xrEngine/edit_actions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
#ifndef EDIT_ACTIONS_H_INCLUDED
99
#define EDIT_ACTIONS_H_INCLUDED
1010

11-
#include <boost/noncopyable.hpp>
11+
#include "Common/Noncopyable.hpp"
1212

1313
namespace text_editor
1414
{
1515

1616
enum key_state;
1717
class line_edit_control;
1818

19-
class base : private boost::noncopyable
19+
class base : private Noncopyable
2020
{
2121
public:
2222
base();

src/xrEngine/editor_environment_ambients_ambient.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#ifdef INGAME_EDITOR
1313

14-
#include <boost/noncopyable.hpp>
14+
#include "Common/Noncopyable.hpp"
1515
#include "Include/editor/property_holder.hpp"
1616
#include "property_collection_forward.hpp"
1717
#include "Environment.h"
@@ -41,7 +41,7 @@ class sound_id;
4141
class ambient :
4242
public CEnvAmbient,
4343
public editor::property_holder_holder,
44-
private boost::noncopyable
44+
private Noncopyable
4545
{
4646
private:
4747
typedef CEnvAmbient inherited;

src/xrEngine/editor_environment_ambients_effect_id.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#ifdef INGAME_EDITOR
1313

14-
#include <boost/noncopyable.hpp>
14+
#include "Common/Noncopyable.hpp"
1515
#include "Include/editor/property_holder.hpp"
1616

1717
namespace editor
@@ -31,7 +31,7 @@ namespace ambients
3131

3232
class effect_id :
3333
public editor::property_holder_holder,
34-
private boost::noncopyable
34+
private Noncopyable
3535
{
3636
public:
3737
effect_id(effects::manager const& manager, shared_str const& id);

src/xrEngine/editor_environment_ambients_manager.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#ifdef INGAME_EDITOR
1313

14-
#include <boost/noncopyable.hpp>
14+
#include "Common/Noncopyable.hpp"
1515
#include "property_collection_forward.hpp"
1616

1717
namespace editor
@@ -39,7 +39,7 @@ namespace ambients
3939

4040
class ambient;
4141

42-
class manager : private boost::noncopyable
42+
class manager : private Noncopyable
4343
{
4444
public:
4545
manager(::editor::environment::manager const& manager);

src/xrEngine/editor_environment_ambients_sound_id.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#ifdef INGAME_EDITOR
1313

14-
#include <boost/noncopyable.hpp>
14+
#include "Common/Noncopyable.hpp"
1515
#include "Include/editor/property_holder.hpp"
1616

1717
namespace editor
@@ -31,7 +31,7 @@ namespace ambients
3131

3232
class sound_id :
3333
public editor::property_holder_holder,
34-
private boost::noncopyable
34+
private Noncopyable
3535
{
3636
public:
3737
sound_id(sound_channels::manager const& manager, shared_str const& sound);

src/xrEngine/editor_environment_effects_effect.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#ifdef INGAME_EDITOR
1313

14-
#include <boost/noncopyable.hpp>
14+
#include "Common/Noncopyable.hpp"
1515
#include "Include/editor/property_holder.hpp"
1616
#include "Environment.h"
1717

@@ -30,7 +30,7 @@ class manager;
3030
class effect :
3131
public CEnvAmbient::SEffect,
3232
public editor::property_holder_holder,
33-
private boost::noncopyable
33+
private Noncopyable
3434
{
3535
public:
3636
effect(manager const& manager, shared_str const& id);

src/xrEngine/editor_environment_effects_manager.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#ifdef INGAME_EDITOR
1313

14-
#include <boost/noncopyable.hpp>
14+
#include "Common/Noncopyable.hpp"
1515
#include "property_collection_forward.hpp"
1616

1717
namespace editor
@@ -29,7 +29,7 @@ namespace effects
2929

3030
class effect;
3131

32-
class manager : private boost::noncopyable
32+
class manager : private Noncopyable
3333
{
3434
public:
3535
manager(::editor::environment::manager* environment);

0 commit comments

Comments
 (0)