From 0601e626726a78cd547dba46b1ff0e99d476cde0 Mon Sep 17 00:00:00 2001 From: Cristian C Lalescu <clalesc1@jhu.edu> Date: Sun, 22 Feb 2015 21:14:00 -0500 Subject: [PATCH] use `char*` instead of `const char*` no idea why the intel compiler hates const char so much... --- src/RMHD_converter.cpp | 6 +++--- src/RMHD_converter.hpp | 6 +++--- src/field_descriptor.cpp | 8 +++----- src/field_descriptor.hpp | 8 +++++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/RMHD_converter.cpp b/src/RMHD_converter.cpp index 222f7ec0..793b0508 100644 --- a/src/RMHD_converter.cpp +++ b/src/RMHD_converter.cpp @@ -98,9 +98,9 @@ RMHD_converter::~RMHD_converter() } int RMHD_converter::convert( - const char *ifile0, - const char *ifile1, - const char *ofile) + char *ifile0, + char *ifile1, + char *ofile) { //read first field this->f0c->read(ifile0, (void*)this->c0); diff --git a/src/RMHD_converter.hpp b/src/RMHD_converter.hpp index 6ce834c6..ebb1b00c 100644 --- a/src/RMHD_converter.hpp +++ b/src/RMHD_converter.hpp @@ -41,9 +41,9 @@ class RMHD_converter ~RMHD_converter(); int convert( - const char *ifile0, - const char *ifile1, - const char *ofile); + char *ifile0, + char *ifile1, + char *ofile); }; #endif//RMHD_CONVERTER diff --git a/src/field_descriptor.cpp b/src/field_descriptor.cpp index 2e1396b2..61d11347 100644 --- a/src/field_descriptor.cpp +++ b/src/field_descriptor.cpp @@ -3,8 +3,6 @@ #include <iostream> #include "field_descriptor.hpp" -extern int myrank, nprocs; - field_descriptor::field_descriptor( int ndims, int *n, @@ -79,7 +77,7 @@ field_descriptor::~field_descriptor() } int field_descriptor::read( - const char *fname, + char *fname, void *buffer) { MPI_Info info; @@ -111,7 +109,7 @@ int field_descriptor::read( } int field_descriptor::write( - const char *fname, + char *fname, void *buffer) { MPI_Info info; @@ -268,7 +266,7 @@ field_descriptor* field_descriptor::get_transpose() return new field_descriptor(this->ndims, n, this->mpi_dtype, this->comm); } -void proc_print_err_message(const char *message) +void proc_print_err_message(char *message) { for (int i = 0; i < nprocs; i++) { diff --git a/src/field_descriptor.hpp b/src/field_descriptor.hpp index 271d3d8e..905843c3 100644 --- a/src/field_descriptor.hpp +++ b/src/field_descriptor.hpp @@ -5,6 +5,8 @@ #define FIELD_DESCRIPTOR +extern int myrank, nprocs; + class field_descriptor { public: @@ -33,10 +35,10 @@ class field_descriptor * own mpi_array_dtype that was defined in the constructor. * */ int read( - const char *fname, + char *fname, void *buffer); int write( - const char *fname, + char *fname, void *buffer); /* a function that generates the transposed descriptor. @@ -80,7 +82,7 @@ int fftwf_clip_zero_padding( field_descriptor *f, float *a); -void proc_print_err_message(const char *message); +void proc_print_err_message(char *message); #endif//FIELD_DESCRIPTOR -- GitLab