Skip to content

Commit 9a9b2e6

Browse files
authored
Fixed antlr win build error (fix leak define ERROR and replace uint to ui32) (#9116)
1 parent b6c969c commit 9a9b2e6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/Cpp/Cpp.stg.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,8 @@ headerFile( LEXER,
278278
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
279279
// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
280280

281+
#include \<ydb/library/yql/parser/proto_ast/proto_ast.h>
282+
281283
/* =============================================================================
282284
* Standard antlr3 C++ runtime definitions
283285
*/
@@ -338,8 +340,6 @@ headerFile( LEXER,
338340
<recognizer.grammar.delegators: {g|class <g.recognizerName>; }; separator="\n">
339341
<endif>
340342

341-
#include \<ydb/library/yql/parser/proto_ast/proto_ast.h>
342-
343343
namespace @LEXER_PARSER_NAMESPACE@ {
344344

345345
<if(LEXER)>

ydb/library/yql/sql/v1/context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ namespace NSQLTranslationV1 {
379379
return Ctx.Token(token);
380380
}
381381

382-
uint UnifiedToken(uint id) const {
382+
ui32 UnifiedToken(ui32 id) const {
383383
return Ctx.Settings.Antlr4Parser + (id << 16);
384384
}
385385

0 commit comments

Comments
 (0)