From 541803fdf9acebfd91acb23bdd0daab0d4b52f85 Mon Sep 17 00:00:00 2001
From: Dave Beazley <dave-swig@dabeaz.com>
Date: Tue, 16 Dec 2003 03:41:33 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5571 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/Warnings.html | 3 ++-
 Lib/java/javakw.swg      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html
index 0b6253dec..add021f10 100644
--- a/Doc/Manual/Warnings.html
+++ b/Doc/Manual/Warnings.html
@@ -282,6 +282,7 @@ the input file to fix the problem.
 <li>318. Instantiation of template <em>name</em> is ambiguous. Using <em>templ</em> at <em>file</em>:<em>line</em>
 <li>319. No access specifier given for base class <em>name</em> (ignored).
 <li>320. Explicit template instantiation ignored.
+<li>321. <em>identifier</em> conflicts with a built-in name.
 <li>350. operator new ignored.
 <li>351. operator delete ignored.
 <li>352. operator+ ignored.
@@ -415,4 +416,4 @@ The ability to control warning messages was first added to SWIG-1.3.12.
 <p><hr>
 <address>SWIG 1.3 - Last Modified : June 28, 2003</address>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/Lib/java/javakw.swg b/Lib/java/javakw.swg
index 0dfd44353..4ccbbc9f4 100644
--- a/Lib/java/javakw.swg
+++ b/Lib/java/javakw.swg
@@ -62,7 +62,7 @@ JAVAKW(while);
 /* others bad names */
 
 /* Not really sure about this, but sometimes it produce problems */
-// %namewarn("315:clone is a java bad method name") *::clone;
+// %namewarn("321:clone is a java bad method name") *::clone;
 
 
 #undef JAVAKW