Make Sdf_LayerRegistry::FindByIdentifier private

PixarAnimationStudios · Aug 15, 2023 · 4ca2387 · 4ca2387
1 parent 55a02f3
commit 4ca2387
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/pxr/usd/sdf/layer.cpp b/pxr/usd/sdf/layer.cpp
@@ -3328,8 +3328,8 @@ SdfLayer::_OpenLayerAndUnlockRegistry(
     // initialization.  But now that the layer is in the registry, we release
     // the registry lock to avoid blocking progress of threads working with
     // other layers.
-    TF_VERIFY(_layerRegistry->
-              FindByIdentifier(layer->GetIdentifier()) == layer,
+    TF_VERIFY(_layerRegistry->Find(layer->GetIdentifier(),
+                                   layer->GetResolvedPath()) == layer,
               "Could not find %s", layer->GetIdentifier().c_str());
 
     lock.release();

diff --git a/pxr/usd/sdf/layerRegistry.cpp b/pxr/usd/sdf/layerRegistry.cpp
@@ -178,7 +178,7 @@ Sdf_LayerRegistry::Find(
     SdfLayerHandle foundLayer;
 
     if (Sdf_IsAnonLayerIdentifier(inputLayerPath)) {
-        foundLayer = FindByIdentifier(inputLayerPath);
+        foundLayer = _FindByIdentifier(inputLayerPath);
     } else {
         ArResolver& resolver = ArGetResolver();
 
@@ -190,7 +190,7 @@ Sdf_LayerRegistry::Find(
         string assetPath, args;
         Sdf_SplitIdentifier(inputLayerPath, &assetPath, &args);
         if (!resolver.IsContextDependentPath(assetPath)) {
-            foundLayer = FindByIdentifier(layerPath);
+            foundLayer = _FindByIdentifier(layerPath);
         }
 
         // If the layer path is in repository form and we haven't yet
@@ -218,7 +218,7 @@ Sdf_LayerRegistry::Find(
 }
 
 SdfLayerHandle
-Sdf_LayerRegistry::FindByIdentifier(
+Sdf_LayerRegistry::_FindByIdentifier(
     const string& layerPath) const
 {
     TRACE_FUNCTION();
@@ -232,7 +232,7 @@ Sdf_LayerRegistry::FindByIdentifier(
         foundLayer = *identifierIt;
 
     TF_DEBUG(SDF_LAYER).Msg(
-        "Sdf_LayerRegistry::FindByIdentifier('%s') => %s\n",
+        "Sdf_LayerRegistry::_FindByIdentifier('%s') => %s\n",
         layerPath.c_str(),
         foundLayer ? "Found" : "Not Found");
 

diff --git a/pxr/usd/sdf/layerRegistry.h b/pxr/usd/sdf/layerRegistry.h
@@ -71,15 +71,14 @@ class Sdf_LayerRegistry
     SdfLayerHandle Find(const std::string &layerPath,
                         const std::string &resolvedPath=std::string()) const;
 
-    /// Returns a layer from the registry, consulting the by_identifier index
-    /// with the \p layerPath as provided.
-    SdfLayerHandle FindByIdentifier(const std::string& layerPath) const;
-
     /// Returns all valid layers held in the registry as a set.
     SdfLayerHandleSet GetLayers() const;
 
 private:
-
+    /// Returns a layer from the registry, consulting the by_identifier index
+    /// with the \p layerPath as provided.
+    SdfLayerHandle _FindByIdentifier(const std::string& layerPath) const;
+
     // Returns a layer from the registry, consulting the by_repository_path
     // index with the \p layerPath as provided.
     SdfLayerHandle _FindByRepositoryPath(const std::string& layerPath) const;