- Normalize the 'Swig_error' calls and formats, before some

of the strings start like "Error. XXX", others like "XXX".
  The format is now defined in 'error.c:Swig_error_msg_format()'.

- Normalize the multiline error/warning messages to correctly
  use -Fformat definition.

- Centralize the error/warning format definitions in
  'error.c:Swig_error_msg_format()'.

- Fix a minor error in cpp.c, that after finding an error, still
  was emitting a redefined macro, producing duplicated error/warning
  messages in parser.y.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5635 626c5289-ae23-0410-ae9c-e8d60b6d4f22

SWIG/Source/CParse/templ.c

@@ -517,8 +517,12 @@ Swig_cparse_template_locate(String *name, Parm *tparms) {
     n = Swig_symbol_clookup_local(s,0);
     if (Len(mpartials) > 1) {
       if (n) {
-	Swig_warning(WARN_PARSE_TEMPLATE_AMBIG,cparse_file,cparse_line,"Instantiation of template %s is ambiguous. Using %s at %s:%d\n",
-		     SwigType_namestr(tname), SwigType_namestr(Getattr(n,"name")), Getfile(n),Getline(n));
+	Swig_warning(WARN_PARSE_TEMPLATE_AMBIG,cparse_file,cparse_line,
+		     "Instantiation of template '%s' is ambiguous,\n",
+		     SwigType_namestr(tname));
+	Swig_warning(WARN_PARSE_TEMPLATE_AMBIG,Getfile(n),Getline(n),
+		     "  instantiation '%s' is used.\n",
+		     SwigType_namestr(Getattr(n,"name")));
       }
     }
   }