Merged revisions 11085-11086,11088-11089 via svnmerge from
https://swig.svn.sourceforge.net/svnroot/swig/branches/swig-2.0 ........ r11085 | bhy | 2009-01-25 00:21:55 +0800 (Sun, 25 Jan 2009) | 2 lines Fix const-correctness. ........ r11086 | bhy | 2009-01-25 02:08:50 +0800 (Sun, 25 Jan 2009) | 2 lines Correct some function definition in header files, which implementation changed in previous commit caused mismatch. ........ r11088 | bhy | 2009-01-25 02:38:32 +0800 (Sun, 25 Jan 2009) | 1 line minor fix and now SWIG is alive again ........ r11089 | bhy | 2009-01-25 06:07:07 +0800 (Sun, 25 Jan 2009) | 1 line Correct some bug introduced in previous commits. Now SWIG is pretty good with C++ compiler. ........ git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11097 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
a6adffe4d9
commit
47b4825168
15 changed files with 44 additions and 41 deletions
|
|
@ -442,7 +442,7 @@ int yylook(void) {
|
|||
|
||||
static int check_typedef = 0;
|
||||
|
||||
void scanner_set_location(const_String_or_char_ptr file, int line) {
|
||||
void scanner_set_location(String *file, int line) {
|
||||
Scanner_set_location(scan,file,line-1);
|
||||
}
|
||||
|
||||
|
|
@ -701,7 +701,7 @@ int yylex(void) {
|
|||
break;
|
||||
} else if (nexttok == SWIG_TOKEN_CODEBLOCK) {
|
||||
termtoken = SWIG_TOKEN_CODEBLOCK;
|
||||
termvalue = Scanner_text(scan);
|
||||
termvalue = Char(Scanner_text(scan));
|
||||
break;
|
||||
} else if (nexttok == SWIG_TOKEN_LBRACE) {
|
||||
termtoken = SWIG_TOKEN_LBRACE;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue