Added two reminders for me

git-svn-id: branches/svenbarth/generics@19425 -

compiler/pdecobj.pas

@@ -308,6 +308,7 @@ implementation
           begin
              { use single_type instead of id_type for specialize support }
              single_type(hdef,[stoAllowSpecialization,stoParseClassParent]);
+             { TODO : handle a generic interface }
              if (hdef.typ<>objectdef) then
                begin
                   if intf then

compiler/pexpr.pas

@@ -2018,8 +2018,15 @@ implementation
                     exit;
                   end;
 
+<<<<<<< HEAD
                { check hints, but only if it isn't a potential generic symbol;
                  that is checked in sub_expr if it isn't a generic }
+=======
+               { check hints if it is the final symbol that is used (e.g. in
+                 case of generics only the dummy symbol or the non-generic one
+                 is found here }
+               { TODO : correct this check }
+>>>>>>> Added two reminders for me
                if assigned(srsym) and
                    not (
                      (srsym.typ=typesym) and