[oprof-cvs] CVS: oprofile/gui oprof_start_config.h,1.27.4.2,1.27.4.3 oprof_start_util.h,1.13.2.1,1.13.2.2

[Philippe E. <ph...@us...>]

Update of /cvsroot/oprofile/oprofile/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv27974/gui

Modified Files:
      Tag: BRANCH_CALLGRAPH
	oprof_start_config.h oprof_start_util.h 
Log Message:
merge from TRUNK

Index: oprof_start_config.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start_config.h,v
retrieving revision 1.27.4.2
retrieving revision 1.27.4.3
diff -u -p -d -r1.27.4.2 -r1.27.4.3
--- oprof_start_config.h	25 Oct 2003 20:54:20 -0000	1.27.4.2
+++ oprof_start_config.h	4 Jan 2004 13:19:53 -0000	1.27.4.3
@@ -14,7 +14,7 @@
 
 #include <sys/types.h>
 #include <string>
-#include <iostream>
+#include <iosfwd>
 
 /// Store the setup of one event
 struct event_setting {

Index: oprof_start_util.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start_util.h,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -p -d -r1.13.2.1 -r1.13.2.2
--- oprof_start_util.h	22 Jul 2003 18:06:16 -0000	1.13.2.1
+++ oprof_start_util.h	4 Jan 2004 13:19:53 -0000	1.13.2.2
@@ -14,7 +14,6 @@
 
 #include <cmath>
 #include <string>
-#include <iostream>
 #include <vector>
 
 /// Store various daemon status data