aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-11-02 12:17:07 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-11-02 12:17:07 +0000
commit257cefbcd37fa70a43c92df28fb16bb1fc39547b (patch)
treebebc8d7ef74aee5e7782f8983838df57a36b8019
parent84fb91b72e00c95914c24f15be24139bef11d733 (diff)
downloadpaludis-257cefbcd37fa70a43c92df28fb16bb1fc39547b.tar.gz
paludis-257cefbcd37fa70a43c92df28fb16bb1fc39547b.tar.xz
Don't use the icky C EOF macro.
-rw-r--r--paludis/util/fd_output_stream.hh4
-rw-r--r--paludis/util/tail_output_stream.cc2
-rw-r--r--paludis/util/tee_output_stream.hh2
3 files changed, 4 insertions, 4 deletions
diff --git a/paludis/util/fd_output_stream.hh b/paludis/util/fd_output_stream.hh
index 15d0255..ab818c4 100644
--- a/paludis/util/fd_output_stream.hh
+++ b/paludis/util/fd_output_stream.hh
@@ -55,11 +55,11 @@ namespace paludis
virtual int_type
overflow(int_type c)
{
- if (c != EOF)
+ if (c != traits_type::eof())
{
char z = c;
if (1 != write(fd, &z, 1))
- return EOF;
+ return traits_type::eof();
}
return c;
}
diff --git a/paludis/util/tail_output_stream.cc b/paludis/util/tail_output_stream.cc
index b993285..85a50b7 100644
--- a/paludis/util/tail_output_stream.cc
+++ b/paludis/util/tail_output_stream.cc
@@ -59,7 +59,7 @@ TailOutputStreamBuf::~TailOutputStreamBuf()
TailOutputStreamBuf::int_type
TailOutputStreamBuf::overflow(int_type c)
{
- if (c != EOF)
+ if (c != traits_type::eof())
_append(std::string(1, c));
return c;
}
diff --git a/paludis/util/tee_output_stream.hh b/paludis/util/tee_output_stream.hh
index 0df44df..f3a736c 100644
--- a/paludis/util/tee_output_stream.hh
+++ b/paludis/util/tee_output_stream.hh
@@ -37,7 +37,7 @@ namespace paludis
virtual int_type
overflow(int_type c)
{
- if (c != EOF)
+ if (c != traits_type::eof())
{
s1->put(c);
s2->put(c);