[oprof-cvs] CVS: oprofile/pp op_merge.cpp,1.23,1.24 op_time_options.cpp,1.8,1.9 op_to_source_options.cpp,1.5,1.6 oprofpp_options.cpp,1.8,1.9

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/pp
In directory usw-pr-cvs1:/tmp/cvs-serv22344/pp

Modified Files:
	op_merge.cpp op_time_options.cpp op_to_source_options.cpp 
	oprofpp_options.cpp 
Log Message:
replace verbose_ostream with something simple



Index: op_merge.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/op_merge.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- op_merge.cpp	6 Jun 2002 16:18:27 -0000	1.23
+++ op_merge.cpp	6 Jun 2002 23:25:52 -0000	1.24
@@ -22,7 +22,6 @@
 #include "version.h"
 #include "popt_options.h"
 #include "file_manip.h"
-#include "verbose_ostream.h"
 
 #include "db.h"
 #include "op_config.h"
@@ -50,7 +49,7 @@
 	option(counter, "use-counter", 'c', "use counter", "counter nr")
 };
 
-verbose_ostream cverb(std::cout);
+std::ostream cverb;
 
 /**
  * get_options - process command line
@@ -64,8 +63,8 @@
 {
 	parse_options(argc, argv, images);
 
-	if (!verbose)
-		cverb.go_silent();
+	if (verbose)
+		cverb.rdbuf(std::cout.rdbuf());
 
 	if (images.size() == 0) {
 		cerr << "Neither samples filename or image filename"

Index: op_time_options.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/op_time_options.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- op_time_options.cpp	6 Jun 2002 16:18:28 -0000	1.8
+++ op_time_options.cpp	6 Jun 2002 23:25:52 -0000	1.9
@@ -15,7 +15,6 @@
 
 #include "popt_options.h"
 #include "file_manip.h"
-#include "verbose_ostream.h"
 
 #include <list>
 
@@ -123,7 +122,7 @@
 
 } // namespace anon
 
-verbose_ostream cverb(std::cout);
+std::ostream cverb;
 
 /**
  * get_options - process command line
@@ -139,8 +138,8 @@
 	string file;
 	parse_options(argc, argv, file);
 
-	if (!verbose)
-		cverb.go_silent();
+	if (verbose)
+		cverb.rdbuf(std::cout.rdbuf());
 
 	if (file.length())
 		session = file;

Index: op_to_source_options.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/op_to_source_options.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- op_to_source_options.cpp	6 Jun 2002 16:18:29 -0000	1.5
+++ op_to_source_options.cpp	6 Jun 2002 23:25:52 -0000	1.6
@@ -11,7 +11,6 @@
 
 #include "op_to_source_options.h"
 #include "popt_options.h"
-#include "verbose_ostream.h"
 
 #include <iostream>
 
@@ -61,7 +60,7 @@
 
 }
 
-verbose_ostream cverb(std::cout);
+std::ostream cverb;
 
 /**
  * get_options - process command line
@@ -76,8 +75,8 @@
 
 	parse_options(argc, argv, arg);
 
-	if (!verbose)
-		cverb.go_silent();
+	if (verbose)
+		cverb.rdbuf(std::cout.rdbuf());
 
 	if (options::with_more_than_samples
 		&& options::until_more_than_samples) {

Index: oprofpp_options.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/oprofpp_options.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- oprofpp_options.cpp	6 Jun 2002 16:18:29 -0000	1.8
+++ oprofpp_options.cpp	6 Jun 2002 23:25:52 -0000	1.9
@@ -9,7 +9,6 @@
  */
 
 #include "popt_options.h"
-#include "verbose_ostream.h"
 
 #include "oprofpp_options.h"
 #include "opp_symbol.h"
@@ -77,7 +76,7 @@
 
 } // namespace anon
 
-verbose_ostream cverb(std::cout);
+std::ostream cverb;
 
 string const get_options(int argc, char const **argv)
 {
@@ -88,9 +87,9 @@
 
 	counter_mask = parse_counter_mask(counter_str);
 
-	if (!verbose)
-		cverb.go_silent();
-
+	if (verbose)
+		cverb.rdbuf(std::cout.rdbuf());
+ 
 	if (!list_all_symbols_details && !list_symbols &&
 	    gprof_file.empty() && symbol.empty())
 		quit_error("oprofpp: no mode specified. What do you want from me ?\n");