Skip to content
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

Jump to bottom

DM-12594: Remove daf::base::Citizen #23

Merged
merged 2 commits into from
Jul 1, 2019
Merged

DM-12594: Remove daf::base::Citizen #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37963ef
Remove use of daf.base.Citizen
parejkoj Apr 17, 2019
12b90c0
clang-format on pex_policy .h and .cc files
parejkoj Apr 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 5 additions & 9 deletions include/lsst/pex/policy/DefaultPolicyFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ namespace policy {
*/
class DefaultPolicyFile : public PolicyFile {
public:

/**
* define a default policy file
* @param productName the name of the product that the default
Expand All @@ -86,10 +85,8 @@ class DefaultPolicyFile : public PolicyFile {
* be incomplete. This is identical to the strict
* argument to Policy's loadPolicyFiles().
*/
DefaultPolicyFile(const char* const productName,
const std::string& filepath,
const std::string& repos="",
bool strict=true);
DefaultPolicyFile(const char* const productName, const std::string& filepath,
const std::string& repos = "", bool strict = true);

/**
* return the file path to the installation directory of a given
Expand All @@ -115,7 +112,6 @@ class DefaultPolicyFile : public PolicyFile {
*/
static boost::filesystem::path installPathFor(const char* const productName);


/**
* load the data from this Policy source into a Policy object. This
* implementation will automatically de-reference any file include
Expand All @@ -132,8 +128,8 @@ class DefaultPolicyFile : public PolicyFile {
bool _strict;
};

}}} // end namespace lsst::pex::policy


} // namespace policy
} // namespace pex
} // namespace lsst

#endif