diff options
author | William S Fulton <wsf@fultondesigns.co.uk> | 2015-05-15 07:08:45 +0100 |
---|---|---|
committer | William S Fulton <wsf@fultondesigns.co.uk> | 2015-05-15 07:08:45 +0100 |
commit | fa69c2a96033287e5e97e2630aae9352dc29ccb2 (patch) | |
tree | c4d411d658fcaaa6169d90b167faf77b969a75a2 | |
parent | b38fa20e71ff9bf75a213efd310bdbc5f929ee69 (diff) | |
download | swig-fa69c2a96033287e5e97e2630aae9352dc29ccb2.tar.gz |
Fix some bad merges from master
-rw-r--r-- | Examples/test-suite/li_std_queue.i | 11 | ||||
-rw-r--r-- | Examples/test-suite/li_std_stack.i | 11 | ||||
-rw-r--r-- | Examples/test-suite/ruby/ruby_li_std_speed_runme.rb | 3 | ||||
-rw-r--r-- | Examples/test-suite/ruby_li_std_speed.i | 11 |
4 files changed, 3 insertions, 33 deletions
diff --git a/Examples/test-suite/li_std_queue.i b/Examples/test-suite/li_std_queue.i index 2d322b4d9..6bf71afca 100644 --- a/Examples/test-suite/li_std_queue.i +++ b/Examples/test-suite/li_std_queue.i @@ -1,13 +1,4 @@ -/** - * @file std_queue.i - * @author gga - * @date Sun May 6 01:52:44 2007 - * - * @brief test of std::queue - * - * - */ - +// test of std::queue %module li_std_queue %include std_queue.i diff --git a/Examples/test-suite/li_std_stack.i b/Examples/test-suite/li_std_stack.i index d29254089..19b45d46f 100644 --- a/Examples/test-suite/li_std_stack.i +++ b/Examples/test-suite/li_std_stack.i @@ -1,13 +1,4 @@ -/** - * @file std_stack.i - * @author gga - * @date Sun May 6 01:52:44 2007 - * - * @brief test of std::stack - * - * - */ - +// test of std::stack %module li_std_stack %include std_stack.i diff --git a/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb b/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb index 825f3c593..e79cb46a8 100644 --- a/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb +++ b/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb @@ -3,9 +3,6 @@ # This is a simple speed benchmark suite for std containers, # to verify their O(n) performance. # It is not part of the standard tests. -# -# License:: SWIG -# require 'benchmark' diff --git a/Examples/test-suite/ruby_li_std_speed.i b/Examples/test-suite/ruby_li_std_speed.i index 3c8e60643..bfb0b2776 100644 --- a/Examples/test-suite/ruby_li_std_speed.i +++ b/Examples/test-suite/ruby_li_std_speed.i @@ -1,13 +1,4 @@ -/** - * @file ruby_li_std_speed.i - * @author gga - * @date Fri May 18 18:03:15 2007 - * - * @brief A speed test of the ruby stl - * - * - */ - +// A speed test of the ruby stl %module ruby_li_std_speed %include <std_list.i> |