Diff of /pp/opf_filter.cpp [de0c3c] .. [fb7fe6]  Maximize  Restore

Switch to side-by-side view

--- a/pp/opf_filter.cpp
+++ b/pp/opf_filter.cpp
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <fnmatch.h>
 
-#include "../util/op_popt.h"
+#include "op_popt.h"
 
 using std::vector;
 using std::string;
@@ -45,11 +45,11 @@
 #include "opf_filter.h"
 #include "oprofpp.h"
 
-#include "../util/child_reader.h"
-#include "../util/string_manip.h"
-#include "../util/file_manip.h"
-
-#include "../version.h"
+#include "child_reader.h"
+#include "string_manip.h"
+#include "file_manip.h"
+
+#include "version.h"
 
 //---------------------------------------------------------------------------
 // Free function.
@@ -565,9 +565,9 @@
 		args.push_back("-S");
 
 	args.push_back(app_name);
-	ChildReader reader("objdump", args);
+	child_reader reader("objdump", args);
 	if (reader.error())
-		// ChildReader output an error message, the only way I see to
+		// child_reader output an error message, the only way I see to
 		// go here is a failure to exec objdump.
 		return;
 
@@ -908,7 +908,7 @@
 {
 	poptContext optcon;
 
-	optcon = opd_poptGetContext(NULL, argc, argv, options, 0);
+	optcon = op_poptGetContext(NULL, argc, argv, options, 0);
 
 	if (showvers) {
 		show_version(argv[0]);