microsoft
/
DirectXTK
зеркало из https://github.com/microsoft/DirectXTK.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Don't need to use DIRECTX_NOEXCEPT macro

This commit is contained in:
Chuck Walbourn 2018-04-17 10:59:05 -07:00
Родитель 5017d43371
Коммит 43df3f97f1
49 изменённых файлов: 146 добавлений и 241 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
Audio/AudioEngine.cpp
Просмотреть файл

@ -244,7 +244,7 @@ static_assert(_countof(gReverbPresets) == Reverb_MAX, "AUDIO_ENGINE_REVERB enum
class AudioEngine::Impl
{
public:
Impl() DIRECTX_NOEXCEPT :
Impl() throw() :
mMasterVoice(nullptr),
mReverbVoice(nullptr),
masterChannelMask(0),
@ -1267,14 +1267,14 @@ AudioEngine::AudioEngine(AUDIO_ENGINE_FLAGS flags, const WAVEFORMATEX* wfx, cons
// Move constructor.
AudioEngine::AudioEngine(AudioEngine&& moveFrom) DIRECTX_NOEXCEPT
AudioEngine::AudioEngine(AudioEngine&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
AudioEngine& AudioEngine::operator= (AudioEngine&& moveFrom) DIRECTX_NOEXCEPT
AudioEngine& AudioEngine::operator= (AudioEngine&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Audio/DynamicSoundEffectInstance.cpp
Просмотреть файл

@ -237,14 +237,14 @@ DynamicSoundEffectInstance::DynamicSoundEffectInstance(AudioEngine* engine,
// Move constructor.
DynamicSoundEffectInstance::DynamicSoundEffectInstance(DynamicSoundEffectInstance&& moveFrom) DIRECTX_NOEXCEPT
DynamicSoundEffectInstance::DynamicSoundEffectInstance(DynamicSoundEffectInstance&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
DynamicSoundEffectInstance& DynamicSoundEffectInstance::operator= (DynamicSoundEffectInstance&& moveFrom) DIRECTX_NOEXCEPT
DynamicSoundEffectInstance& DynamicSoundEffectInstance::operator= (DynamicSoundEffectInstance&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

2
Audio/SoundCommon.h
Просмотреть файл

@ -69,7 +69,7 @@ namespace DirectX
class SoundEffectInstanceBase
{
public:
SoundEffectInstanceBase() DIRECTX_NOEXCEPT :
SoundEffectInstanceBase() throw() :
voice(nullptr),
state(STOPPED),
engine(nullptr),

4
Audio/SoundEffect.cpp
Просмотреть файл

@ -438,14 +438,14 @@ SoundEffect::SoundEffect(AudioEngine* engine, std::unique_ptr<uint8_t[]>& wavDat
// Move constructor.
SoundEffect::SoundEffect(SoundEffect&& moveFrom) DIRECTX_NOEXCEPT
SoundEffect::SoundEffect(SoundEffect&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
SoundEffect& SoundEffect::operator= (SoundEffect&& moveFrom) DIRECTX_NOEXCEPT
SoundEffect& SoundEffect::operator= (SoundEffect&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Audio/SoundEffectInstance.cpp
Просмотреть файл

@ -226,14 +226,14 @@ SoundEffectInstance::SoundEffectInstance(AudioEngine* engine, WaveBank* waveBank
// Move constructor.
SoundEffectInstance::SoundEffectInstance(SoundEffectInstance&& moveFrom) DIRECTX_NOEXCEPT
SoundEffectInstance::SoundEffectInstance(SoundEffectInstance&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
SoundEffectInstance& SoundEffectInstance::operator= (SoundEffectInstance&& moveFrom) DIRECTX_NOEXCEPT
SoundEffectInstance& SoundEffectInstance::operator= (SoundEffectInstance&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Audio/WaveBank.cpp
Просмотреть файл

@ -265,14 +265,14 @@ WaveBank::WaveBank(AudioEngine* engine, const wchar_t* wbFileName)
// Move constructor.
WaveBank::WaveBank(WaveBank&& moveFrom) DIRECTX_NOEXCEPT
WaveBank::WaveBank(WaveBank&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
WaveBank& WaveBank::operator= (WaveBank&& moveFrom) DIRECTX_NOEXCEPT
WaveBank& WaveBank::operator= (WaveBank&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

2
Audio/WaveBankReader.cpp
Просмотреть файл

@ -426,7 +426,7 @@ using namespace DirectX;
class WaveBankReader::Impl
{
public:
Impl() DIRECTX_NOEXCEPT :
Impl() throw() :
m_async(INVALID_HANDLE_VALUE),
m_prepared(false)
#if defined(_XBOX_ONE) && defined(_TITLE)

31
Inc/Audio.h
Просмотреть файл

@ -57,13 +57,6 @@
#include <string>
#include <vector>
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX
{
@ -194,8 +187,8 @@ namespace DirectX
AUDIO_ENGINE_FLAGS flags = AudioEngine_Default, _In_opt_ const WAVEFORMATEX* wfx = nullptr, _In_opt_z_ const wchar_t* deviceId = nullptr,
AUDIO_STREAM_CATEGORY category = AudioCategory_GameEffects);
AudioEngine(AudioEngine&& moveFrom) DIRECTX_NOEXCEPT;
AudioEngine& operator= (AudioEngine&& moveFrom) DIRECTX_NOEXCEPT;
AudioEngine(AudioEngine&& moveFrom) throw();
AudioEngine& operator= (AudioEngine&& moveFrom) throw();
AudioEngine(AudioEngine const&) = delete;
AudioEngine& operator= (AudioEngine const&) = delete;
@ -292,8 +285,8 @@ namespace DirectX
public:
WaveBank(_In_ AudioEngine* engine, _In_z_ const wchar_t* wbFileName);
WaveBank(WaveBank&& moveFrom) DIRECTX_NOEXCEPT;
WaveBank& operator= (WaveBank&& moveFrom) DIRECTX_NOEXCEPT;
WaveBank(WaveBank&& moveFrom) throw();
WaveBank& operator= (WaveBank&& moveFrom) throw();
WaveBank(WaveBank const&) = delete;
WaveBank& operator= (WaveBank const&) = delete;
@ -366,8 +359,8 @@ namespace DirectX
#endif
SoundEffect(SoundEffect&& moveFrom) DIRECTX_NOEXCEPT;
SoundEffect& operator= (SoundEffect&& moveFrom) DIRECTX_NOEXCEPT;
SoundEffect(SoundEffect&& moveFrom) throw();
SoundEffect& operator= (SoundEffect&& moveFrom) throw();
SoundEffect(SoundEffect const&) = delete;
SoundEffect& operator= (SoundEffect const&) = delete;
@ -414,7 +407,7 @@ namespace DirectX
//----------------------------------------------------------------------------------
struct AudioListener : public X3DAUDIO_LISTENER
{
AudioListener() DIRECTX_NOEXCEPT
AudioListener() throw()
{
memset(this, 0, sizeof(X3DAUDIO_LISTENER));
@ -498,7 +491,7 @@ namespace DirectX
{
float EmitterAzimuths[XAUDIO2_MAX_AUDIO_CHANNELS];
AudioEmitter() DIRECTX_NOEXCEPT
AudioEmitter() throw()
{
memset(this, 0, sizeof(X3DAUDIO_EMITTER));
memset(EmitterAzimuths, 0, sizeof(EmitterAzimuths));
@ -590,8 +583,8 @@ namespace DirectX
class SoundEffectInstance
{
public:
SoundEffectInstance(SoundEffectInstance&& moveFrom) DIRECTX_NOEXCEPT;
SoundEffectInstance& operator= (SoundEffectInstance&& moveFrom) DIRECTX_NOEXCEPT;
SoundEffectInstance(SoundEffectInstance&& moveFrom) throw();
SoundEffectInstance& operator= (SoundEffectInstance&& moveFrom) throw();
SoundEffectInstance(SoundEffectInstance const&) = delete;
SoundEffectInstance& operator= (SoundEffectInstance const&) = delete;
@ -639,8 +632,8 @@ namespace DirectX
_In_opt_ std::function<void __cdecl(DynamicSoundEffectInstance*)> bufferNeeded,
int sampleRate, int channels, int sampleBits = 16,
SOUND_EFFECT_INSTANCE_FLAGS flags = SoundEffectInstance_Default);
DynamicSoundEffectInstance(DynamicSoundEffectInstance&& moveFrom) DIRECTX_NOEXCEPT;
DynamicSoundEffectInstance& operator= (DynamicSoundEffectInstance&& moveFrom) DIRECTX_NOEXCEPT;
DynamicSoundEffectInstance(DynamicSoundEffectInstance&& moveFrom) throw();
DynamicSoundEffectInstance& operator= (DynamicSoundEffectInstance&& moveFrom) throw();
DynamicSoundEffectInstance(DynamicSoundEffectInstance const&) = delete;
DynamicSoundEffectInstance& operator= (DynamicSoundEffectInstance const&) = delete;

12
Inc/CommonStates.h
Просмотреть файл

@ -17,14 +17,6 @@
#include <memory>
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX
{
@ -32,8 +24,8 @@ namespace DirectX
{
public:
explicit CommonStates(_In_ ID3D11Device* device);
CommonStates(CommonStates&& moveFrom) DIRECTX_NOEXCEPT;
CommonStates& operator= (CommonStates&& moveFrom) DIRECTX_NOEXCEPT;
CommonStates(CommonStates&& moveFrom) throw();
CommonStates& operator= (CommonStates&& moveFrom) throw();
CommonStates(CommonStates const&) = delete;
CommonStates& operator= (CommonStates const&) = delete;

56
Inc/Effects.h
Просмотреть файл

@ -18,14 +18,6 @@
#include <DirectXMath.h>
#include <memory>
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX
{
@ -108,8 +100,8 @@ namespace DirectX
{
public:
explicit BasicEffect(_In_ ID3D11Device* device);
BasicEffect(BasicEffect&& moveFrom) DIRECTX_NOEXCEPT;
BasicEffect& operator= (BasicEffect&& moveFrom) DIRECTX_NOEXCEPT;
BasicEffect(BasicEffect&& moveFrom) throw();
BasicEffect& operator= (BasicEffect&& moveFrom) throw();
BasicEffect(BasicEffect const&) = delete;
BasicEffect& operator= (BasicEffect const&) = delete;
@ -178,8 +170,8 @@ namespace DirectX
{
public:
explicit AlphaTestEffect(_In_ ID3D11Device* device);
AlphaTestEffect(AlphaTestEffect&& moveFrom) DIRECTX_NOEXCEPT;
AlphaTestEffect& operator= (AlphaTestEffect&& moveFrom) DIRECTX_NOEXCEPT;
AlphaTestEffect(AlphaTestEffect&& moveFrom) throw();
AlphaTestEffect& operator= (AlphaTestEffect&& moveFrom) throw();
AlphaTestEffect(AlphaTestEffect const&) = delete;
AlphaTestEffect& operator= (AlphaTestEffect const&) = delete;
@ -232,8 +224,8 @@ namespace DirectX
{
public:
explicit DualTextureEffect(_In_ ID3D11Device* device);
DualTextureEffect(DualTextureEffect&& moveFrom) DIRECTX_NOEXCEPT;
DualTextureEffect& operator= (DualTextureEffect&& moveFrom) DIRECTX_NOEXCEPT;
DualTextureEffect(DualTextureEffect&& moveFrom) throw();
DualTextureEffect& operator= (DualTextureEffect&& moveFrom) throw();
DualTextureEffect(DualTextureEffect const&) = delete;
DualTextureEffect& operator= (DualTextureEffect const&) = delete;
@ -283,8 +275,8 @@ namespace DirectX
{
public:
explicit EnvironmentMapEffect(_In_ ID3D11Device* device);
EnvironmentMapEffect(EnvironmentMapEffect&& moveFrom) DIRECTX_NOEXCEPT;
EnvironmentMapEffect& operator= (EnvironmentMapEffect&& moveFrom) DIRECTX_NOEXCEPT;
EnvironmentMapEffect(EnvironmentMapEffect&& moveFrom) throw();
EnvironmentMapEffect& operator= (EnvironmentMapEffect&& moveFrom) throw();
EnvironmentMapEffect(EnvironmentMapEffect const&) = delete;
EnvironmentMapEffect& operator= (EnvironmentMapEffect const&) = delete;
@ -354,8 +346,8 @@ namespace DirectX
{
public:
explicit SkinnedEffect(_In_ ID3D11Device* device);
SkinnedEffect(SkinnedEffect&& moveFrom) DIRECTX_NOEXCEPT;
SkinnedEffect& operator= (SkinnedEffect&& moveFrom) DIRECTX_NOEXCEPT;
SkinnedEffect(SkinnedEffect&& moveFrom) throw();
SkinnedEffect& operator= (SkinnedEffect&& moveFrom) throw();
SkinnedEffect(SkinnedEffect const&) = delete;
SkinnedEffect& operator= (SkinnedEffect const&) = delete;
@ -427,8 +419,8 @@ namespace DirectX
public:
explicit DGSLEffect(_In_ ID3D11Device* device, _In_opt_ ID3D11PixelShader* pixelShader = nullptr,
_In_ bool enableSkinning = false);
DGSLEffect(DGSLEffect&& moveFrom) DIRECTX_NOEXCEPT;
DGSLEffect& operator= (DGSLEffect&& moveFrom) DIRECTX_NOEXCEPT;
DGSLEffect(DGSLEffect&& moveFrom) throw();
DGSLEffect& operator= (DGSLEffect&& moveFrom) throw();
DGSLEffect(DGSLEffect const&) = delete;
DGSLEffect& operator= (DGSLEffect const&) = delete;
@ -506,8 +498,8 @@ namespace DirectX
{
public:
explicit NormalMapEffect(_In_ ID3D11Device* device);
NormalMapEffect(NormalMapEffect&& moveFrom) DIRECTX_NOEXCEPT;
NormalMapEffect& operator= (NormalMapEffect&& moveFrom) DIRECTX_NOEXCEPT;
NormalMapEffect(NormalMapEffect&& moveFrom) throw();
NormalMapEffect& operator= (NormalMapEffect&& moveFrom) throw();
NormalMapEffect(NormalMapEffect const&) = delete;
NormalMapEffect& operator= (NormalMapEffect const&) = delete;
@ -578,8 +570,8 @@ namespace DirectX
{
public:
explicit PBREffect(_In_ ID3D11Device* device);
PBREffect(PBREffect&& moveFrom) DIRECTX_NOEXCEPT;
PBREffect& operator= (PBREffect&& moveFrom) DIRECTX_NOEXCEPT;
PBREffect(PBREffect&& moveFrom) throw();
PBREffect& operator= (PBREffect&& moveFrom) throw();
PBREffect(PBREffect const&) = delete;
PBREffect& operator= (PBREffect const&) = delete;
@ -659,8 +651,8 @@ namespace DirectX
};
explicit DebugEffect(_In_ ID3D11Device* device);
DebugEffect(DebugEffect&& moveFrom) DIRECTX_NOEXCEPT;
DebugEffect& operator= (DebugEffect&& moveFrom) DIRECTX_NOEXCEPT;
DebugEffect(DebugEffect&& moveFrom) throw();
DebugEffect& operator= (DebugEffect&& moveFrom) throw();
DebugEffect(DebugEffect const&) = delete;
DebugEffect& operator= (DebugEffect const&) = delete;
@ -721,7 +713,7 @@ namespace DirectX
const wchar_t* specularTexture;
const wchar_t* normalTexture;
EffectInfo() DIRECTX_NOEXCEPT { memset(this, 0, sizeof(EffectInfo)); };
EffectInfo() throw() { memset(this, 0, sizeof(EffectInfo)); };
};
virtual std::shared_ptr<IEffect> __cdecl CreateEffect(_In_ const EffectInfo& info, _In_opt_ ID3D11DeviceContext* deviceContext) = 0;
@ -735,8 +727,8 @@ namespace DirectX
{
public:
explicit EffectFactory(_In_ ID3D11Device* device);
EffectFactory(EffectFactory&& moveFrom) DIRECTX_NOEXCEPT;
EffectFactory& operator= (EffectFactory&& moveFrom) DIRECTX_NOEXCEPT;
EffectFactory(EffectFactory&& moveFrom) throw();
EffectFactory& operator= (EffectFactory&& moveFrom) throw();
EffectFactory(EffectFactory const&) = delete;
EffectFactory& operator= (EffectFactory const&) = delete;
@ -773,8 +765,8 @@ namespace DirectX
{
public:
explicit DGSLEffectFactory(_In_ ID3D11Device* device);
DGSLEffectFactory(DGSLEffectFactory&& moveFrom) DIRECTX_NOEXCEPT;
DGSLEffectFactory& operator= (DGSLEffectFactory&& moveFrom) DIRECTX_NOEXCEPT;
DGSLEffectFactory(DGSLEffectFactory&& moveFrom) throw();
DGSLEffectFactory& operator= (DGSLEffectFactory&& moveFrom) throw();
DGSLEffectFactory(DGSLEffectFactory const&) = delete;
DGSLEffectFactory& operator= (DGSLEffectFactory const&) = delete;
@ -793,7 +785,7 @@ namespace DirectX
const wchar_t* textures[DGSLEffect::MaxTextures - BaseTextureOffset];
const wchar_t* pixelShader;
DGSLEffectInfo() DIRECTX_NOEXCEPT { memset(this, 0, sizeof(DGSLEffectInfo)); };
DGSLEffectInfo() throw() { memset(this, 0, sizeof(DGSLEffectInfo)); };
};
virtual std::shared_ptr<IEffect> __cdecl CreateDGSLEffect(_In_ const DGSLEffectInfo& info, _In_opt_ ID3D11DeviceContext* deviceContext);

14
Inc/GamePad.h
Просмотреть файл

@ -29,14 +29,6 @@
#include <string>
#endif
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX
{
@ -44,8 +36,8 @@ namespace DirectX
{
public:
GamePad();
GamePad(GamePad&& moveFrom) DIRECTX_NOEXCEPT;
GamePad& operator= (GamePad&& moveFrom) DIRECTX_NOEXCEPT;
GamePad(GamePad&& moveFrom) throw();
GamePad& operator= (GamePad&& moveFrom) throw();
GamePad(GamePad const&) = delete;
GamePad& operator=(GamePad const&) = delete;
@ -236,7 +228,7 @@ namespace DirectX
ButtonState leftTrigger;
ButtonState rightTrigger;
ButtonStateTracker() DIRECTX_NOEXCEPT { Reset(); }
ButtonStateTracker() throw() { Reset(); }
void __cdecl Update(const State& state);

12
Inc/GraphicsMemory.h
Просмотреть файл

@ -17,14 +17,6 @@
#include <memory>
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX
{
@ -36,8 +28,8 @@ namespace DirectX
#else
GraphicsMemory(_In_ ID3D11Device* device, UINT backBufferCount = 2);
#endif
GraphicsMemory(GraphicsMemory&& moveFrom) DIRECTX_NOEXCEPT;
GraphicsMemory& operator= (GraphicsMemory&& moveFrom) DIRECTX_NOEXCEPT;
GraphicsMemory(GraphicsMemory&& moveFrom) throw();
GraphicsMemory& operator= (GraphicsMemory&& moveFrom) throw();
GraphicsMemory(GraphicsMemory const&) = delete;
GraphicsMemory& operator=(GraphicsMemory const&) = delete;

14
Inc/Keyboard.h
Просмотреть файл

@ -17,14 +17,6 @@
namespace ABI { namespace Windows { namespace UI { namespace Core { struct ICoreWindow; } } } }
#endif
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX
{
@ -32,8 +24,8 @@ namespace DirectX
{
public:
Keyboard();
Keyboard(Keyboard&& moveFrom) DIRECTX_NOEXCEPT;
Keyboard& operator= (Keyboard&& moveFrom) DIRECTX_NOEXCEPT;
Keyboard(Keyboard&& moveFrom) throw();
Keyboard& operator= (Keyboard&& moveFrom) throw();
Keyboard(Keyboard const&) = delete;
Keyboard& operator=(Keyboard const&) = delete;
@ -436,7 +428,7 @@ namespace DirectX
State released;
State pressed;
KeyboardStateTracker() DIRECTX_NOEXCEPT { Reset(); }
KeyboardStateTracker() throw() { Reset(); }
void __cdecl Update(const State& state);

12
Inc/Model.h
Просмотреть файл

@ -28,14 +28,6 @@
#include <wrl\client.h>
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX
{
@ -49,7 +41,7 @@ namespace DirectX
class ModelMeshPart
{
public:
ModelMeshPart() DIRECTX_NOEXCEPT;
ModelMeshPart() throw();
virtual ~ModelMeshPart();
uint32_t indexCount;
@ -84,7 +76,7 @@ namespace DirectX
class ModelMesh
{
public:
ModelMesh() DIRECTX_NOEXCEPT;
ModelMesh() throw();
virtual ~ModelMesh();
BoundingSphere boundingSphere;

14
Inc/Mouse.h
Просмотреть файл

@ -16,14 +16,6 @@
namespace ABI { namespace Windows { namespace UI { namespace Core { struct ICoreWindow; } } } }
#endif
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX
{
@ -31,8 +23,8 @@ namespace DirectX
{
public:
Mouse();
Mouse(Mouse&& moveFrom) DIRECTX_NOEXCEPT;
Mouse& operator= (Mouse&& moveFrom) DIRECTX_NOEXCEPT;
Mouse(Mouse&& moveFrom) throw();
Mouse& operator= (Mouse&& moveFrom) throw();
Mouse(Mouse const&) = delete;
Mouse& operator=(Mouse const&) = delete;
@ -75,7 +67,7 @@ namespace DirectX
ButtonState xButton1;
ButtonState xButton2;
ButtonStateTracker() DIRECTX_NOEXCEPT { Reset(); }
ButtonStateTracker() throw() { Reset(); }
void __cdecl Update(const State& state);

20
Inc/PostProcess.h
Просмотреть файл

@ -23,14 +23,6 @@
#include <memory>
#include <functional>
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX
{
@ -64,8 +56,8 @@ namespace DirectX
};
explicit BasicPostProcess(_In_ ID3D11Device* device);
BasicPostProcess(BasicPostProcess&& moveFrom) DIRECTX_NOEXCEPT;
BasicPostProcess& operator= (BasicPostProcess&& moveFrom) DIRECTX_NOEXCEPT;
BasicPostProcess(BasicPostProcess&& moveFrom) throw();
BasicPostProcess& operator= (BasicPostProcess&& moveFrom) throw();
BasicPostProcess(BasicPostProcess const&) = delete;
BasicPostProcess& operator= (BasicPostProcess const&) = delete;
@ -111,8 +103,8 @@ namespace DirectX
};
explicit DualPostProcess(_In_ ID3D11Device* device);
DualPostProcess(DualPostProcess&& moveFrom) DIRECTX_NOEXCEPT;
DualPostProcess& operator= (DualPostProcess&& moveFrom) DIRECTX_NOEXCEPT;
DualPostProcess(DualPostProcess&& moveFrom) throw();
DualPostProcess& operator= (DualPostProcess&& moveFrom) throw();
DualPostProcess(DualPostProcess const&) = delete;
DualPostProcess& operator= (DualPostProcess const&) = delete;
@ -166,8 +158,8 @@ namespace DirectX
};
explicit ToneMapPostProcess(_In_ ID3D11Device* device);
ToneMapPostProcess(ToneMapPostProcess&& moveFrom) DIRECTX_NOEXCEPT;
ToneMapPostProcess& operator= (ToneMapPostProcess&& moveFrom) DIRECTX_NOEXCEPT;
ToneMapPostProcess(ToneMapPostProcess&& moveFrom) throw();
ToneMapPostProcess& operator= (ToneMapPostProcess&& moveFrom) throw();
ToneMapPostProcess(ToneMapPostProcess const&) = delete;
ToneMapPostProcess& operator= (ToneMapPostProcess const&) = delete;

16
Inc/PrimitiveBatch.h
Просмотреть файл

@ -19,14 +19,6 @@
#include <utility>
#include <stdint.h>
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX
{
@ -37,8 +29,8 @@ namespace DirectX
{
protected:
PrimitiveBatchBase(_In_ ID3D11DeviceContext* deviceContext, size_t maxIndices, size_t maxVertices, size_t vertexSize);
PrimitiveBatchBase(PrimitiveBatchBase&& moveFrom) DIRECTX_NOEXCEPT;
PrimitiveBatchBase& operator= (PrimitiveBatchBase&& moveFrom) DIRECTX_NOEXCEPT;
PrimitiveBatchBase(PrimitiveBatchBase&& moveFrom) throw();
PrimitiveBatchBase& operator= (PrimitiveBatchBase&& moveFrom) throw();
PrimitiveBatchBase(PrimitiveBatchBase const&) = delete;
PrimitiveBatchBase& operator= (PrimitiveBatchBase const&) = delete;
@ -74,11 +66,11 @@ namespace DirectX
: PrimitiveBatchBase(deviceContext, maxIndices, maxVertices, sizeof(TVertex))
{ }
PrimitiveBatch(PrimitiveBatch&& moveFrom) DIRECTX_NOEXCEPT
PrimitiveBatch(PrimitiveBatch&& moveFrom) throw()
: PrimitiveBatchBase(std::move(moveFrom))
{ }
PrimitiveBatch& operator= (PrimitiveBatch&& moveFrom) DIRECTX_NOEXCEPT
PrimitiveBatch& operator= (PrimitiveBatch&& moveFrom) throw()
{
PrimitiveBatchBase::operator=(std::move(moveFrom));
return *this;

28
Inc/SimpleMath.h
Просмотреть файл

@ -26,14 +26,6 @@
#include <DirectXPackedVector.h>
#include <DirectXCollision.h>
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
#ifndef XM_CONSTEXPR
#define XM_CONSTEXPR
#endif
@ -59,7 +51,7 @@ namespace DirectX
long height;
// Creators
Rectangle() DIRECTX_NOEXCEPT : x(0), y(0), width(0), height(0) {}
Rectangle() throw() : x(0), y(0), width(0), height(0) {}
XM_CONSTEXPR Rectangle(long ix, long iy, long iw, long ih) : x(ix), y(iy), width(iw), height(ih) {}
explicit Rectangle(const RECT& rct) : x(rct.left), y(rct.top), width(rct.right - rct.left), height(rct.bottom - rct.top) {}
@ -116,7 +108,7 @@ namespace DirectX
// 2D vector
struct Vector2 : public XMFLOAT2
{
Vector2() DIRECTX_NOEXCEPT : XMFLOAT2(0.f, 0.f) {}
Vector2() throw() : XMFLOAT2(0.f, 0.f) {}
XM_CONSTEXPR explicit Vector2(float x) : XMFLOAT2(x, x) {}
XM_CONSTEXPR Vector2(float _x, float _y) : XMFLOAT2(_x, _y) {}
explicit Vector2(_In_reads_(2) const float *pArray) : XMFLOAT2(pArray) {}
@ -230,7 +222,7 @@ namespace DirectX
// 3D vector
struct Vector3 : public XMFLOAT3
{
Vector3() DIRECTX_NOEXCEPT : XMFLOAT3(0.f, 0.f, 0.f) {}
Vector3() throw() : XMFLOAT3(0.f, 0.f, 0.f) {}
XM_CONSTEXPR explicit Vector3(float x) : XMFLOAT3(x, x, x) {}
XM_CONSTEXPR Vector3(float _x, float _y, float _z) : XMFLOAT3(_x, _y, _z) {}
explicit Vector3(_In_reads_(3) const float *pArray) : XMFLOAT3(pArray) {}
@ -351,7 +343,7 @@ namespace DirectX
// 4D vector
struct Vector4 : public XMFLOAT4
{
Vector4() DIRECTX_NOEXCEPT : XMFLOAT4(0.f, 0.f, 0.f, 0.f) {}
Vector4() throw() : XMFLOAT4(0.f, 0.f, 0.f, 0.f) {}
XM_CONSTEXPR explicit Vector4(float x) : XMFLOAT4(x, x, x, x) {}
XM_CONSTEXPR Vector4(float _x, float _y, float _z, float _w) : XMFLOAT4(_x, _y, _z, _w) {}
explicit Vector4(_In_reads_(4) const float *pArray) : XMFLOAT4(pArray) {}
@ -466,7 +458,7 @@ namespace DirectX
// 4x4 Matrix (assumes right-handed cooordinates)
struct Matrix : public XMFLOAT4X4
{
Matrix() DIRECTX_NOEXCEPT
Matrix() throw()
: XMFLOAT4X4(1.f, 0, 0, 0,
0, 1.f, 0, 0,
0, 0, 1.f, 0,
@ -620,7 +612,7 @@ namespace DirectX
// Plane
struct Plane : public XMFLOAT4
{
Plane() DIRECTX_NOEXCEPT : XMFLOAT4(0.f, 1.f, 0.f, 0.f) {}
Plane() throw() : XMFLOAT4(0.f, 1.f, 0.f, 0.f) {}
XM_CONSTEXPR Plane(float _x, float _y, float _z, float _w) : XMFLOAT4(_x, _y, _z, _w) {}
Plane(const Vector3& normal, float d) : XMFLOAT4(normal.x, normal.y, normal.z, d) {}
Plane(const Vector3& point1, const Vector3& point2, const Vector3& point3);
@ -676,7 +668,7 @@ namespace DirectX
// Quaternion
struct Quaternion : public XMFLOAT4
{
Quaternion() DIRECTX_NOEXCEPT : XMFLOAT4(0, 0, 0, 1.f) {}
Quaternion() throw() : XMFLOAT4(0, 0, 0, 1.f) {}
XM_CONSTEXPR Quaternion(float _x, float _y, float _z, float _w) : XMFLOAT4(_x, _y, _z, _w) {}
Quaternion(const Vector3& v, float scalar) : XMFLOAT4(v.x, v.y, v.z, scalar) {}
explicit Quaternion(const Vector4& v) : XMFLOAT4(v.x, v.y, v.z, v.w) {}
@ -755,7 +747,7 @@ namespace DirectX
// Color
struct Color : public XMFLOAT4
{
Color() DIRECTX_NOEXCEPT : XMFLOAT4(0, 0, 0, 1.f) {}
Color() throw() : XMFLOAT4(0, 0, 0, 1.f) {}
XM_CONSTEXPR Color(float _r, float _g, float _b) : XMFLOAT4(_r, _g, _b, 1.f) {}
XM_CONSTEXPR Color(float _r, float _g, float _b, float _a) : XMFLOAT4(_r, _g, _b, _a) {}
explicit Color(const Vector3& clr) : XMFLOAT4(clr.x, clr.y, clr.z, 1.f) {}
@ -859,7 +851,7 @@ namespace DirectX
Vector3 position;
Vector3 direction;
Ray() DIRECTX_NOEXCEPT : position(0, 0, 0), direction(0, 0, 1) {}
Ray() throw() : position(0, 0, 0), direction(0, 0, 1) {}
Ray(const Vector3& pos, const Vector3& dir) : position(pos), direction(dir) {}
Ray(const Ray&) = default;
@ -893,7 +885,7 @@ namespace DirectX
float minDepth;
float maxDepth;
Viewport() DIRECTX_NOEXCEPT :
Viewport() throw() :
x(0.f), y(0.f), width(0.f), height(0.f), minDepth(0.f), maxDepth(1.f) {}
XM_CONSTEXPR Viewport(float ix, float iy, float iw, float ih, float iminz = 0.f, float imaxz = 1.f) :
x(ix), y(iy), width(iw), height(ih), minDepth(iminz), maxDepth(imaxz) {}

12
Inc/SpriteBatch.h
Просмотреть файл

@ -20,14 +20,6 @@
#include <functional>
#include <memory>
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX
{
@ -54,8 +46,8 @@ namespace DirectX
{
public:
explicit SpriteBatch(_In_ ID3D11DeviceContext* deviceContext);
SpriteBatch(SpriteBatch&& moveFrom) DIRECTX_NOEXCEPT;
SpriteBatch& operator= (SpriteBatch&& moveFrom) DIRECTX_NOEXCEPT;
SpriteBatch(SpriteBatch&& moveFrom) throw();
SpriteBatch& operator= (SpriteBatch&& moveFrom) throw();
SpriteBatch(SpriteBatch const&) = delete;
SpriteBatch& operator= (SpriteBatch const&) = delete;

4
Inc/SpriteFont.h
Просмотреть файл

@ -23,8 +23,8 @@ namespace DirectX
SpriteFont(_In_ ID3D11Device* device, _In_reads_bytes_(dataSize) uint8_t const* dataBlob, _In_ size_t dataSize, bool forceSRGB = false);
SpriteFont(_In_ ID3D11ShaderResourceView* texture, _In_reads_(glyphCount) Glyph const* glyphs, _In_ size_t glyphCount, _In_ float lineSpacing);
SpriteFont(SpriteFont&& moveFrom) DIRECTX_NOEXCEPT;
SpriteFont& operator= (SpriteFont&& moveFrom) DIRECTX_NOEXCEPT;
SpriteFont(SpriteFont&& moveFrom) throw();
SpriteFont& operator= (SpriteFont&& moveFrom) throw();
SpriteFont(SpriteFont const&) = delete;
SpriteFont& operator= (SpriteFont const&) = delete;

4
Src/AlphaTestEffect.cpp
Просмотреть файл

@ -286,14 +286,14 @@ AlphaTestEffect::AlphaTestEffect(_In_ ID3D11Device* device)
// Move constructor.
AlphaTestEffect::AlphaTestEffect(AlphaTestEffect&& moveFrom) DIRECTX_NOEXCEPT
AlphaTestEffect::AlphaTestEffect(AlphaTestEffect&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
AlphaTestEffect& AlphaTestEffect::operator= (AlphaTestEffect&& moveFrom) DIRECTX_NOEXCEPT
AlphaTestEffect& AlphaTestEffect::operator= (AlphaTestEffect&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/BasicEffect.cpp
Просмотреть файл

@ -481,14 +481,14 @@ BasicEffect::BasicEffect(_In_ ID3D11Device* device)
// Move constructor.
BasicEffect::BasicEffect(BasicEffect&& moveFrom) DIRECTX_NOEXCEPT
BasicEffect::BasicEffect(BasicEffect&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
BasicEffect& BasicEffect::operator= (BasicEffect&& moveFrom) DIRECTX_NOEXCEPT
BasicEffect& BasicEffect::operator= (BasicEffect&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/BasicPostProcess.cpp
Просмотреть файл

@ -467,14 +467,14 @@ BasicPostProcess::BasicPostProcess(_In_ ID3D11Device* device)
// Move constructor.
BasicPostProcess::BasicPostProcess(BasicPostProcess&& moveFrom) DIRECTX_NOEXCEPT
BasicPostProcess::BasicPostProcess(BasicPostProcess&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
BasicPostProcess& BasicPostProcess::operator= (BasicPostProcess&& moveFrom) DIRECTX_NOEXCEPT
BasicPostProcess& BasicPostProcess::operator= (BasicPostProcess&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/CommonStates.cpp
Просмотреть файл

@ -172,14 +172,14 @@ CommonStates::CommonStates(_In_ ID3D11Device* device)
// Move constructor.
CommonStates::CommonStates(CommonStates&& moveFrom) DIRECTX_NOEXCEPT
CommonStates::CommonStates(CommonStates&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
CommonStates& CommonStates::operator= (CommonStates&& moveFrom) DIRECTX_NOEXCEPT
CommonStates& CommonStates::operator= (CommonStates&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/DGSLEffect.cpp
Просмотреть файл

@ -568,13 +568,13 @@ DGSLEffect::DGSLEffect(_In_ ID3D11Device* device, _In_opt_ ID3D11PixelShader* pi
}
DGSLEffect::DGSLEffect(DGSLEffect&& moveFrom) DIRECTX_NOEXCEPT
DGSLEffect::DGSLEffect(DGSLEffect&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
DGSLEffect& DGSLEffect::operator= (DGSLEffect&& moveFrom) DIRECTX_NOEXCEPT
DGSLEffect& DGSLEffect::operator= (DGSLEffect&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/DGSLEffectFactory.cpp
Просмотреть файл

@ -509,12 +509,12 @@ DGSLEffectFactory::~DGSLEffectFactory()
}
DGSLEffectFactory::DGSLEffectFactory(DGSLEffectFactory&& moveFrom) DIRECTX_NOEXCEPT
DGSLEffectFactory::DGSLEffectFactory(DGSLEffectFactory&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
DGSLEffectFactory& DGSLEffectFactory::operator= (DGSLEffectFactory&& moveFrom) DIRECTX_NOEXCEPT
DGSLEffectFactory& DGSLEffectFactory::operator= (DGSLEffectFactory&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/DebugEffect.cpp
Просмотреть файл

@ -237,14 +237,14 @@ DebugEffect::DebugEffect(_In_ ID3D11Device* device)
// Move constructor.
DebugEffect::DebugEffect(DebugEffect&& moveFrom) DIRECTX_NOEXCEPT
DebugEffect::DebugEffect(DebugEffect&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
DebugEffect& DebugEffect::operator= (DebugEffect&& moveFrom) DIRECTX_NOEXCEPT
DebugEffect& DebugEffect::operator= (DebugEffect&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/DualPostProcess.cpp
Просмотреть файл

@ -267,14 +267,14 @@ DualPostProcess::DualPostProcess(_In_ ID3D11Device* device)
// Move constructor.
DualPostProcess::DualPostProcess(DualPostProcess&& moveFrom) DIRECTX_NOEXCEPT
DualPostProcess::DualPostProcess(DualPostProcess&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
DualPostProcess& DualPostProcess::operator= (DualPostProcess&& moveFrom) DIRECTX_NOEXCEPT
DualPostProcess& DualPostProcess::operator= (DualPostProcess&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/DualTextureEffect.cpp
Просмотреть файл

@ -187,14 +187,14 @@ DualTextureEffect::DualTextureEffect(_In_ ID3D11Device* device)
// Move constructor.
DualTextureEffect::DualTextureEffect(DualTextureEffect&& moveFrom) DIRECTX_NOEXCEPT
DualTextureEffect::DualTextureEffect(DualTextureEffect&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
DualTextureEffect& DualTextureEffect::operator= (DualTextureEffect&& moveFrom) DIRECTX_NOEXCEPT
DualTextureEffect& DualTextureEffect::operator= (DualTextureEffect&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

8
Src/EffectCommon.cpp
Просмотреть файл

@ -25,7 +25,7 @@ void XM_CALLCONV IEffectMatrices::SetMatrices(FXMMATRIX world, CXMMATRIX view, C
// Constructor initializes default matrix values.
EffectMatrices::EffectMatrices() DIRECTX_NOEXCEPT
EffectMatrices::EffectMatrices() throw()
{
world = XMMatrixIdentity();
view = XMMatrixIdentity();
@ -50,7 +50,7 @@ _Use_decl_annotations_ void EffectMatrices::SetConstants(int& dirtyFlags, XMMATR
// Constructor initializes default fog settings.
EffectFog::EffectFog() DIRECTX_NOEXCEPT :
EffectFog::EffectFog() throw() :
enabled(false),
start(0),
end(1.f)
@ -109,7 +109,7 @@ void XM_CALLCONV EffectFog::SetConstants(int& dirtyFlags, FXMMATRIX worldView, X
// Constructor initializes default material color settings.
EffectColor::EffectColor() DIRECTX_NOEXCEPT :
EffectColor::EffectColor() throw() :
alpha(1.f)
{
diffuseColor = g_XMOne;
@ -133,7 +133,7 @@ void EffectColor::SetConstants(_Inout_ int& dirtyFlags, _Inout_ XMVECTOR& diffus
// Constructor initializes default light settings.
EffectLights::EffectLights() DIRECTX_NOEXCEPT
EffectLights::EffectLights() throw()
{
emissiveColor = g_XMZero;
ambientLightColor = g_XMZero;

8
Src/EffectCommon.h
Просмотреть файл

@ -43,7 +43,7 @@ namespace DirectX
// Helper stores matrix parameter values, and computes derived matrices.
struct EffectMatrices
{
EffectMatrices() DIRECTX_NOEXCEPT;
EffectMatrices() throw();
XMMATRIX world;
XMMATRIX view;
@ -57,7 +57,7 @@ namespace DirectX
// Helper stores the current fog settings, and computes derived shader parameters.
struct EffectFog
{
EffectFog() DIRECTX_NOEXCEPT;
EffectFog() throw();
bool enabled;
float start;
@ -70,7 +70,7 @@ namespace DirectX
// Helper stores material color settings, and computes derived parameters for shaders that do not support realtime lighting.
struct EffectColor
{
EffectColor() DIRECTX_NOEXCEPT;
EffectColor() throw();
XMVECTOR diffuseColor;
float alpha;
@ -82,7 +82,7 @@ namespace DirectX
// Helper stores the current light settings, and computes derived shader parameters.
struct EffectLights : public EffectColor
{
EffectLights() DIRECTX_NOEXCEPT;
EffectLights() throw();
static const int MaxDirectionalLights = IEffectLights::MaxDirectionalLights;

4
Src/EffectFactory.cpp
Просмотреть файл

@ -453,12 +453,12 @@ EffectFactory::~EffectFactory()
}
EffectFactory::EffectFactory(EffectFactory&& moveFrom) DIRECTX_NOEXCEPT
EffectFactory::EffectFactory(EffectFactory&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
EffectFactory& EffectFactory::operator= (EffectFactory&& moveFrom) DIRECTX_NOEXCEPT
EffectFactory& EffectFactory::operator= (EffectFactory&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/EnvironmentMapEffect.cpp
Просмотреть файл

@ -358,14 +358,14 @@ EnvironmentMapEffect::EnvironmentMapEffect(_In_ ID3D11Device* device)
// Move constructor.
EnvironmentMapEffect::EnvironmentMapEffect(EnvironmentMapEffect&& moveFrom) DIRECTX_NOEXCEPT
EnvironmentMapEffect::EnvironmentMapEffect(EnvironmentMapEffect&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
EnvironmentMapEffect& EnvironmentMapEffect::operator= (EnvironmentMapEffect&& moveFrom) DIRECTX_NOEXCEPT
EnvironmentMapEffect& EnvironmentMapEffect::operator= (EnvironmentMapEffect&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/GamePad.cpp
Просмотреть файл

@ -1282,7 +1282,7 @@ GamePad::GamePad()
// Move constructor.
GamePad::GamePad(GamePad&& moveFrom) DIRECTX_NOEXCEPT
GamePad::GamePad(GamePad&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
pImpl->mOwner = this;
@ -1290,7 +1290,7 @@ GamePad::GamePad(GamePad&& moveFrom) DIRECTX_NOEXCEPT
// Move assignment.
GamePad& GamePad::operator= (GamePad&& moveFrom) DIRECTX_NOEXCEPT
GamePad& GamePad::operator= (GamePad&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
pImpl->mOwner = this;

2
Src/GeometricPrimitive.cpp
Просмотреть файл

@ -76,7 +76,7 @@ namespace
class GeometricPrimitive::Impl
{
public:
Impl() DIRECTX_NOEXCEPT : mIndexCount(0) {}
Impl() throw() : mIndexCount(0) {}
void Initialize(_In_ ID3D11DeviceContext* deviceContext, const VertexCollection& vertices, const IndexCollection& indices);

4
Src/GraphicsMemory.cpp
Просмотреть файл

@ -278,7 +278,7 @@ GraphicsMemory::GraphicsMemory(_In_ ID3D11Device* device, UINT backBufferCount)
// Move constructor.
GraphicsMemory::GraphicsMemory(GraphicsMemory&& moveFrom) DIRECTX_NOEXCEPT
GraphicsMemory::GraphicsMemory(GraphicsMemory&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
pImpl->mOwner = this;
@ -286,7 +286,7 @@ GraphicsMemory::GraphicsMemory(GraphicsMemory&& moveFrom) DIRECTX_NOEXCEPT
// Move assignment.
GraphicsMemory& GraphicsMemory::operator= (GraphicsMemory&& moveFrom) DIRECTX_NOEXCEPT
GraphicsMemory& GraphicsMemory::operator= (GraphicsMemory&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
pImpl->mOwner = this;

4
Src/Keyboard.cpp
Просмотреть файл

@ -474,7 +474,7 @@ Keyboard::Keyboard()
// Move constructor.
Keyboard::Keyboard(Keyboard&& moveFrom) DIRECTX_NOEXCEPT
Keyboard::Keyboard(Keyboard&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
pImpl->mOwner = this;
@ -482,7 +482,7 @@ Keyboard::Keyboard(Keyboard&& moveFrom) DIRECTX_NOEXCEPT
// Move assignment.
Keyboard& Keyboard::operator= (Keyboard&& moveFrom) DIRECTX_NOEXCEPT
Keyboard& Keyboard::operator= (Keyboard&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
pImpl->mOwner = this;

4
Src/Model.cpp
Просмотреть файл

@ -25,7 +25,7 @@ using namespace DirectX;
// ModelMeshPart
//--------------------------------------------------------------------------------------
ModelMeshPart::ModelMeshPart() DIRECTX_NOEXCEPT :
ModelMeshPart::ModelMeshPart() throw() :
indexCount(0),
startIndex(0),
vertexOffset(0),
@ -130,7 +130,7 @@ void ModelMeshPart::ModifyEffect(ID3D11Device* d3dDevice, std::shared_ptr<IEffec
// ModelMesh
//--------------------------------------------------------------------------------------
ModelMesh::ModelMesh() DIRECTX_NOEXCEPT :
ModelMesh::ModelMesh() throw() :
ccw(true),
pmalpha(true)
{

2
Src/ModelLoadCMO.cpp
Просмотреть файл

@ -189,7 +189,7 @@ namespace
std::shared_ptr<IEffect> effect;
ComPtr<ID3D11InputLayout> il;
MaterialRecordCMO() DIRECTX_NOEXCEPT : pMaterial(nullptr) {}
MaterialRecordCMO() throw() : pMaterial(nullptr) {}
};
// Helper for creating a D3D input layout.

2
Src/ModelLoadSDKMESH.cpp
Просмотреть файл

@ -38,7 +38,7 @@ namespace
std::shared_ptr<IEffect> effect;
bool alpha;
MaterialRecordSDKMESH() DIRECTX_NOEXCEPT : alpha(false) {}
MaterialRecordSDKMESH() throw() : alpha(false) {}
};
void LoadMaterial(const DXUT::SDKMESH_MATERIAL& mh,

4
Src/Mouse.cpp
Просмотреть файл

@ -1025,7 +1025,7 @@ Mouse::Mouse()
// Move constructor.
Mouse::Mouse(Mouse&& moveFrom) DIRECTX_NOEXCEPT
Mouse::Mouse(Mouse&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
pImpl->mOwner = this;
@ -1033,7 +1033,7 @@ Mouse::Mouse(Mouse&& moveFrom) DIRECTX_NOEXCEPT
// Move assignment.
Mouse& Mouse::operator= (Mouse&& moveFrom) DIRECTX_NOEXCEPT
Mouse& Mouse::operator= (Mouse&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
pImpl->mOwner = this;

4
Src/NormalMapEffect.cpp
Просмотреть файл

@ -252,14 +252,14 @@ NormalMapEffect::NormalMapEffect(_In_ ID3D11Device* device)
// Move constructor.
NormalMapEffect::NormalMapEffect(NormalMapEffect&& moveFrom) DIRECTX_NOEXCEPT
NormalMapEffect::NormalMapEffect(NormalMapEffect&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
NormalMapEffect& NormalMapEffect::operator= (NormalMapEffect&& moveFrom) DIRECTX_NOEXCEPT
NormalMapEffect& NormalMapEffect::operator= (NormalMapEffect&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/PBREffect.cpp
Просмотреть файл

@ -292,14 +292,14 @@ PBREffect::PBREffect(_In_ ID3D11Device* device)
// Move constructor.
PBREffect::PBREffect(PBREffect&& moveFrom) DIRECTX_NOEXCEPT
PBREffect::PBREffect(PBREffect&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
PBREffect& PBREffect::operator= (PBREffect&& moveFrom) DIRECTX_NOEXCEPT
PBREffect& PBREffect::operator= (PBREffect&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/PrimitiveBatch.cpp
Просмотреть файл

@ -406,14 +406,14 @@ PrimitiveBatchBase::PrimitiveBatchBase(_In_ ID3D11DeviceContext* deviceContext,
// Move constructor.
PrimitiveBatchBase::PrimitiveBatchBase(PrimitiveBatchBase&& moveFrom) DIRECTX_NOEXCEPT
PrimitiveBatchBase::PrimitiveBatchBase(PrimitiveBatchBase&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
PrimitiveBatchBase& PrimitiveBatchBase::operator= (PrimitiveBatchBase&& moveFrom) DIRECTX_NOEXCEPT
PrimitiveBatchBase& PrimitiveBatchBase::operator= (PrimitiveBatchBase&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/SkinnedEffect.cpp
Просмотреть файл

@ -363,14 +363,14 @@ SkinnedEffect::SkinnedEffect(_In_ ID3D11Device* device)
// Move constructor.
SkinnedEffect::SkinnedEffect(SkinnedEffect&& moveFrom) DIRECTX_NOEXCEPT
SkinnedEffect::SkinnedEffect(SkinnedEffect&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
SkinnedEffect& SkinnedEffect::operator= (SkinnedEffect&& moveFrom) DIRECTX_NOEXCEPT
SkinnedEffect& SkinnedEffect::operator= (SkinnedEffect&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/SpriteBatch.cpp
Просмотреть файл

@ -1013,14 +1013,14 @@ SpriteBatch::SpriteBatch(_In_ ID3D11DeviceContext* deviceContext)
// Move constructor.
SpriteBatch::SpriteBatch(SpriteBatch&& moveFrom) DIRECTX_NOEXCEPT
SpriteBatch::SpriteBatch(SpriteBatch&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
SpriteBatch& SpriteBatch::operator= (SpriteBatch&& moveFrom) DIRECTX_NOEXCEPT
SpriteBatch& SpriteBatch::operator= (SpriteBatch&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/SpriteFont.cpp
Просмотреть файл

@ -250,14 +250,14 @@ SpriteFont::SpriteFont(ID3D11ShaderResourceView* texture, Glyph const* glyphs, s
// Move constructor.
SpriteFont::SpriteFont(SpriteFont&& moveFrom) DIRECTX_NOEXCEPT
SpriteFont::SpriteFont(SpriteFont&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
SpriteFont& SpriteFont::operator= (SpriteFont&& moveFrom) DIRECTX_NOEXCEPT
SpriteFont& SpriteFont::operator= (SpriteFont&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

4
Src/ToneMapPostProcess.cpp
Просмотреть файл

@ -351,14 +351,14 @@ ToneMapPostProcess::ToneMapPostProcess(_In_ ID3D11Device* device)
// Move constructor.
ToneMapPostProcess::ToneMapPostProcess(ToneMapPostProcess&& moveFrom) DIRECTX_NOEXCEPT
ToneMapPostProcess::ToneMapPostProcess(ToneMapPostProcess&& moveFrom) throw()
: pImpl(std::move(moveFrom.pImpl))
{
}
// Move assignment.
ToneMapPostProcess& ToneMapPostProcess::operator= (ToneMapPostProcess&& moveFrom) DIRECTX_NOEXCEPT
ToneMapPostProcess& ToneMapPostProcess::operator= (ToneMapPostProcess&& moveFrom) throw()
{
pImpl = std::move(moveFrom.pImpl);
return *this;

2
XWBTool/xwbtool.cpp
Просмотреть файл

@ -808,7 +808,7 @@ struct WaveFile
MINIWAVEFORMAT miniFmt;
std::unique_ptr<uint8_t[]> waveData;
WaveFile() : conv(0), miniFmt{} { memset(&data, 0, sizeof(data)); }
WaveFile() throw() : conv(0), miniFmt{} { memset(&data, 0, sizeof(data)); }
#if defined(_MSC_VER) && (_MSC_VER < 1900)
// VS 2013 does not perform impliclit creation of move construtors nor does it support =default,