Merge branch 'bda_resolve_warnings'

* bda_resolve_warnings:
  Use $self instead of self
  Lib/csharp: Resolve a few warnings about unused parameters

2 files changed, 4 insertions, 1 deletions

diff --git a/Lib/csharp/std_map.i b/Lib/csharp/std_map.i
index 7a118569a..e7a910f65 100644
--- a/Lib/csharp/std_map.i
+++ b/Lib/csharp/std_map.i
@@ -269,12 +269,14 @@
       }
 
       const key_type& get_next_key(std::map< K, T, C >::iterator *swigiterator) {
+        (void)$self;
         std::map< K, T, C >::iterator iter = *swigiterator;
         (*swigiterator)++;
         return (*iter).first;
       }
 
       void destroy_iterator(std::map< K, T, C >::iterator *swigiterator) {
+        (void)$self;
         delete swigiterator;
       }
     }
@@ -309,4 +311,3 @@ namespace std {
 %define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO, T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
 #warning "specialize_std_map_on_both ignored - macro is deprecated and no longer necessary"
 %enddef
-
diff --git a/Lib/csharp/std_set.i b/Lib/csharp/std_set.i
index 012152260..ec8a3dc5e 100644
--- a/Lib/csharp/std_set.i
+++ b/Lib/csharp/std_set.i
@@ -297,12 +297,14 @@ class set {
       }
 
       const key_type& get_next(std::set<T>::iterator *swigiterator) {
+        (void)$self;
         std::set<T>::iterator iter = *swigiterator;
         (*swigiterator)++;
         return *iter;
       }
 
       void destroy_iterator(std::set<T>::iterator *swigiterator) {
+        (void)$self;
         delete swigiterator;
       }
     }