aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-06-17 09:38:37 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-06-17 09:38:37 +0000
commitd9c88232ce9385af1f2b98df5192640a2ab60bf9 (patch)
tree0e6f44ac6fb2a708733b489780b0aded481374a1
parent1899a136fd51e0f20d55b676986d20fb2fe9d0a8 (diff)
downloadpaludis-d9c88232ce9385af1f2b98df5192640a2ab60bf9.tar.gz
paludis-d9c88232ce9385af1f2b98df5192640a2ab60bf9.tar.xz
Tidy up some includes
-rw-r--r--paludis/name.cc1
-rw-r--r--paludis/name.hh7
-rw-r--r--paludis/test_environment.hh2
-rw-r--r--paludis/version_metadata.hh1
-rw-r--r--paludis/version_operator.cc1
-rw-r--r--paludis/version_operator.hh6
-rw-r--r--paludis/version_spec.hh3
7 files changed, 13 insertions, 8 deletions
diff --git a/paludis/name.cc b/paludis/name.cc
index f8ab4a6..7ee2328 100644
--- a/paludis/name.cc
+++ b/paludis/name.cc
@@ -19,6 +19,7 @@
#include <paludis/name.hh>
#include <paludis/util/stringify.hh>
+#include <ostream>
/** \file
* Implementation of name.hh things.
diff --git a/paludis/name.hh b/paludis/name.hh
index ee51041..03f7fcf 100644
--- a/paludis/name.hh
+++ b/paludis/name.hh
@@ -20,14 +20,15 @@
#ifndef PALUDIS_GUARD_PALUDIS_NAME_HH
#define PALUDIS_GUARD_PALUDIS_NAME_HH 1
-#include <ostream>
-#include <string>
+#include <paludis/util/collection.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/smart_record.hh>
-#include <paludis/util/collection.hh>
#include <paludis/util/validated.hh>
+#include <string>
+#include <iosfwd>
+
/** \file
* Declarations for various Name classes.
*
diff --git a/paludis/test_environment.hh b/paludis/test_environment.hh
index 8f04e4b..1051fb5 100644
--- a/paludis/test_environment.hh
+++ b/paludis/test_environment.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_TEST_ENVIRONMENT_HH
#define PALUDIS_GUARD_PALUDIS_TEST_ENVIRONMENT_HH 1
-#include <paludis/package_database.hh>
+#include <paludis/package_database_entry.hh>
#include <paludis/environment.hh>
/** \file
diff --git a/paludis/version_metadata.hh b/paludis/version_metadata.hh
index b0472bf..c5c606b 100644
--- a/paludis/version_metadata.hh
+++ b/paludis/version_metadata.hh
@@ -25,7 +25,6 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/smart_record.hh>
#include <paludis/dep_atom.hh>
-#include <set>
#include <string>
/** \file
diff --git a/paludis/version_operator.cc b/paludis/version_operator.cc
index d646b5c..8d5b554 100644
--- a/paludis/version_operator.cc
+++ b/paludis/version_operator.cc
@@ -19,6 +19,7 @@
#include <paludis/util/stringify.hh>
#include <paludis/version_operator.hh>
+#include <paludis/version_spec.hh>
/** \file
* Implementation for VersionOperator.
diff --git a/paludis/version_operator.hh b/paludis/version_operator.hh
index 83c192a..9231585 100644
--- a/paludis/version_operator.hh
+++ b/paludis/version_operator.hh
@@ -20,11 +20,11 @@
#ifndef PALUDIS_GUARD_PALUDIS_VERSION_OPERATOR_HH
#define PALUDIS_GUARD_PALUDIS_VERSION_OPERATOR_HH 1
-#include <ostream>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/validated.hh>
-#include <paludis/version_spec.hh>
+
#include <string>
+#include <iosfwd>
/** \file
* Declarations for the VersionOperator class.
@@ -34,6 +34,8 @@
namespace paludis
{
+ class VersionSpec;
+
/**
* Represents an operator attached to a VersionSpec.
*
diff --git a/paludis/version_spec.hh b/paludis/version_spec.hh
index 523ac15..9dae108 100644
--- a/paludis/version_spec.hh
+++ b/paludis/version_spec.hh
@@ -20,11 +20,12 @@
#ifndef PALUDIS_GUARD_PALUDIS_VERSION_SPEC_HH
#define PALUDIS_GUARD_PALUDIS_VERSION_SPEC_HH 1
-#include <ostream>
#include <paludis/util/comparison_policy.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/collection.hh>
+
+#include <iosfwd>
#include <string>
/** \file