diff options
author | Olly Betts <olly@survex.com> | 2013-09-25 17:29:33 +1200 |
---|---|---|
committer | Olly Betts <olly@survex.com> | 2013-09-25 17:29:33 +1200 |
commit | 12708c9241bf9e5ef75a449ff848f2be84a35e72 (patch) | |
tree | 43c3502a50409377d0c3f5d1c38f5b93b846dd20 | |
parent | ab2a8b7379c2daeace5ce8313ad69d2b51b6d706 (diff) | |
download | swig-12708c9241bf9e5ef75a449ff848f2be84a35e72.tar.gz |
Fix typos
-rw-r--r-- | CHANGES | 4 | ||||
-rw-r--r-- | Doc/Manual/Java.html | 2 | ||||
-rw-r--r-- | Doc/Manual/SWIG.html | 2 | ||||
-rw-r--r-- | Examples/android/extend/src/org/swig/extendexample/SwigExtend.java | 2 | ||||
-rw-r--r-- | Examples/csharp/extend/runme.cs | 2 | ||||
-rw-r--r-- | Examples/d/extend/d1/runme.d | 2 | ||||
-rw-r--r-- | Examples/d/extend/d2/runme.d | 2 | ||||
-rw-r--r-- | Examples/go/extend/runme.go | 2 | ||||
-rw-r--r-- | Examples/java/extend/runme.java | 2 | ||||
-rw-r--r-- | Lib/go/go.swg | 2 | ||||
-rw-r--r-- | Source/Modules/lang.cxx | 2 | ||||
-rw-r--r-- | Source/Modules/python.cxx | 2 | ||||
-rw-r--r-- | Tools/config/ac_compile_warnings.m4 | 2 |
13 files changed, 14 insertions, 14 deletions
@@ -3303,8 +3303,8 @@ Version 1.3.36 (24 June 2008) Makefile target being generated when generating makefiles with the -M family of options. For example: - $ swig -java -MM -MT overiddenname -c++ example.i - overiddenname: \ + $ swig -java -MM -MT overriddenname -c++ example.i + overriddenname: \ example.i \ example.h diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index 0024d602a..f3d8a1684 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -7886,7 +7886,7 @@ where it is possible to step from Java code into a JNI method within one environ <p> Alternatively, debugging can involve placing debug printout statements in the JNI layer using the <tt>%exception</tt> directive. See the <a href="Customization.html#Customization_exception_special_variables">special variables for %exception</a> section. -Many of the default typemaps can also be overidden and modified for adding in extra logging/debug display information. +Many of the default typemaps can also be overridden and modified for adding in extra logging/debug display information. </p> <p> diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html index 25dc899de..f9ea5b2ef 100644 --- a/Doc/Manual/SWIG.html +++ b/Doc/Manual/SWIG.html @@ -258,7 +258,7 @@ this option the default output directory is the path to the input file. If <tt>-o</tt> and <tt>-outcurrentdir</tt> are used together, <tt>-outcurrentdir</tt> is effectively ignored as the output directory for the language files is the same directory as the -generated C/C++ file if not overidden with <tt>-outdir</tt>. +generated C/C++ file if not overridden with <tt>-outdir</tt>. </p> <H3><a name="SWIG_nn5"></a>5.1.3 Comments</H3> diff --git a/Examples/android/extend/src/org/swig/extendexample/SwigExtend.java b/Examples/android/extend/src/org/swig/extendexample/SwigExtend.java index a343dfebc..b88d36082 100644 --- a/Examples/android/extend/src/org/swig/extendexample/SwigExtend.java +++ b/Examples/android/extend/src/org/swig/extendexample/SwigExtend.java @@ -96,7 +96,7 @@ public class SwigExtend extends Activity // methods of all these instances are treated the same. For items 0, 1, and // 2, all methods resolve in C++. For item 3, our CEO, getTitle calls // getPosition which resolves in Java. The call to getPosition is - // slightly different, however, because of the overidden getPosition() call, since + // slightly different, however, because of the overridden getPosition() call, since // now the object reference has been "laundered" by passing through // EmployeeList as an Employee*. Previously, Java resolved the call // immediately in CEO, but now Java thinks the object is an instance of diff --git a/Examples/csharp/extend/runme.cs b/Examples/csharp/extend/runme.cs index 825dcdbca..92313aa5e 100644 --- a/Examples/csharp/extend/runme.cs +++ b/Examples/csharp/extend/runme.cs @@ -45,7 +45,7 @@ public class runme // methods of all these instances are treated the same. For items 0, 1, and // 2, all methods resolve in C++. For item 3, our CEO, getTitle calls // getPosition which resolves in C#. The call to getPosition is - // slightly different, however, because of the overidden getPosition() call, since + // slightly different, however, because of the overridden getPosition() call, since // now the object reference has been "laundered" by passing through // EmployeeList as an Employee*. Previously, C# resolved the call // immediately in CEO, but now C# thinks the object is an instance of diff --git a/Examples/d/extend/d1/runme.d b/Examples/d/extend/d1/runme.d index 96501d1a4..058432096 100644 --- a/Examples/d/extend/d1/runme.d +++ b/Examples/d/extend/d1/runme.d @@ -46,7 +46,7 @@ void main() { // methods of all these instances are treated the same. For items 0, 1, and // 2, all methods resolve in C++. For item 3, our CEO, getTitle calls // getPosition which resolves in D. The call to getPosition is - // slightly different, however, because of the overidden getPosition() call, since + // slightly different, however, because of the overridden getPosition() call, since // now the object reference has been "laundered" by passing through // EmployeeList as an Employee*. Previously, D resolved the call // immediately in CEO, but now D thinks the object is an instance of diff --git a/Examples/d/extend/d2/runme.d b/Examples/d/extend/d2/runme.d index 1ea6dfd21..cccdf463b 100644 --- a/Examples/d/extend/d2/runme.d +++ b/Examples/d/extend/d2/runme.d @@ -46,7 +46,7 @@ void main() { // methods of all these instances are treated the same. For items 0, 1, and // 2, all methods resolve in C++. For item 3, our CEO, getTitle calls // getPosition which resolves in D. The call to getPosition is - // slightly different, however, because of the overidden getPosition() call, since + // slightly different, however, because of the overridden getPosition() call, since // now the object reference has been "laundered" by passing through // EmployeeList as an Employee*. Previously, D resolved the call // immediately in CEO, but now D thinks the object is an instance of diff --git a/Examples/go/extend/runme.go b/Examples/go/extend/runme.go index 8fdfd0a6c..770e27802 100644 --- a/Examples/go/extend/runme.go +++ b/Examples/go/extend/runme.go @@ -42,7 +42,7 @@ func main() { // treated the same. For items 0, 1, and 2, all methods // resolve in C++. For item 3, our CEO, GetTitle calls // GetPosition which resolves in Go. The call to GetPosition - // is slightly different, however, because of the overidden + // is slightly different, however, because of the overridden // GetPosition() call, since now the object reference has been // "laundered" by passing through EmployeeList as an // Employee*. Previously, Go resolved the call immediately in diff --git a/Examples/java/extend/runme.java b/Examples/java/extend/runme.java index 629bb14a6..f1ec1ea06 100644 --- a/Examples/java/extend/runme.java +++ b/Examples/java/extend/runme.java @@ -55,7 +55,7 @@ public class runme { // methods of all these instances are treated the same. For items 0, 1, and // 2, all methods resolve in C++. For item 3, our CEO, getTitle calls // getPosition which resolves in Java. The call to getPosition is - // slightly different, however, because of the overidden getPosition() call, since + // slightly different, however, because of the overridden getPosition() call, since // now the object reference has been "laundered" by passing through // EmployeeList as an Employee*. Previously, Java resolved the call // immediately in CEO, but now Java thinks the object is an instance of diff --git a/Lib/go/go.swg b/Lib/go/go.swg index cc3beef7d..b00533fa3 100644 --- a/Lib/go/go.swg +++ b/Lib/go/go.swg @@ -431,7 +431,7 @@ %} /* Typecheck typemaps. The purpose of these is merely to issue a - warning for overloaded C++ functions * that cannot be overloaded in + warning for overloaded C++ functions that cannot be overloaded in Go as more than one C++ type maps to a single Go type. */ %typecheck(SWIG_TYPECHECK_BOOL) /* Go bool */ diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index eb7d49480..6cc6e9fc3 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -2513,7 +2513,7 @@ int Language::classHandler(Node *n) { Setattr(m, "parentNode", n); /* * There is a bug that needs fixing still... - * This area of code is creating methods which have not been overidden in a derived class (director methods that are protected in the base) + * This area of code is creating methods which have not been overridden in a derived class (director methods that are protected in the base) * If the method is overloaded, then Swig_overload_dispatch() incorrectly generates a call to the base wrapper, _wrap_xxx method * See director_protected_overloaded.i - Possibly sym:overname needs correcting here. Printf(stdout, "new method: %s::%s(%s)\n", Getattr(parentNode(m), "name"), Getattr(m, "name"), ParmList_str_defaultargs(Getattr(m, "parms"))); diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index 94802e06d..98f6cac09 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -3728,7 +3728,7 @@ public: if (builtin) builtin_pre_decl(n); - /* Overide the shadow file so we can capture its methods */ + /* Override the shadow file so we can capture its methods */ f_shadow = NewString(""); // Set up type check for director class constructor diff --git a/Tools/config/ac_compile_warnings.m4 b/Tools/config/ac_compile_warnings.m4 index 4c030ea59..7e4239a3c 100644 --- a/Tools/config/ac_compile_warnings.m4 +++ b/Tools/config/ac_compile_warnings.m4 @@ -4,7 +4,7 @@ dnl Set the maximum warning verbosity according to C and C++ compiler used. dnl Currently supports g++ and gcc. dnl dnl The compiler options are always added CFLAGS and CXXFLAGS even if -dnl these are overidden at configure time. Removing the maximum warning +dnl these are overridden at configure time. Removing the maximum warning dnl flags can be removed with --without-maximum-compile-warnings. For example: dnl dnl ./configure --without-maximum-compile-warnings CFLAGS= CXXFLAGS= |