diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-09-12 14:21:11 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-09-12 14:21:11 +0200 |
| commit | fc9f1daa0db82ece7a36608db0bc66a9f44879a2 (patch) | |
| tree | 46e7a633e98cfb931d9d55156b4debba42fc6396 /crawl-ref/source/prebuilt | |
| parent | 3cae589e6502cf1426fa278b036f9e64cfa21388 (diff) | |
| download | crawl-ref-fc9f1daa0db82ece7a36608db0bc66a9f44879a2.tar.gz crawl-ref-fc9f1daa0db82ece7a36608db0bc66a9f44879a2.zip | |
Rebuild prebuilt yaccage.
Updates: std::-cide, a recursive crash fix.
Diffstat (limited to 'crawl-ref/source/prebuilt')
| -rw-r--r-- | crawl-ref/source/prebuilt/levcomp.lex.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/prebuilt/levcomp.tab.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/prebuilt/levcomp.lex.cc b/crawl-ref/source/prebuilt/levcomp.lex.cc index dc98c97c51..ad722100ec 100644 --- a/crawl-ref/source/prebuilt/levcomp.lex.cc +++ b/crawl-ref/source/prebuilt/levcomp.lex.cc @@ -1807,7 +1807,7 @@ char *yytext; static bool alloced = false; -std::queue<const char *> free_queue; +queue<const char *> free_queue; static void flush_free_queue(unsigned int max_allowed) { @@ -1907,7 +1907,7 @@ static void cattext(bool trim_right = false, int strip_trailing = 0) bool was_alloced = alloced; char *newbuf = (char*) malloc(strlen(yylval.text) + strlen(yytext) + 1); if (!newbuf) - end(1, "Out of memory"); + end(1, false, "Out of memory"); alloced = true; strcpy(newbuf, yylval.text); strcat(newbuf, yytext); diff --git a/crawl-ref/source/prebuilt/levcomp.tab.cc b/crawl-ref/source/prebuilt/levcomp.tab.cc index 85d6d5ab37..3fb7ad18da 100644 --- a/crawl-ref/source/prebuilt/levcomp.tab.cc +++ b/crawl-ref/source/prebuilt/levcomp.tab.cc @@ -1775,7 +1775,7 @@ yyreduce: #line 82 "levcomp.ypp" { dgn_reset_default_depth(); - std::string err = dgn_set_default_depth((yyvsp[(2) - (2)].text)); + string err = dgn_set_default_depth((yyvsp[(2) - (2)].text)); if (!err.empty()) yyerror(make_stringf("Bad default-depth: %s (%s)", (yyvsp[(2) - (2)].text), err.c_str()).c_str()); @@ -1797,7 +1797,7 @@ yyreduce: yyerror( lc_global_prelude.orig_error().c_str() ); } - std::string err = + string err = lc_map.validate_map_def(lc_default_depths); dump_map(lc_map); if (!err.empty()) @@ -2210,10 +2210,10 @@ yyreduce: /* Line 1806 of yacc.c */ #line 344 "levcomp.ypp" { - std::string key, arg; + string key, arg; int sep(0); - const std::string err = + const string err = mapdef_split_key_item((yyvsp[(2) - (2)].text), &key, &sep, &arg); if (!err.empty()) |