Skip to content

Commit 0110e59

Browse files
committed
Add type specifier to std::pair
1 parent f7d7b9f commit 0110e59

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/parser/bison_parser.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3759,9 +3759,9 @@ YYLTYPE yylloc = yyloc_default;
37593759
#line 595 "bison_parser.y"
37603760
{
37613761
if (strcasecmp((yyvsp[-1].sval), "DELIMITER") == 0) {
3762-
(yyval.csv_option_t) = new std::pair(hsql::CsvOptionType::Delimiter, (yyvsp[0].sval));
3762+
(yyval.csv_option_t) = new std::pair<hsql::CsvOptionType, char*>(hsql::CsvOptionType::Delimiter, (yyvsp[0].sval));
37633763
} else if (strcasecmp((yyvsp[-1].sval), "QUOTE") == 0) {
3764-
(yyval.csv_option_t) = new std::pair(hsql::CsvOptionType::Quote, (yyvsp[0].sval));
3764+
(yyval.csv_option_t) = new std::pair<hsql::CsvOptionType, char*>(hsql::CsvOptionType::Quote, (yyvsp[0].sval));
37653765
} else {
37663766
free((yyvsp[-1].sval));
37673767
free((yyvsp[0].sval));
@@ -3775,7 +3775,7 @@ YYLTYPE yylloc = yyloc_default;
37753775

37763776
case 49: /* csv_option: NULL STRING */
37773777
#line 608 "bison_parser.y"
3778-
{ (yyval.csv_option_t) = new std::pair(hsql::CsvOptionType::Null, (yyvsp[0].sval)); }
3778+
{ (yyval.csv_option_t) = new std::pair<hsql::CsvOptionType, char*>(hsql::CsvOptionType::Null, (yyvsp[0].sval)); }
37793779
#line 3780 "bison_parser.cpp"
37803780
break;
37813781

src/parser/bison_parser.y

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -594,9 +594,9 @@ import_export_options : import_export_options ',' FORMAT file_type {
594594

595595
csv_option : IDENTIFIER STRING {
596596
if (strcasecmp($1, "DELIMITER") == 0) {
597-
$$ = new std::pair(hsql::CsvOptionType::Delimiter, $2);
597+
$$ = new std::pair<hsql::CsvOptionType, char*>(hsql::CsvOptionType::Delimiter, $2);
598598
} else if (strcasecmp($1, "QUOTE") == 0) {
599-
$$ = new std::pair(hsql::CsvOptionType::Quote, $2);
599+
$$ = new std::pair<hsql::CsvOptionType, char*>(hsql::CsvOptionType::Quote, $2);
600600
} else {
601601
free($1);
602602
free($2);
@@ -605,7 +605,7 @@ csv_option : IDENTIFIER STRING {
605605
}
606606
free($1);
607607
}
608-
| NULL STRING { $$ = new std::pair(hsql::CsvOptionType::Null, $2); }
608+
| NULL STRING { $$ = new std::pair<hsql::CsvOptionType, char*>(hsql::CsvOptionType::Null, $2); }
609609

610610
/******************************
611611
* Export Statement

0 commit comments

Comments
 (0)