From fa7fb792ec7ce494b434cc68fed5a3d2c9328a38 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sun, 26 Jan 2020 17:55:51 -0800 Subject: A bunch of final .h -> .hpp renamings --- Common/interface/BasicFileStream.hpp | 2 +- Common/interface/DataBlobImpl.hpp | 2 +- Common/interface/MemoryFileStream.hpp | 2 +- Common/interface/ObjectBase.h | 87 --------------------------------- Common/interface/ObjectBase.hpp | 87 +++++++++++++++++++++++++++++++++ Common/interface/StringDataBlobImpl.hpp | 2 +- 6 files changed, 91 insertions(+), 91 deletions(-) delete mode 100644 Common/interface/ObjectBase.h create mode 100644 Common/interface/ObjectBase.hpp (limited to 'Common/interface') diff --git a/Common/interface/BasicFileStream.hpp b/Common/interface/BasicFileStream.hpp index 5af379da..4b3698c2 100644 --- a/Common/interface/BasicFileStream.hpp +++ b/Common/interface/BasicFileStream.hpp @@ -32,7 +32,7 @@ #include "../../Primitives/interface/FileStream.h" #include "../../Primitives/interface/DataBlob.h" -#include "ObjectBase.h" +#include "ObjectBase.hpp" #include "FileWrapper.hpp" namespace Diligent diff --git a/Common/interface/DataBlobImpl.hpp b/Common/interface/DataBlobImpl.hpp index 57024043..37161d54 100644 --- a/Common/interface/DataBlobImpl.hpp +++ b/Common/interface/DataBlobImpl.hpp @@ -33,7 +33,7 @@ #include #include "../../Primitives/interface/BasicTypes.h" #include "../../Primitives/interface/DataBlob.h" -#include "ObjectBase.h" +#include "ObjectBase.hpp" namespace Diligent { diff --git a/Common/interface/MemoryFileStream.hpp b/Common/interface/MemoryFileStream.hpp index a2cf2638..41f8ea73 100644 --- a/Common/interface/MemoryFileStream.hpp +++ b/Common/interface/MemoryFileStream.hpp @@ -32,7 +32,7 @@ #include "../../Primitives/interface/FileStream.h" #include "../../Primitives/interface/DataBlob.h" -#include "ObjectBase.h" +#include "ObjectBase.hpp" #include "RefCountedObjectImpl.hpp" #include "RefCntAutoPtr.hpp" diff --git a/Common/interface/ObjectBase.h b/Common/interface/ObjectBase.h deleted file mode 100644 index ceafd2a4..00000000 --- a/Common/interface/ObjectBase.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright 2019-2020 Diligent Graphics LLC - * Copyright 2015-2019 Egor Yusov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#pragma once - -/// \file -/// Implementation of the Diligent::ObjectBase template class - -#include "../../Primitives/interface/Object.h" -#include "RefCountedObjectImpl.hpp" - -namespace Diligent -{ - - -#define IMPLEMENT_QUERY_INTERFACE_BODY(InterfaceID, ParentClassName) \ - { \ - if (ppInterface == nullptr) \ - return; \ - if (IID == InterfaceID) \ - { \ - *ppInterface = this; \ - (*ppInterface)->AddRef(); \ - } \ - else \ - { \ - ParentClassName::QueryInterface(IID, ppInterface); \ - } \ - } - -#define IMPLEMENT_QUERY_INTERFACE(ClassName, InterfaceID, ParentClassName) \ - void ClassName::QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) \ - IMPLEMENT_QUERY_INTERFACE_BODY(InterfaceID, ParentClassName) - -#define IMPLEMENT_QUERY_INTERFACE_IN_PLACE(InterfaceID, ParentClassName) \ - virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override \ - IMPLEMENT_QUERY_INTERFACE_BODY(InterfaceID, ParentClassName) - - -/// Template class implementing base functionality for an object -template -class ObjectBase : public RefCountedObject -{ -public: - ObjectBase(IReferenceCounters* pRefCounters) : - RefCountedObject{pRefCounters} - {} - - virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) - { - if (ppInterface == nullptr) - return; - - *ppInterface = nullptr; - if (IID == IID_Unknown) - { - *ppInterface = this; - (*ppInterface)->AddRef(); - } - } -}; - -} // namespace Diligent diff --git a/Common/interface/ObjectBase.hpp b/Common/interface/ObjectBase.hpp new file mode 100644 index 00000000..ceafd2a4 --- /dev/null +++ b/Common/interface/ObjectBase.hpp @@ -0,0 +1,87 @@ +/* + * Copyright 2019-2020 Diligent Graphics LLC + * Copyright 2015-2019 Egor Yusov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +/// \file +/// Implementation of the Diligent::ObjectBase template class + +#include "../../Primitives/interface/Object.h" +#include "RefCountedObjectImpl.hpp" + +namespace Diligent +{ + + +#define IMPLEMENT_QUERY_INTERFACE_BODY(InterfaceID, ParentClassName) \ + { \ + if (ppInterface == nullptr) \ + return; \ + if (IID == InterfaceID) \ + { \ + *ppInterface = this; \ + (*ppInterface)->AddRef(); \ + } \ + else \ + { \ + ParentClassName::QueryInterface(IID, ppInterface); \ + } \ + } + +#define IMPLEMENT_QUERY_INTERFACE(ClassName, InterfaceID, ParentClassName) \ + void ClassName::QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) \ + IMPLEMENT_QUERY_INTERFACE_BODY(InterfaceID, ParentClassName) + +#define IMPLEMENT_QUERY_INTERFACE_IN_PLACE(InterfaceID, ParentClassName) \ + virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override \ + IMPLEMENT_QUERY_INTERFACE_BODY(InterfaceID, ParentClassName) + + +/// Template class implementing base functionality for an object +template +class ObjectBase : public RefCountedObject +{ +public: + ObjectBase(IReferenceCounters* pRefCounters) : + RefCountedObject{pRefCounters} + {} + + virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) + { + if (ppInterface == nullptr) + return; + + *ppInterface = nullptr; + if (IID == IID_Unknown) + { + *ppInterface = this; + (*ppInterface)->AddRef(); + } + } +}; + +} // namespace Diligent diff --git a/Common/interface/StringDataBlobImpl.hpp b/Common/interface/StringDataBlobImpl.hpp index 58b395cc..3ce85155 100644 --- a/Common/interface/StringDataBlobImpl.hpp +++ b/Common/interface/StringDataBlobImpl.hpp @@ -32,7 +32,7 @@ #include "../../Primitives/interface/BasicTypes.h" #include "../../Primitives/interface/DataBlob.h" -#include "ObjectBase.h" +#include "ObjectBase.hpp" #include namespace Diligent -- cgit v1.2.3