From 14ea7801767bf10c859adcb6539b0425e2286aab Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Wed, 30 May 2012 16:40:49 -0700 Subject: [PATCH] And now it even compiles after my earlier changes. --- src/input/readers/Raw.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/input/readers/Raw.cc b/src/input/readers/Raw.cc index c0da4969aa..f6e61a906e 100644 --- a/src/input/readers/Raw.cc +++ b/src/input/readers/Raw.cc @@ -39,9 +39,7 @@ Raw::~Raw() void Raw::DoClose() { if ( file != 0 ) - { - Close(); - } + CloseInput(); } bool Raw::OpenInput() @@ -140,11 +138,13 @@ bool Raw::DoInit(string path, ReaderMode mode, int num_fields, const Field* cons return false; } - result = Open(); + result = OpenInput(); - } else { + } + else + { execute = false; - result = Open(); + result = OpenInput(); } if ( result == false ) @@ -213,8 +213,8 @@ bool Raw::DoUpdate() break; } - Close(); - if ( ! Open() ) + CloseInput(); + if ( ! OpenInput() ) return false; break;