aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Richard Brown <rbrown@exherbo.org> 2007-01-05 00:05:54 +0000
committerAvatar Richard Brown <rbrown@exherbo.org> 2007-01-05 00:05:54 +0000
commite717dd4662672b9bd2028d175fdd864144e2b7fe (patch)
tree6c152132f8892e125f98fcd276903e6f702a9d98
parent45c91b51680878a6137d885e551a9a64f3680c43 (diff)
downloadpaludis-e717dd4662672b9bd2028d175fdd864144e2b7fe.tar.gz
paludis-e717dd4662672b9bd2028d175fdd864144e2b7fe.tar.xz
Correct DepList enum names.
Fix warning in deps_option_arg.cc.
-rw-r--r--paludis/dep_list/dep_list.cc6
-rw-r--r--paludis/dep_list/dep_list.hh18
-rw-r--r--src/common_args/deps_option_arg.cc2
3 files changed, 14 insertions, 12 deletions
diff --git a/paludis/dep_list/dep_list.cc b/paludis/dep_list/dep_list.cc
index 2d89597..a155c07 100644
--- a/paludis/dep_list/dep_list.cc
+++ b/paludis/dep_list/dep_list.cc
@@ -444,7 +444,7 @@ DepList::AddVisitor::visit(const PackageDepAtom * const a)
can_fall_back = true;
continue;
- case dl_fall_back_last:
+ case last_dl_fall_back:
;
}
@@ -880,7 +880,7 @@ DepList::prefer_installed_over_uninstalled(const PackageDatabaseEntry & installe
case dl_target_set:
continue;
- case dl_target_last:
+ case last_dl_target:
;
}
@@ -920,7 +920,7 @@ DepList::prefer_installed_over_uninstalled(const PackageDatabaseEntry & installe
case dl_reinstall_scm_never:
; /* nothing */
- case dl_reinstall_scm_last:
+ case last_dl_reinstall_scm:
;
}
diff --git a/paludis/dep_list/dep_list.hh b/paludis/dep_list/dep_list.hh
index 6816d95..c1174f4 100644
--- a/paludis/dep_list/dep_list.hh
+++ b/paludis/dep_list/dep_list.hh
@@ -44,7 +44,7 @@ namespace paludis
{
dl_target_package, ///\< A package, so force reinstalls.
dl_target_set, ///\< A set, so don't force reinstalls.
- dl_target_last
+ last_dl_target
};
/**
@@ -57,7 +57,7 @@ namespace paludis
dl_reinstall_never, ///\< Never.
dl_reinstall_always, ///\< Always.
dl_reinstall_if_use_changed, ///\< If a USE flag has changed.
- dl_reinstall_last
+ last_dl_reinstall
};
/**
@@ -70,7 +70,7 @@ namespace paludis
dl_fall_back_as_needed_except_targets,
dl_fall_back_as_needed,
dl_fall_back_never,
- dl_fall_back_last
+ last_dl_fall_back
};
/**
@@ -84,7 +84,7 @@ namespace paludis
dl_reinstall_scm_always,
dl_reinstall_scm_daily,
dl_reinstall_scm_weekly,
- dl_reinstall_scm_last
+ last_dl_reinstall_scm
};
/**
@@ -96,7 +96,7 @@ namespace paludis
{
dl_upgrade_always, ///\< Always.
dl_upgrade_as_needed, ///\< Only as needed.
- dl_upgrade_last
+ last_dl_upgrade
};
/**
@@ -108,7 +108,7 @@ namespace paludis
{
dl_new_slots_always,
dl_new_slots_as_needed,
- dl_new_slots_last
+ last_dl_new_slots
};
/**
@@ -123,7 +123,7 @@ namespace paludis
dl_deps_pre_or_post, ///\< As a pre dependency with fallback to post
dl_deps_post, ///\< As a post dependency
dl_deps_try_post, ///\< As an optional post dependency
- dl_deps_last
+ last_dl_deps
};
/**
@@ -135,7 +135,7 @@ namespace paludis
{
dl_circular_error, ///\< As an error
dl_circular_discard, ///\< Discard them
- dl_circular_last
+ last_dl_circular
};
/**
@@ -148,7 +148,7 @@ namespace paludis
dle_no_deps, ///\< Dependencies have yet to be added
dle_has_pre_deps, ///\< Predependencies have been added
dle_has_all_deps, ///\< All dependencies have been added
- dle_last
+ last_dle
};
#include <paludis/dep_list/dep_list-sr.hh>
diff --git a/src/common_args/deps_option_arg.cc b/src/common_args/deps_option_arg.cc
index 1dde171..573eb44 100644
--- a/src/common_args/deps_option_arg.cc
+++ b/src/common_args/deps_option_arg.cc
@@ -42,6 +42,8 @@ namespace
return "post";
case dl_deps_try_post:
return "try-post";
+ case last_dl_deps:
+ ;
};
throw InternalError(PALUDIS_HERE, "Unexpected DepListDepsOption value");