aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2013-02-26 20:13:51 -0800
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2013-03-02 08:59:14 -0800
commit321addc5fca2ff05a6a8e83dbc90f367e68fd895 (patch)
tree8b0fb5cff7828b76a143e287079aacd9b172a74d
parent3b73c42b7a5d29758a7e42fa5c6a4aa997586b88 (diff)
downloadpaludis-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.
-rw-r--r--src/clients/cave/format_string.cc5
-rw-r--r--src/clients/cave/format_user_config.cc5
-rw-r--r--src/clients/cave/resolve_common.cc9
3 files changed, 14 insertions, 5 deletions
diff --git a/src/clients/cave/format_string.cc b/src/clients/cave/format_string.cc
index 25e3a73..4802e9c 100644
--- a/src/clients/cave/format_string.cc
+++ b/src/clients/cave/format_string.cc
@@ -180,5 +180,8 @@ paludis::cave::format_string(
return result;
}
-template class Map<char, std::string>;
+namespace paludis
+{
+ template class Map<char, std::string>;
+}
diff --git a/src/clients/cave/format_user_config.cc b/src/clients/cave/format_user_config.cc
index 3af8a35..2b6f33b 100644
--- a/src/clients/cave/format_user_config.cc
+++ b/src/clients/cave/format_user_config.cc
@@ -123,5 +123,8 @@ FormatUserConfigFile::fetch(const std::string & v, int vi, const std::string & d
return result;
}
-template class Singleton<cave::FormatUserConfigFile>;
+namespace paludis
+{
+ template class Singleton<cave::FormatUserConfigFile>;
+}
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index 00e4c1c..630f7e3 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> >;
+}