[complement-svn] SF.net SVN: complement: [1948] trunk/complement/explore/lib/stem

[<com...@us...>]

Revision: 1948
          http://complement.svn.sourceforge.net/complement/?rev=1948&view=rev
Author:   complement
Date:     2008-07-09 02:18:44 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
Merge branch 'master' of /export/hostel/pub/scm/complement into HEAD

Conflicts:

	complement/explore/lib/stem/ChangeLog
	complement/explore/lib/stem/Makefile.inc

Modified Paths:
--------------
    trunk/complement/explore/lib/stem/ChangeLog
    trunk/complement/explore/lib/stem/Makefile.inc
    trunk/complement/explore/lib/stem/_EventHandler.cc

Modified: trunk/complement/explore/lib/stem/ChangeLog
===================================================================
--- trunk/complement/explore/lib/stem/ChangeLog	2008-07-09 07:11:29 UTC (rev 1947)
+++ trunk/complement/explore/lib/stem/ChangeLog	2008-07-09 09:18:44 UTC (rev 1948)
@@ -1,3 +1,9 @@
+2008-07-08  Petr Ovtchenkov  <ye...@ya...>
+
+	* _EventHandler.cc: return state via local variable;
+
+	* libstem: library version 4.8.2.
+
 2008-07-07  Petr Ovtchenkov  <ye...@ya...>
 
 	* EvManager.h, EvManager.cc: fix dispatch loop finish

Modified: trunk/complement/explore/lib/stem/Makefile.inc
===================================================================
--- trunk/complement/explore/lib/stem/Makefile.inc	2008-07-09 07:11:29 UTC (rev 1947)
+++ trunk/complement/explore/lib/stem/Makefile.inc	2008-07-09 09:18:44 UTC (rev 1948)
@@ -1,8 +1,8 @@
-# -*- Makefile -*- Time-stamp: <08/07/07 21:07:49 yeti>
+# -*- Makefile -*- Time-stamp: <08/07/08 13:13:44 yeti>
 
 LIBNAME = stem
 MAJOR = 4
 MINOR = 8
-PATCH = 1
+PATCH = 2
 SRC_CC = _EventHandler.cc NetTransport.cc EvManager.cc EvPack.cc crc.cc \
          Names.cc Cron.cc

Modified: trunk/complement/explore/lib/stem/_EventHandler.cc
===================================================================
--- trunk/complement/explore/lib/stem/_EventHandler.cc	2008-07-09 07:11:29 UTC (rev 1947)
+++ trunk/complement/explore/lib/stem/_EventHandler.cc	2008-07-09 09:18:44 UTC (rev 1948)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <08/06/30 18:16:58 yeti>
+// -*- C++ -*- Time-stamp: <08/07/08 13:04:19 yeti>
 
 /*
  * Copyright (c) 1995-1999, 2002, 2003, 2005, 2006, 2008
@@ -136,7 +136,8 @@
 state_type EventHandler::State() const
 {
   lock_guard<recursive_mutex> lk( _theHistory_lock );
-  return theHistory.front();
+  state_type top = theHistory.front();
+  return top;
 }
 
 __FIT_DECLSPEC


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.