aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-06-15 17:43:11 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-06-15 17:43:11 +0100
commit738cd1623c5deedd4c3b933ebc5a685a2a3e9b74 (patch)
treea4588acaf2d0a2d752ef61f47b2bc8561e2eaf47
parentde3cd9f9217b344a92a677ac26749fa4c6dfb686 (diff)
downloadpaludis-738cd1623c5deedd4c3b933ebc5a685a2a3e9b74.tar.gz
paludis-738cd1623c5deedd4c3b933ebc5a685a2a3e9b74.tar.xz
Add missing PALUDIS_HAVE_EXTERN_TEMPLATEs
-rw-r--r--paludis/resolver/decisions.hh4
-rw-r--r--paludis/resolver/nag.hh2
-rw-r--r--paludis/resolver/resolutions_by_resolvent.hh2
-rw-r--r--paludis/resolver/resolvent.hh2
-rw-r--r--paludis/resolver/strongly_connected_component.hh2
-rw-r--r--paludis/resolver/work_list.hh4
6 files changed, 16 insertions, 0 deletions
diff --git a/paludis/resolver/decisions.hh b/paludis/resolver/decisions.hh
index 570e8ff..1afd90d 100644
--- a/paludis/resolver/decisions.hh
+++ b/paludis/resolver/decisions.hh
@@ -54,17 +54,21 @@ namespace paludis
bool empty() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
+#ifdef PALUDIS_HAVE_EXTERN_TEMPLATE
extern template class Decisions<UnableToMakeDecision>;
extern template class Decisions<ChangesToMakeDecision>;
extern template class Decisions<ChangeOrRemoveDecision>;
+#endif
}
+#ifdef PALUDIS_HAVE_EXTERN_TEMPLATE
extern template class WrappedForwardIterator<resolver::DecisionsConstIteratorTag<resolver::UnableToMakeDecision>,
const std::tr1::shared_ptr<const resolver::UnableToMakeDecision> >;
extern template class WrappedForwardIterator<resolver::DecisionsConstIteratorTag<resolver::ChangesToMakeDecision>,
const std::tr1::shared_ptr<const resolver::ChangesToMakeDecision> >;
extern template class WrappedForwardIterator<resolver::DecisionsConstIteratorTag<resolver::ChangeOrRemoveDecision>,
const std::tr1::shared_ptr<const resolver::ChangeOrRemoveDecision> >;
+#endif
}
#endif
diff --git a/paludis/resolver/nag.hh b/paludis/resolver/nag.hh
index 3fec99c..5639856 100644
--- a/paludis/resolver/nag.hh
+++ b/paludis/resolver/nag.hh
@@ -72,8 +72,10 @@ namespace paludis
};
}
+#ifdef PALUDIS_HAVE_EXTERN_TEMPLATE
extern template class WrappedForwardIterator<resolver::NAG::EdgesFromConstIteratorTag,
const std::pair<const resolver::Resolvent, resolver::NAGEdgeProperties> >;
+#endif
}
#endif
diff --git a/paludis/resolver/resolutions_by_resolvent.hh b/paludis/resolver/resolutions_by_resolvent.hh
index 98f4b26..cdb6dc6 100644
--- a/paludis/resolver/resolutions_by_resolvent.hh
+++ b/paludis/resolver/resolutions_by_resolvent.hh
@@ -54,8 +54,10 @@ namespace paludis
};
}
+#ifdef PALUDIS_HAVE_EXTERN_TEMPLATE
extern template class WrappedForwardIterator<resolver::ResolutionsByResolvent::ConstIteratorTag,
const std::tr1::shared_ptr<resolver::Resolution> >;
+#endif
}
#endif
diff --git a/paludis/resolver/resolvent.hh b/paludis/resolver/resolvent.hh
index 1c98620..0ab218c 100644
--- a/paludis/resolver/resolvent.hh
+++ b/paludis/resolver/resolvent.hh
@@ -67,8 +67,10 @@ namespace paludis
};
}
+#ifdef PALUDIS_HAVE_EXTERN_TEMPLATE
extern template class Sequence<resolver::Resolvent>;
extern template class WrappedForwardIterator<Sequence<resolver::Resolvent>::ConstIteratorTag, const resolver::Resolvent>;
+#endif
}
#endif
diff --git a/paludis/resolver/strongly_connected_component.hh b/paludis/resolver/strongly_connected_component.hh
index 88170e7..1c76dcf 100644
--- a/paludis/resolver/strongly_connected_component.hh
+++ b/paludis/resolver/strongly_connected_component.hh
@@ -46,12 +46,14 @@ namespace paludis
};
}
+#ifdef PALUDIS_HAVE_EXTERN_TEMPLATE
extern template class Set<resolver::Resolvent>;
extern template class WrappedForwardIterator<Set<resolver::Resolvent>::ConstIteratorTag, const resolver::Resolvent>;
extern template class WrappedOutputIterator<Set<resolver::Resolvent>::InserterTag, resolver::Resolvent>;
extern template class Sequence<resolver::StronglyConnectedComponent>;
extern template class WrappedForwardIterator<Sequence<resolver::StronglyConnectedComponent>::ConstIteratorTag, const resolver::StronglyConnectedComponent>;
+#endif
}
#endif
diff --git a/paludis/resolver/work_list.hh b/paludis/resolver/work_list.hh
index 62f5afe..22437da 100644
--- a/paludis/resolver/work_list.hh
+++ b/paludis/resolver/work_list.hh
@@ -58,14 +58,18 @@ namespace paludis
void serialise(Serialiser &) const;
};
+#ifdef PALUDIS_HAVE_EXTERN_TEMPLATE
extern template class WorkList<PretendWorkItem>;
extern template class WorkList<ExecuteWorkItem>;
+#endif
}
+#ifdef PALUDIS_HAVE_EXTERN_TEMPLATE
extern template class WrappedForwardIterator<resolver::WorkListConstIteratorTag<resolver::PretendWorkItem>,
const std::tr1::shared_ptr<resolver::PretendWorkItem> >;
extern template class WrappedForwardIterator<resolver::WorkListConstIteratorTag<resolver::ExecuteWorkItem>,
const std::tr1::shared_ptr<resolver::ExecuteWorkItem> >;
+#endif
}
#endif