Skip to content

Commit fef4fa4

Browse files
committed
Merge pull request #3355 from furby-tm/wabi-clang-overrides
Compiler Warnings: Overrides a member function but is not marked override (Internal change: 2351232)
2 parents d41039b + 1463d06 commit fef4fa4

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

pxr/usd/usdUtils/assetLocalizationDelegate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ class UsdUtils_ReadOnlyLocalizationDelegate
277277

278278
virtual std::vector<std::string> ProcessPayloads(
279279
const SdfLayerRefPtr &layer,
280-
const SdfPrimSpecHandle &primSpec);
280+
const SdfPrimSpecHandle &primSpec) override;
281281

282282
virtual std::vector<std::string> ProcessReferences(
283283
const SdfLayerRefPtr &layer,

pxr/usdImaging/usdImaging/cylinderLightAdapter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ class UsdImagingCylinderLightAdapter : public UsdImagingLightAdapter {
4949
USDIMAGING_API
5050
virtual SdfPath Populate(UsdPrim const& prim,
5151
UsdImagingIndexProxy* index,
52-
UsdImagingInstancerContext const* instancerContext = NULL);
52+
UsdImagingInstancerContext const* instancerContext = NULL) override;
5353

5454
USDIMAGING_API
55-
virtual bool IsSupported(UsdImagingIndexProxy const* index) const;
55+
virtual bool IsSupported(UsdImagingIndexProxy const* index) const override;
5656

5757
protected:
5858
virtual void _RemovePrim(SdfPath const& cachePath,

pxr/usdImaging/usdImaging/portalLightAdapter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ class UsdImagingPortalLightAdapter : public UsdImagingLightAdapter {
3636
USDIMAGING_API
3737
virtual SdfPath Populate(UsdPrim const& prim,
3838
UsdImagingIndexProxy* index,
39-
UsdImagingInstancerContext const* instancerContext = NULL);
39+
UsdImagingInstancerContext const* instancerContext = NULL) override;
4040

4141
USDIMAGING_API
42-
virtual bool IsSupported(UsdImagingIndexProxy const* index) const;
42+
virtual bool IsSupported(UsdImagingIndexProxy const* index) const override;
4343

4444
// ---------------------------------------------------------------------- //
4545
/// \name Scene Index Support

pxr/usdImaging/usdImaging/tetMeshAdapter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class UsdImagingTetMeshAdapter : public UsdImagingGprimAdapter
8181
SdfPath const& cachePath,
8282
HdDirtyBits* timeVaryingBits,
8383
UsdImagingInstancerContext const*
84-
instancerContext = nullptr) const;
84+
instancerContext = nullptr) const override;
8585

8686
// ---------------------------------------------------------------------- //
8787
/// \name Change Processing

0 commit comments

Comments
 (0)