fixing a stupid inheritance bug

3 files changed, 3 insertions, 3 deletions

diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc
index 685ae53..5516b1e 100644
--- a/src/cuda-sim/cuda-sim.cc
+++ b/src/cuda-sim/cuda-sim.cc
@@ -404,7 +404,7 @@ void gpgpu_t::memcpy_to_gpu( size_t dst_start_addr, const void *src, size_t coun
 
    // Copy into the performance model.
    extern gpgpu_sim* g_the_gpu; 
-   g_the_gpu->memcpy_to_gpu(dst_start_addr, src, count);
+   g_the_gpu->perf_memcpy_to_gpu(dst_start_addr, count);
    if(g_debug_execution >= 3) {
       printf( " done.\n");
       fflush(stdout);
diff --git a/src/gpgpu-sim/gpu-sim.cc b/src/gpgpu-sim/gpu-sim.cc
index 438769f..0c2ea1c 100644
--- a/src/gpgpu-sim/gpu-sim.cc
+++ b/src/gpgpu-sim/gpu-sim.cc
@@ -1598,7 +1598,7 @@ void shader_core_ctx::dump_warp_state( FILE *fout ) const
 }
 
 
-void gpgpu_sim::memcpy_to_gpu( size_t dst_start_addr, const void *src, size_t count )
+void gpgpu_sim::perf_memcpy_to_gpu( size_t dst_start_addr, size_t count )
 {
     if (m_memory_config->m_perf_sim_memcpy) {
        assert (dst_start_addr % 32 == 0);
diff --git a/src/gpgpu-sim/gpu-sim.h b/src/gpgpu-sim/gpu-sim.h
index 81f13cb..1778008 100644
--- a/src/gpgpu-sim/gpu-sim.h
+++ b/src/gpgpu-sim/gpu-sim.h
@@ -426,7 +426,7 @@ public:
    void gpu_print_stat();
    void dump_pipeline( int mask, int s, int m ) const;
 
-    void memcpy_to_gpu( size_t dst_start_addr, const void *src, size_t count );
+    void perf_memcpy_to_gpu( size_t dst_start_addr, size_t count );
 
    //The next three functions added to be used by the functional simulation function