[Csp-commits] svn:csp r2071 - in trunk/csp/csplib: . data

[<sv...@ww...>]

Author: mkrose
Date: 2007-04-07 19:39:46 -0700 (Sat, 07 Apr 2007)
New Revision: 2071

Modified:
   trunk/csp/csplib/csplib.i
   trunk/csp/csplib/data/Link.h
Log:
Suppress swig warnings about deprecated typemap syntax, and fix a
warning about an unwrapped operator method.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2071

Modified: trunk/csp/csplib/csplib.i
===================================================================
--- trunk/csp/csplib/csplib.i	2007-04-08 01:15:31 UTC (rev 2070)
+++ trunk/csp/csplib/csplib.i	2007-04-08 02:39:46 UTC (rev 2071)
@@ -43,6 +43,14 @@
 	if (cspPyException) PyDict_SetItemString(d, "libexc", cspPyException);
 %}
 
+/* For now, suppress warning 124:
+ *   Specifying the language name in %typemap is >deprecated - use
+ *   #ifdef SWIG<LANG> instead.
+ * We'll do this after a few minor version releases of swig (or when
+ * support for languages in typmap is removed.
+ */
+#pragma SWIG nowarn=124
+
 // standard includes
 %include "std_string.i"
 %include "std_vector.i"

Modified: trunk/csp/csplib/data/Link.h
===================================================================
--- trunk/csp/csplib/data/Link.h	2007-04-08 01:15:31 UTC (rev 2070)
+++ trunk/csp/csplib/data/Link.h	2007-04-08 02:39:46 UTC (rev 2071)
@@ -96,11 +96,13 @@
 	 *
 	 * This method is used by subclasses to assign after checking type compatibility.
 	 */
+#ifndef SWIG
 	LinkCore& operator=(const LinkCore& r) {
 		Path::operator=(r);
 		_reassign(r._reference);
 		return *this;
 	}
+#endif
 
 public: