jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged revisions 11085-11086,11088-11089 via svnmerge from

Browse source 
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:
Haoyu Bai 2009-01-30 10:27:37 +00:00
commit 47b4825168
15 changed files with 44 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/CParse/cparse.h
View file

@ -34,7 +34,7 @@ extern "C" {
extern void scanner_ignore_typedef(void);
extern void scanner_last_id(int);
extern void scanner_clear_rename(void);
extern void scanner_set_location(const_String_or_char_ptr file, int line);
extern void scanner_set_location(String *file, int line);
extern void scanner_set_main_input_file(String *file);
extern String *scanner_get_main_input_file();
extern void Swig_cparse_follow_locators(int);

4
Source/CParse/cscanner.c
View file

@ -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;

4
Source/CParse/parser.y
View file

@ -3334,7 +3334,7 @@ cpp_class_decl :
} else {
max_class_levels *= 2;
}
class_decl = realloc(class_decl, sizeof(Node*) * max_class_levels);
class_decl = (Node**) realloc(class_decl, sizeof(Node*) * max_class_levels);
if (!class_decl) {
Swig_error(cparse_file, cparse_line, "realloc() failed\n");
}
@ -3483,7 +3483,7 @@ cpp_class_decl :
} else {
max_class_levels *= 2;
}
class_decl = realloc(class_decl, sizeof(Node*) * max_class_levels);
class_decl = (Node**) realloc(class_decl, sizeof(Node*) * max_class_levels);
if (!class_decl) {
Swig_error(cparse_file, cparse_line, "realloc() failed\n");
}

2
Source/CParse/templ.c
View file

@ -15,7 +15,7 @@ char cvsroot_templ_c[] = "$Id$";
static int template_debug = 0;
String *baselists[3];
const char *baselists[3];
void SwigType_template_init() {
baselists[0] = "baselist";