aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-10 22:44:17 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-10 22:44:17 +0000
commit91aab14ab6025f71e1553191abd0b5490359f460 (patch)
tree5caa4211f9f556110a4866e57086504cc9e2c13e
parent00ab2c16fd886082b3184b9046d331067b325d5c (diff)
downloadpaludis-91aab14ab6025f71e1553191abd0b5490359f460.tar.gz
paludis-91aab14ab6025f71e1553191abd0b5490359f460.tar.xz
Don't do log via OutputManager for now
-rw-r--r--paludis/repositories/accounts/dummy_accounts_handler.cc1
-rw-r--r--paludis/repositories/e/e_stripper.cc1
-rw-r--r--paludis/repositories/unpackaged/unpackaged_stripper.cc1
-rw-r--r--paludis/util/log.hh11
-rw-r--r--paludis/util/output_manager.hh6
-rw-r--r--paludis/util/standard_output_manager.cc6
-rw-r--r--paludis/util/standard_output_manager.hh3
-rw-r--r--src/clients/cave/cmd_sync.cc5
8 files changed, 7 insertions, 27 deletions
diff --git a/paludis/repositories/accounts/dummy_accounts_handler.cc b/paludis/repositories/accounts/dummy_accounts_handler.cc
index 0c81fa9..3072a0a 100644
--- a/paludis/repositories/accounts/dummy_accounts_handler.cc
+++ b/paludis/repositories/accounts/dummy_accounts_handler.cc
@@ -21,6 +21,7 @@
#include <paludis/util/output_manager.hh>
#include <paludis/package_id.hh>
#include <paludis/repository.hh>
+#include <ostream>
using namespace paludis;
using namespace paludis::accounts_repository;
diff --git a/paludis/repositories/e/e_stripper.cc b/paludis/repositories/e/e_stripper.cc
index 8a008ab..5b6ecfe 100644
--- a/paludis/repositories/e/e_stripper.cc
+++ b/paludis/repositories/e/e_stripper.cc
@@ -22,6 +22,7 @@
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/output_manager.hh>
+#include <ostream>
using namespace paludis;
using namespace paludis::erepository;
diff --git a/paludis/repositories/unpackaged/unpackaged_stripper.cc b/paludis/repositories/unpackaged/unpackaged_stripper.cc
index 7099741..3a98284 100644
--- a/paludis/repositories/unpackaged/unpackaged_stripper.cc
+++ b/paludis/repositories/unpackaged/unpackaged_stripper.cc
@@ -22,6 +22,7 @@
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/output_manager.hh>
+#include <ostream>
using namespace paludis;
using namespace paludis::unpackaged_repositories;
diff --git a/paludis/util/log.hh b/paludis/util/log.hh
index 4a677fb..605af64 100644
--- a/paludis/util/log.hh
+++ b/paludis/util/log.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009 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
@@ -120,6 +120,7 @@ namespace paludis
LogLevel _log_level;
LogContext _log_context;
+ LogMessageHandler(const LogMessageHandler &);
LogMessageHandler(Log * const, const std::string &, const LogLevel, const LogContext);
void operator= (const LogMessageHandler &);
@@ -129,14 +130,6 @@ namespace paludis
///\name Basic operations
///\{
- /**
- * Should really be an rvalue ref, use only for returning a newly
- * constructed message.
- *
- * \since 0.36
- */
- LogMessageHandler(const LogMessageHandler &);
-
~LogMessageHandler();
///\}
diff --git a/paludis/util/output_manager.hh b/paludis/util/output_manager.hh
index a48c9c2..736394d 100644
--- a/paludis/util/output_manager.hh
+++ b/paludis/util/output_manager.hh
@@ -21,7 +21,8 @@
#define PALUDIS_GUARD_PALUDIS_UTIL_OUTPUT_MANAGER_HH 1
#include <paludis/util/output_manager-fwd.hh>
-#include <paludis/util/log.hh>
+#include <paludis/util/attributes.hh>
+#include <paludis/util/instantiation_policy.hh>
#include <iosfwd>
namespace paludis
@@ -35,9 +36,6 @@ namespace paludis
virtual std::ostream & stdout_stream() PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
virtual std::ostream & stderr_stream() PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual LogMessageHandler log_message(const std::string & id, const LogLevel, const LogContext)
- PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
-
/**
* Called if an action succeeds. This can be used to, for example,
* unlink the files behind a to-disk logged output manager.
diff --git a/paludis/util/standard_output_manager.cc b/paludis/util/standard_output_manager.cc
index 4a003b3..b819e6f 100644
--- a/paludis/util/standard_output_manager.cc
+++ b/paludis/util/standard_output_manager.cc
@@ -42,12 +42,6 @@ StandardOutputManager::stderr_stream()
return std::cerr;
}
-LogMessageHandler
-StandardOutputManager::log_message(const std::string & id, const LogLevel l, const LogContext c)
-{
- return Log::get_instance()->message(id, l, c);
-}
-
void
StandardOutputManager::succeeded()
{
diff --git a/paludis/util/standard_output_manager.hh b/paludis/util/standard_output_manager.hh
index 95c1105..8752352 100644
--- a/paludis/util/standard_output_manager.hh
+++ b/paludis/util/standard_output_manager.hh
@@ -35,9 +35,6 @@ namespace paludis
virtual std::ostream & stdout_stream() PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::ostream & stderr_stream() PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual LogMessageHandler log_message(const std::string & id, const LogLevel, const LogContext)
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual void succeeded();
};
}
diff --git a/src/clients/cave/cmd_sync.cc b/src/clients/cave/cmd_sync.cc
index 98e5f27..e404114 100644
--- a/src/clients/cave/cmd_sync.cc
+++ b/src/clients/cave/cmd_sync.cc
@@ -75,11 +75,6 @@ namespace
return std::cerr;
}
- virtual LogMessageHandler log_message(const std::string & id, const LogLevel l, const LogContext c)
- {
- return Log::get_instance()->message(id, l, c);
- }
-
std::tr1::shared_ptr<const Sequence<std::string> > tail(const bool) const
{
return make_shared_ptr(new Sequence<std::string>);