diff options
| author |  Saleem Abdulrasool <compnerd@compnerd.org>
| 2013-02-26 20:13:51 -0800 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org>
| 2013-03-02 08:59:14 -0800 |
| commit | 321addc5fca2ff05a6a8e83dbc90f367e68fd895 (patch) | |
| tree | 8b0fb5cff7828b76a143e287079aacd9b172a74d /src/clients/cave/resolve_common.cc | |
| parent | 3b73c42b7a5d29758a7e42fa5c6a4aa997586b88 (diff) | |
| download | paludis-321addc5fca2ff05a6a8e83dbc90f367e68fd895.tar.gz paludis-321addc5fca2ff05a6a8e83dbc90f367e68fd895.tar.xz | |
initialise extern templates in proper namespace
The declarations for the template instantions are marked as being under paludis.
However, the instantiations were being made without an explict enclosing
namespace, which results in an ambiguity. Explicitly indicate the namespace for
template instantiations.
Diffstat (limited to 'src/clients/cave/resolve_common.cc')
| -rw-r--r-- | src/clients/cave/resolve_common.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc index 00e4c1ce1..630f7e39e 100644 --- a/src/clients/cave/resolve_common.cc +++ b/src/clients/cave/resolve_common.cc @@ -1217,7 +1217,10 @@ paludis::cave::resolve_common( return retcode | 1; } -template class Sequence<std::pair<std::string, std::string> >; -template class WrappedForwardIterator<Sequence<std::pair<std::string, std::string> >::ConstIteratorTag, - const std::pair<std::string, std::string> >; +namespace paludis +{ + template class Sequence<std::pair<std::string, std::string> >; + template class WrappedForwardIterator<Sequence<std::pair<std::string, std::string> >::ConstIteratorTag, + const std::pair<std::string, std::string> >; +} |