X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FStem%2FEvent.pm;fp=lib%2FStem%2FEvent.pm;h=3d1f11403ba13c1693739dc4cf1a46547a4b6388;hb=907cbc6d770ea6bf36c1649d1952caaccf17d420;hp=712ccc7bff3d01603bfc041a04cc6714b8091816;hpb=edf7663cc9a0a4654ba0dd48662c280a9a4dba4f;p=urisagit%2FStem.git

diff --git a/lib/Stem/Event.pm b/lib/Stem/Event.pm
index 712ccc7..3d1f114 100644
--- a/lib/Stem/Event.pm
+++ b/lib/Stem/Event.pm
@@ -69,15 +69,7 @@ INIT{ init_loop() ; }
 
 sub init_loop {
 
-Stem::Event::Queue::_init_queue() if defined &Stem::Event::Queue::_init_queue ;
-
 	$loop_class->_init_loop() ;
-
-<<<<<<< HEAD:lib/Stem/Event.pm
-#Stem::Event::Queue::_init_queue() if defined &Stem::Event::Queue::_init_queue ;
-=======
->>>>>>> master:lib/Stem/Event.pm
-
 }
 
 sub start_loop {
@@ -300,7 +292,7 @@ sub _get_loop_class {
 	$loop_type = 'perl' unless $loop_to_class{ $loop_type } ;
 	my $loop_class = "Stem::Event::$loop_to_class{ $loop_type }" ;
 
-print "LOOP $loop_class\n" ;
+#print "LOOP $loop_class\n" ;
 
 	unless ( eval "require $loop_class" ) {
 		die "can't load $loop_class: $@" if $@ && $@ !~ /locate/ ;
@@ -326,10 +318,6 @@ print "not found\n" ;
 ############################################################################
 
 package Stem::Event::Plain ;
-<<<<<<< HEAD:lib/Stem/Event.pm
-
-=======
->>>>>>> master:lib/Stem/Event.pm
 our @ISA = qw( Stem::Event ) ;
 
 =head2 Stem::Event::Plain::new
@@ -386,10 +374,6 @@ sub new {
 ############################################################################
 
 package Stem::Event::Signal ;
-<<<<<<< HEAD:lib/Stem/Event.pm
-
-=======
->>>>>>> master:lib/Stem/Event.pm
 our @ISA = qw( Stem::Event ) ;
 
 =head2 Stem::Event::Signal::new
@@ -476,10 +460,6 @@ sub new {
 ############################################################################
 
 package Stem::Event::Timer ;
-<<<<<<< HEAD:lib/Stem/Event.pm
-
-=======
->>>>>>> master:lib/Stem/Event.pm
 our @ISA = qw( Stem::Event ) ;
 
 =head2 Stem::Event::Timer::new
@@ -669,10 +649,6 @@ sub timer_triggered {
 # these override Stem::Event's methods and then call those via SUPER::
 
 package Stem::Event::IO ;
-<<<<<<< HEAD:lib/Stem/Event.pm
-
-=======
->>>>>>> master:lib/Stem/Event.pm
 our @ISA = qw( Stem::Event ) ;
 
 sub init_io_timeout {
@@ -747,12 +723,6 @@ sub timed_out {
 
 package Stem::Event::Read ;
 our @ISA = qw( Stem::Event::IO ) ;
-print "B @ISA\n" ;
-
-<<<<<<< HEAD:lib/Stem/Event.pm
-our @ISA = qw( Stem::Event::IO ) ;
-=======
->>>>>>> master:lib/Stem/Event.pm
 
 =head2 Stem::Event::Read::new
 
@@ -830,7 +800,6 @@ HELP
 sub new {
 
 	my( $class ) = shift ;
-print "@ISA\n" ;
 
 	my $self = Stem::Class::parse_args( $attr_spec_read, @_ ) ;
 	return $self unless ref $self ;
@@ -852,10 +821,6 @@ print "@ISA\n" ;
 ############################################################################
 
 package Stem::Event::Write ;
-<<<<<<< HEAD:lib/Stem/Event.pm
-
-=======
->>>>>>> master:lib/Stem/Event.pm
 our @ISA = qw( Stem::Event::IO ) ;
 
 =head2 Stem::Event::Write::new