From fa5f848c23042da4d71c12994b03b46818bf5b70 Mon Sep 17 00:00:00 2001
From: "Andrew M. B. Boktor" <andrew.boktor@gmail.com>
Date: Wed, 16 May 2012 15:06:13 -0800
Subject: Re-wrote the intermediate structure for the output of cuobjdump using
 C++ classes Some changes to remove warnings

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 12609]
---
 cuobjdump_to_ptxplus/cuobjdumpInst.cc        | 4 +++-
 cuobjdump_to_ptxplus/cuobjdump_to_ptxplus.cc | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'cuobjdump_to_ptxplus')

diff --git a/cuobjdump_to_ptxplus/cuobjdumpInst.cc b/cuobjdump_to_ptxplus/cuobjdumpInst.cc
index c3641fe..e10acef 100644
--- a/cuobjdump_to_ptxplus/cuobjdumpInst.cc
+++ b/cuobjdump_to_ptxplus/cuobjdumpInst.cc
@@ -29,11 +29,13 @@
 #include <sstream>
 #include <iostream>
 #include <cassert>
+#include <string>
 
 // Local includes
 #include "cuobjdumpInst.h"
 
 extern void output(const char * text);
+extern void output(const std::string text);
 
 //Constructor
 cuobjdumpInst::cuobjdumpInst()
@@ -737,7 +739,7 @@ void cuobjdumpInst::printCuobjdumpOperands()
 	}
 }
 
-char * int_default_mod () { return ".u32" ;}
+std::string int_default_mod () { return ".u32" ;}
 
 
 std::string breaktarget;
diff --git a/cuobjdump_to_ptxplus/cuobjdump_to_ptxplus.cc b/cuobjdump_to_ptxplus/cuobjdump_to_ptxplus.cc
index 1d1d6b3..570ebf5 100644
--- a/cuobjdump_to_ptxplus/cuobjdump_to_ptxplus.cc
+++ b/cuobjdump_to_ptxplus/cuobjdump_to_ptxplus.cc
@@ -57,6 +57,10 @@ void output(const char * text)
 	fprintf(ptxplus_out, text);
 }
 
+void output(const std::string text) {
+	output(text.c_str());
+}
+
 std::string fileToString(const char * fileName) {
 	ifstream fileStream(fileName, ios::in);
 	string text, line;
-- 
cgit v1.3