From 662d53d726b5e9e50c781eb3ed2e4dbfb6f47e4e Mon Sep 17 00:00:00 2001 From: Chichi Lalescu <clalesc1@jhu.edu> Date: Mon, 23 Feb 2015 08:44:55 -0500 Subject: [PATCH] Revert "use `char*` instead of `const char*`" This reverts commit 0601e626726a78cd547dba46b1ff0e99d476cde0. --- 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 793b0508..222f7ec0 100644 --- a/src/RMHD_converter.cpp +++ b/src/RMHD_converter.cpp @@ -98,9 +98,9 @@ RMHD_converter::~RMHD_converter() } int RMHD_converter::convert( - char *ifile0, - char *ifile1, - char *ofile) + const char *ifile0, + const char *ifile1, + const 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 ebb1b00c..6ce834c6 100644 --- a/src/RMHD_converter.hpp +++ b/src/RMHD_converter.hpp @@ -41,9 +41,9 @@ class RMHD_converter ~RMHD_converter(); int convert( - char *ifile0, - char *ifile1, - char *ofile); + const char *ifile0, + const char *ifile1, + const char *ofile); }; #endif//RMHD_CONVERTER diff --git a/src/field_descriptor.cpp b/src/field_descriptor.cpp index 61d11347..2e1396b2 100644 --- a/src/field_descriptor.cpp +++ b/src/field_descriptor.cpp @@ -3,6 +3,8 @@ #include <iostream> #include "field_descriptor.hpp" +extern int myrank, nprocs; + field_descriptor::field_descriptor( int ndims, int *n, @@ -77,7 +79,7 @@ field_descriptor::~field_descriptor() } int field_descriptor::read( - char *fname, + const char *fname, void *buffer) { MPI_Info info; @@ -109,7 +111,7 @@ int field_descriptor::read( } int field_descriptor::write( - char *fname, + const char *fname, void *buffer) { MPI_Info info; @@ -266,7 +268,7 @@ field_descriptor* field_descriptor::get_transpose() return new field_descriptor(this->ndims, n, this->mpi_dtype, this->comm); } -void proc_print_err_message(char *message) +void proc_print_err_message(const char *message) { for (int i = 0; i < nprocs; i++) { diff --git a/src/field_descriptor.hpp b/src/field_descriptor.hpp index 905843c3..271d3d8e 100644 --- a/src/field_descriptor.hpp +++ b/src/field_descriptor.hpp @@ -5,8 +5,6 @@ #define FIELD_DESCRIPTOR -extern int myrank, nprocs; - class field_descriptor { public: @@ -35,10 +33,10 @@ class field_descriptor * own mpi_array_dtype that was defined in the constructor. * */ int read( - char *fname, + const char *fname, void *buffer); int write( - char *fname, + const char *fname, void *buffer); /* a function that generates the transposed descriptor. @@ -82,7 +80,7 @@ int fftwf_clip_zero_padding( field_descriptor *f, float *a); -void proc_print_err_message(char *message); +void proc_print_err_message(const char *message); #endif//FIELD_DESCRIPTOR -- GitLab