Skip to content

Commit

Permalink
Merge branch 'general_resource_locator_api' of github.com:johnwason/t…
Browse files Browse the repository at this point in the history
…esseract into general_resource_locator_api
  • Loading branch information
johnwason committed Jan 9, 2025
2 parents 9ce438e + 8bd4412 commit ed8fb7d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tesseract_common/include/tesseract_common/resource_locator.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ class GeneralResourceLocator : public ResourceLocator
* @param paths A vector of paths to search for resources
* @param environment_variables A vector of environment variables to search for paths
*/
GeneralResourceLocator(const std::vector<tesseract_common::fs::path>& paths, const std::vector<std::string>& environment_variables = {"TESSERACT_RESOURCE_PATH", "ROS_PACKAGE_PATH"});
GeneralResourceLocator(const std::vector<tesseract_common::fs::path>& paths,
const std::vector<std::string>& environment_variables = {"TESSERACT_RESOURCE_PATH", "ROS_PACKAGE_PATH"});
GeneralResourceLocator(const GeneralResourceLocator&) = default;
GeneralResourceLocator& operator=(const GeneralResourceLocator&) = default;
GeneralResourceLocator(GeneralResourceLocator&&) = default;
Expand Down

0 comments on commit ed8fb7d

Please sign in to comment.