From d4db558810aba7c3ee66510a036f48cecf0d9d0d Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Wed, 21 Oct 2015 00:20:18 +0100 Subject: [PATCH] java: Remove overrides for overloaded methods. These are now wrapped correctly without needing this. --- .../java/org/sigrok/core/classes/classes.i | 66 ------------------- 1 file changed, 66 deletions(-) diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i index 7e1919e2..ba95144b 100644 --- a/bindings/java/org/sigrok/core/classes/classes.i +++ b/bindings/java/org/sigrok/core/classes/classes.i @@ -193,72 +193,6 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant) } } -/* Support Driver.scan() with no arguments. */ -%ignore sigrok::Driver::scan; - -%extend sigrok::Driver { - std::vector > scan() - { - std::map options; - return $self->scan(options); - } - - std::vector > scan( - std::map options) - { - return $self->scan(options); - } -} - -/* Support InputFormat.create_input() with or without options. */ -%ignore sigrok::InputFormat::create_input; - -%extend sigrok::InputFormat { - std::shared_ptr create_input() - { - return $self->create_input(); - } - - std::shared_ptr create_input( - std::map options) - { - return $self->create_input(options); - } -} - -/* Support OutputFormat.create_output() with or without options. */ -%ignore sigrok::OutputFormat::create_output; - -%extend sigrok::OutputFormat { - std::shared_ptr create_output( - std::shared_ptr device) - { - return $self->create_output(device); - } - - std::shared_ptr create_output( - std::shared_ptr device, - std::map options) - { - return $self->create_output(device, options); - } - - std::shared_ptr create_output( - std::string filename, - std::shared_ptr device) - { - return $self->create_output(filename, device); - } - - std::shared_ptr create_output( - std::string filename, - std::shared_ptr device, - std::map options) - { - return $self->create_output(filename, device, options); - } -} - /* Pass JNIEnv parameter to C++ extension methods requiring it. */ %typemap(in, numinputs=0) JNIEnv * %{