summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlly Betts <ojwbetts@gmail.com>2015-03-27 12:20:26 +1300
committerOlly Betts <ojwbetts@gmail.com>2015-03-27 12:20:26 +1300
commit45c0a15760e87c49e2ac85ad75fd3be6f0fa73a5 (patch)
tree2241412519f583d52622451913bd98a6e2f55cc5
parent226b4dec5b47e93bf4cf216a532e14de4f0c7cab (diff)
parent7a050461c6f4a926fd622a5d615ea1ec6459fe89 (diff)
downloadswig-45c0a15760e87c49e2ac85ad75fd3be6f0fa73a5.tar.gz
Merge pull request #367 from jamesathey/csharp-cleanup
When warning about multiple inheritance in C#, say C# in the message
-rw-r--r--Source/Modules/csharp.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index 52d230d99..1e4eec3bf 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -1642,7 +1642,7 @@ public:
String *proxyclassname = Getattr(n, "classtypeobj");
String *baseclassname = Getattr(base.item, "name");
Swig_warning(WARN_CSHARP_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
- "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Java.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
+ "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in C#.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
base = Next(base);
}
}