aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-09 17:45:59 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-09 17:45:59 +0000
commit247cea53a2fa7657a959496f66ac013836271f73 (patch)
tree7171ebadace6f342979ddcac1004034c45be75d2
parenta297ce7c92fc48b2e5f7df4a2624c25ddab3b81d (diff)
downloadpaludis-247cea53a2fa7657a959496f66ac013836271f73.tar.gz
paludis-247cea53a2fa7657a959496f66ac013836271f73.tar.xz
Fix icc, 4.3 compiles
-rw-r--r--paludis/hashed_containers.hh5
-rw-r--r--paludis/repositories/e/fix_locked_dependencies_TEST.cc1
-rw-r--r--paludis/repositories/e/package_dep_spec.cc1
-rw-r--r--paludis/user_dep_spec.cc1
-rw-r--r--python/exception.hh3
5 files changed, 9 insertions, 2 deletions
diff --git a/paludis/hashed_containers.hh b/paludis/hashed_containers.hh
index 78f2a90..22e697a 100644
--- a/paludis/hashed_containers.hh
+++ b/paludis/hashed_containers.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -63,6 +63,9 @@
#include <limits>
#include <string>
#include <functional>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
namespace paludis
{
diff --git a/paludis/repositories/e/fix_locked_dependencies_TEST.cc b/paludis/repositories/e/fix_locked_dependencies_TEST.cc
index f25ac3d..255ecc3 100644
--- a/paludis/repositories/e/fix_locked_dependencies_TEST.cc
+++ b/paludis/repositories/e/fix_locked_dependencies_TEST.cc
@@ -24,6 +24,7 @@
#include <paludis/repositories/fake/fake_package_id.hh>
#include <paludis/repositories/fake/fake_repository.hh>
#include <paludis/repositories/fake/fake_installed_repository.hh>
+#include <paludis/util/visitor-impl.hh>
#include <paludis/environments/test/test_environment.hh>
#include <paludis/stringify_formatter.hh>
#include <paludis/package_database.hh>
diff --git a/paludis/repositories/e/package_dep_spec.cc b/paludis/repositories/e/package_dep_spec.cc
index 5ef6c86..4a27a12 100644
--- a/paludis/repositories/e/package_dep_spec.cc
+++ b/paludis/repositories/e/package_dep_spec.cc
@@ -24,6 +24,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/kc.hh>
#include <paludis/util/make_shared_ptr.hh>
+#include <paludis/util/visitor-impl.hh>
#include <paludis/dep_spec.hh>
#include <paludis/version_operator.hh>
#include <paludis/version_spec.hh>
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index 83c46a0..80cc695 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -25,6 +25,7 @@
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/options.hh>
#include <paludis/util/log.hh>
+#include <paludis/util/visitor-impl.hh>
using namespace paludis;
diff --git a/python/exception.hh b/python/exception.hh
index bbaea1c..b4a173f 100644
--- a/python/exception.hh
+++ b/python/exception.hh
@@ -67,12 +67,13 @@ namespace paludis
_longname("paludis." + name),
_e(PyErr_NewException(const_cast<char*>(_longname.c_str()), base, NULL))
{
+ using namespace tr1::placeholders;
PyModule_AddObject(boost::python::detail::current_scope, const_cast<char*>(_name.c_str()), _e);
PyObject * doc_string = PyString_FromString(doc.c_str());
PyObject_SetAttrString(_e, "__doc__", doc_string);
boost::python::register_exception_translator<Ex_>(
tr1::bind(tr1::mem_fn(&RegisteredException<Ex_>::translator),
- this, tr1::placeholders::_1)
+ this, _1)
);
}