Skip to content

Remove NonCopyable where unused. #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2022
Merged

Remove NonCopyable where unused. #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/gpgmm/common/Allocator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@
#ifndef GPGMM_COMMON_ALLOCATOR_H_
#define GPGMM_COMMON_ALLOCATOR_H_

#include "gpgmm/utils/NonCopyable.h"

namespace gpgmm {

class AllocatorBase : public NonCopyable {
class AllocatorBase {
public:
AllocatorBase() = default;
virtual ~AllocatorBase() = default;
Expand Down
3 changes: 1 addition & 2 deletions src/gpgmm/common/EventMessage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#include "gpgmm/common/TraceEvent.h"
#include "gpgmm/utils/Log.h"
#include "gpgmm/utils/NonCopyable.h"

#include <sstream>
#include <string>
Expand All @@ -39,7 +38,7 @@ namespace gpgmm {
int ID;
};

class EventMessage : public NonCopyable {
class EventMessage {
public:
EventMessage(const LogSeverity& level,
const char* name,
Expand Down
3 changes: 1 addition & 2 deletions src/gpgmm/common/Memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#ifndef GPGMM_COMMON_MEMORY_H_
#define GPGMM_COMMON_MEMORY_H_

#include "gpgmm/utils/NonCopyable.h"
#include "gpgmm/utils/RefCount.h"

namespace gpgmm {
Expand All @@ -26,7 +25,7 @@ namespace gpgmm {

When memory is sub-allocated, it will have a non-zero refcount.
*/
class MemoryBase : public NonCopyable {
class MemoryBase {
public:
/** \brief Constructs a memory object of the specified size and alignment.

Expand Down
3 changes: 2 additions & 1 deletion src/gpgmm/d3d12/IUnknownImplD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@
#define GPGMM_D3D12_IUNKNOWNIMPLD3D12_H_

#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/utils/NonCopyable.h"
#include "gpgmm/utils/RefCount.h"
#include "include/gpgmm_export.h"

namespace gpgmm::d3d12 {

class GPGMM_EXPORT IUnknownImpl : public IUnknown {
class GPGMM_EXPORT IUnknownImpl : public IUnknown, public NonCopyable {
public:
IUnknownImpl();
virtual ~IUnknownImpl() = default;
Expand Down
2 changes: 0 additions & 2 deletions src/gpgmm/d3d12/ResourceAllocationD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "gpgmm/d3d12/DebugObjectD3D12.h"
#include "gpgmm/d3d12/IUnknownImplD3D12.h"
#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/utils/NonCopyable.h"
#include "include/gpgmm_export.h"

namespace gpgmm::d3d12 {
Expand Down Expand Up @@ -91,7 +90,6 @@ namespace gpgmm::d3d12 {
operations with it (eg. Map, Unmap, etc).
*/
class GPGMM_EXPORT ResourceAllocation final : public MemoryAllocation,
public NonCopyable,
public DebugObject,
public IUnknownImpl {
public:
Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ namespace gpgmm::d3d12 {
}

// RAII wrapper to lock/unlock heap from the residency cache.
class ScopedResidencyLock final : public NonCopyable {
class ScopedResidencyLock final {
public:
ScopedResidencyLock(ResidencyManager* const residencyManager, Heap* const heap)
: mResidencyManager(residencyManager), mHeap(heap) {
Expand Down