And now it even compiles after my earlier changes.

This commit is contained in:
Robin Sommer 2012-05-30 16:40:49 -07:00
parent b2b8df0ddd
commit 14ea780176

View file

@ -39,9 +39,7 @@ Raw::~Raw()
void Raw::DoClose() void Raw::DoClose()
{ {
if ( file != 0 ) if ( file != 0 )
{ CloseInput();
Close();
}
} }
bool Raw::OpenInput() bool Raw::OpenInput()
@ -140,11 +138,13 @@ bool Raw::DoInit(string path, ReaderMode mode, int num_fields, const Field* cons
return false; return false;
} }
result = Open(); result = OpenInput();
} else { }
else
{
execute = false; execute = false;
result = Open(); result = OpenInput();
} }
if ( result == false ) if ( result == false )
@ -213,8 +213,8 @@ bool Raw::DoUpdate()
break; break;
} }
Close(); CloseInput();
if ( ! Open() ) if ( ! OpenInput() )
return false; return false;
break; break;