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/branches/swig-2.0@11089 626c5289-ae23-0410-ae9c-e8d60b6d4f22

2 files changed, 2 insertions, 2 deletions

diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c
index e015bd884..d93afc09a 100644
--- a/Source/Preprocessor/cpp.c
+++ b/Source/Preprocessor/cpp.c
@@ -307,7 +307,7 @@ Hash *Preprocessor_define(const_String_or_char_ptr _str, int swigmacro) {
     copy_location(_str, s);
     str = s;
   } else {
-    str = NewString((char *) str);
+    str = NewString((char *) _str);
   }
   Seek(str, 0, SEEK_SET);
   line = Getline(str);
diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c
index 52d21c79e..53f1ad4a0 100644
--- a/Source/Swig/scanner.c
+++ b/Source/Swig/scanner.c
@@ -122,7 +122,7 @@ void Scanner_pushtoken(Scanner * s, int nt, const_String_or_char_ptr val) {
   assert(s);
   assert((nt >= 0) && (nt < SWIG_MAXTOKENS));
   s->nexttoken = nt;
-  if (val != s->text) {
+  if ( Char(val) != Char(s->text) ) {
     Clear(s->text);
     Append(s->text,val);
   }