Replace `unimpl` comments with `= delete`.
A handful of `unimpl`ed copy constructors were actually supplied as
{} instead of being left unimplemented, but they were not actually used.
Change-Id: I9b88173aeb0cc87f793ee40dfba1b5e5a06d7497
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/308565
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
diff --git a/src/gpu/GrBaseContextPriv.h b/src/gpu/GrBaseContextPriv.h
index 8a08d7a..d22f71b 100644
--- a/src/gpu/GrBaseContextPriv.h
+++ b/src/gpu/GrBaseContextPriv.h
@@ -33,8 +33,8 @@
private:
explicit GrBaseContextPriv(GrContext_Base* context) : fContext(context) {}
- GrBaseContextPriv(const GrBaseContextPriv&); // unimpl
- GrBaseContextPriv& operator=(const GrBaseContextPriv&); // unimpl
+ GrBaseContextPriv(const GrBaseContextPriv&) = delete;
+ GrBaseContextPriv& operator=(const GrBaseContextPriv&) = delete;
// No taking addresses of this type.
const GrBaseContextPriv* operator&() const;
diff --git a/src/gpu/GrContextPriv.h b/src/gpu/GrContextPriv.h
index 33accb4..d1cfe8e 100644
--- a/src/gpu/GrContextPriv.h
+++ b/src/gpu/GrContextPriv.h
@@ -162,8 +162,8 @@
private:
explicit GrContextPriv(GrContext* context) : fContext(context) {}
- GrContextPriv(const GrContextPriv&); // unimpl
- GrContextPriv& operator=(const GrContextPriv&); // unimpl
+ GrContextPriv(const GrContextPriv&) = delete;
+ GrContextPriv& operator=(const GrContextPriv&) = delete;
// No taking addresses of this type.
const GrContextPriv* operator&() const;
diff --git a/src/gpu/GrGpuResourceCacheAccess.h b/src/gpu/GrGpuResourceCacheAccess.h
index 0e52884..d90b66e 100644
--- a/src/gpu/GrGpuResourceCacheAccess.h
+++ b/src/gpu/GrGpuResourceCacheAccess.h
@@ -81,7 +81,7 @@
CacheAccess(GrGpuResource* resource) : fResource(resource) {}
CacheAccess(const CacheAccess& that) : fResource(that.fResource) {}
- CacheAccess& operator=(const CacheAccess&); // unimpl
+ CacheAccess& operator=(const CacheAccess&) = delete;
// No taking addresses of this type.
const CacheAccess* operator&() const = delete;
diff --git a/src/gpu/GrGpuResourcePriv.h b/src/gpu/GrGpuResourcePriv.h
index d9e90bb..396eaa0 100644
--- a/src/gpu/GrGpuResourcePriv.h
+++ b/src/gpu/GrGpuResourcePriv.h
@@ -75,7 +75,7 @@
protected:
ResourcePriv(GrGpuResource* resource) : fResource(resource) { }
ResourcePriv(const ResourcePriv& that) : fResource(that.fResource) {}
- ResourcePriv& operator=(const CacheAccess&); // unimpl
+ ResourcePriv& operator=(const CacheAccess&) = delete;
// No taking addresses of this type.
const ResourcePriv* operator&() const;
diff --git a/src/gpu/GrImageContextPriv.h b/src/gpu/GrImageContextPriv.h
index ea7c740..aa7c4c3 100644
--- a/src/gpu/GrImageContextPriv.h
+++ b/src/gpu/GrImageContextPriv.h
@@ -39,8 +39,8 @@
private:
explicit GrImageContextPriv(GrImageContext* context) : fContext(context) {}
- GrImageContextPriv(const GrImageContextPriv&); // unimpl
- GrImageContextPriv& operator=(const GrImageContextPriv&); // unimpl
+ GrImageContextPriv(const GrImageContextPriv&) = delete;
+ GrImageContextPriv& operator=(const GrImageContextPriv&) = delete;
// No taking addresses of this type.
const GrImageContextPriv* operator&() const;
diff --git a/src/gpu/GrRecordingContextPriv.h b/src/gpu/GrRecordingContextPriv.h
index 75b6782..cf4c795 100644
--- a/src/gpu/GrRecordingContextPriv.h
+++ b/src/gpu/GrRecordingContextPriv.h
@@ -115,8 +115,8 @@
private:
explicit GrRecordingContextPriv(GrRecordingContext* context) : fContext(context) {}
- GrRecordingContextPriv(const GrRecordingContextPriv&); // unimpl
- GrRecordingContextPriv& operator=(const GrRecordingContextPriv&); // unimpl
+ GrRecordingContextPriv(const GrRecordingContextPriv&) = delete;
+ GrRecordingContextPriv& operator=(const GrRecordingContextPriv&) = delete;
// No taking addresses of this type.
const GrRecordingContextPriv* operator&() const;
diff --git a/src/gpu/GrRenderTargetContextPriv.h b/src/gpu/GrRenderTargetContextPriv.h
index 3ae6dc3..d1aa908 100644
--- a/src/gpu/GrRenderTargetContextPriv.h
+++ b/src/gpu/GrRenderTargetContextPriv.h
@@ -116,8 +116,8 @@
private:
explicit GrRenderTargetContextPriv(GrRenderTargetContext* renderTargetContext)
: fRenderTargetContext(renderTargetContext) {}
- GrRenderTargetContextPriv(const GrRenderTargetContextPriv&) {} // unimpl
- GrRenderTargetContextPriv& operator=(const GrRenderTargetContextPriv&); // unimpl
+ GrRenderTargetContextPriv(const GrRenderTargetContextPriv&) = delete;
+ GrRenderTargetContextPriv& operator=(const GrRenderTargetContextPriv&) = delete;
// No taking addresses of this type.
const GrRenderTargetContextPriv* operator&() const;
diff --git a/src/gpu/GrRenderTargetProxyPriv.h b/src/gpu/GrRenderTargetProxyPriv.h
index 091e4f2..b37ac2d 100644
--- a/src/gpu/GrRenderTargetProxyPriv.h
+++ b/src/gpu/GrRenderTargetProxyPriv.h
@@ -29,8 +29,8 @@
private:
explicit GrRenderTargetProxyPriv(GrRenderTargetProxy* renderTargetProxy)
: fRenderTargetProxy(renderTargetProxy) {}
- GrRenderTargetProxyPriv(const GrRenderTargetProxyPriv&) {} // unimpl
- GrRenderTargetProxyPriv& operator=(const GrRenderTargetProxyPriv&); // unimpl
+ GrRenderTargetProxyPriv(const GrRenderTargetProxyPriv&) = delete;
+ GrRenderTargetProxyPriv& operator=(const GrRenderTargetProxyPriv&) = delete;
// No taking addresses of this type.
const GrRenderTargetProxyPriv* operator&() const;
diff --git a/src/gpu/GrResourceCache.h b/src/gpu/GrResourceCache.h
index 23639dc..0f6ed61 100644
--- a/src/gpu/GrResourceCache.h
+++ b/src/gpu/GrResourceCache.h
@@ -373,7 +373,7 @@
private:
ResourceAccess(GrResourceCache* cache) : fCache(cache) { }
ResourceAccess(const ResourceAccess& that) : fCache(that.fCache) { }
- ResourceAccess& operator=(const ResourceAccess&); // unimpl
+ ResourceAccess& operator=(const ResourceAccess&) = delete;
/**
* Insert a resource into the cache.
diff --git a/src/gpu/GrResourceProviderPriv.h b/src/gpu/GrResourceProviderPriv.h
index a440f95..feeca34 100644
--- a/src/gpu/GrResourceProviderPriv.h
+++ b/src/gpu/GrResourceProviderPriv.h
@@ -19,8 +19,8 @@
private:
explicit GrResourceProviderPriv(GrResourceProvider* provider) : fResourceProvider(provider) {}
- GrResourceProviderPriv(const GrResourceProviderPriv&); // unimpl
- GrResourceProviderPriv& operator=(const GrResourceProviderPriv&); // unimpl
+ GrResourceProviderPriv(const GrResourceProviderPriv&) = delete;
+ GrResourceProviderPriv& operator=(const GrResourceProviderPriv&) = delete;
// No taking addresses of this type.
const GrResourceProviderPriv* operator&() const;
diff --git a/src/gpu/GrSurfaceContextPriv.h b/src/gpu/GrSurfaceContextPriv.h
index 33d2aa7..27d4a8c 100644
--- a/src/gpu/GrSurfaceContextPriv.h
+++ b/src/gpu/GrSurfaceContextPriv.h
@@ -22,8 +22,8 @@
: fSurfaceContext(surfaceContext) {
}
- GrSurfaceContextPriv(const GrSurfaceContextPriv&) {} // unimpl
- GrSurfaceContextPriv& operator=(const GrSurfaceContextPriv&); // unimpl
+ GrSurfaceContextPriv(const GrSurfaceContextPriv&) = delete;
+ GrSurfaceContextPriv& operator=(const GrSurfaceContextPriv&) = delete;
// No taking addresses of this type.
const GrSurfaceContextPriv* operator&() const;
diff --git a/src/gpu/GrSurfaceProxyPriv.h b/src/gpu/GrSurfaceProxyPriv.h
index 20f6412..4384043 100644
--- a/src/gpu/GrSurfaceProxyPriv.h
+++ b/src/gpu/GrSurfaceProxyPriv.h
@@ -42,8 +42,8 @@
private:
explicit GrSurfaceProxyPriv(GrSurfaceProxy* proxy) : fProxy(proxy) {}
- GrSurfaceProxyPriv(const GrSurfaceProxyPriv&) {} // unimpl
- GrSurfaceProxyPriv& operator=(const GrSurfaceProxyPriv&); // unimpl
+ GrSurfaceProxyPriv(const GrSurfaceProxyPriv&) = delete;
+ GrSurfaceProxyPriv& operator=(const GrSurfaceProxyPriv&) = delete;
// No taking addresses of this type.
const GrSurfaceProxyPriv* operator&() const;
diff --git a/src/gpu/GrTextureProxyCacheAccess.h b/src/gpu/GrTextureProxyCacheAccess.h
index 26478c6..2590131 100644
--- a/src/gpu/GrTextureProxyCacheAccess.h
+++ b/src/gpu/GrTextureProxyCacheAccess.h
@@ -24,8 +24,8 @@
}
explicit CacheAccess(GrTextureProxy* textureProxy) : fTextureProxy(textureProxy) {}
- CacheAccess(const CacheAccess&) {} // unimpl
- CacheAccess& operator=(const CacheAccess&); // unimpl
+ CacheAccess(const CacheAccess&) = delete;
+ CacheAccess& operator=(const CacheAccess&) = delete;
// No taking addresses of this type.
const CacheAccess* operator&() const;
diff --git a/src/gpu/GrTextureProxyPriv.h b/src/gpu/GrTextureProxyPriv.h
index 1e64194..42249f6 100644
--- a/src/gpu/GrTextureProxyPriv.h
+++ b/src/gpu/GrTextureProxyPriv.h
@@ -30,8 +30,8 @@
private:
explicit GrTextureProxyPriv(GrTextureProxy* textureProxy) : fTextureProxy(textureProxy) {}
- GrTextureProxyPriv(const GrTextureProxyPriv&) {} // unimpl
- GrTextureProxyPriv& operator=(const GrTextureProxyPriv&); // unimpl
+ GrTextureProxyPriv(const GrTextureProxyPriv&) = delete;
+ GrTextureProxyPriv& operator=(const GrTextureProxyPriv&) = delete;
// No taking addresses of this type.
const GrTextureProxyPriv* operator&() const;