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

Switch to side-by-side view

--- a/pp/op_merge.cpp
+++ b/pp/op_merge.cpp
@@ -1,20 +1,10 @@
-/*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * re-written by P.Elie based on (FIXME Dave Jones ?) first implementation,
- * many cleanup by John Levon
+/**
+ * \file op_merge.cpp
+ * Copyright 2002 OProfile authors
+ * Read the file COPYING
+ *
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author Philippe Elie <phil_el@wanadoo.fr>
  */
 
 #include <stdio.h>
@@ -27,11 +17,12 @@
 #include <fstream>
 #include <algorithm>
 
-#include "../version.h"
-#include "../util/op_popt.h"
-#include "../util/file_manip.h"
-#include "../libdb/db.h"
 #include "oprofpp.h"
+ 
+#include "version.h"
+#include "op_popt.h"
+#include "file_manip.h"
+#include "db.h"
 
 using std::string;
 using std::vector;
@@ -64,7 +55,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]);

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks