Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -1,3 +1,4 @@
// $Id: Svc_Conf_Lexer.cpp 92178 2010-10-08 07:44:20Z olli $
#include "ace/Svc_Conf_Lexer.h"
#if (ACE_USES_CLASSIC_SVC_CONF == 1)
@ -84,8 +85,6 @@ struct ace_yy_buffer_state
#endif /* ACE_USES_WCHAR */
}
ACE_ALLOC_HOOK_DECLARE;
// Input related
char input_[ACE_YY_CONVERSION_SPACE];
size_t index_;
@ -104,8 +103,6 @@ struct ace_yy_buffer_state
#endif /* ACE_USES_WCHAR */
};
ACE_ALLOC_HOOK_DEFINE(ace_yy_buffer_state)
// ******************************************************************
// Global functions
// ******************************************************************
@ -246,9 +243,7 @@ ACE_Svc_Conf_Lexer::input (ACE_Svc_Conf_Param* param,
}
else
{
#ifndef ACE_LACKS_STDERR
ACE_OS::fprintf (stderr, "ERROR: input in scanner failed\n");
#endif
ACE_OS::exit (2);
}
}