From 8814fc0147bd043b828db9825a2847bc05ad725b Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Fri, 5 Jun 2020 07:31:02 -0400 Subject: [PATCH] use const char * for compatibility with std::string.c_str() --- src/MPIIO/restart_mpiio.cpp | 4 ++-- src/MPIIO/restart_mpiio.h | 4 ++-- src/RIGID/fix_rigid.cpp | 2 +- src/RIGID/fix_rigid.h | 2 +- src/RIGID/fix_rigid_small.cpp | 2 +- src/RIGID/fix_rigid_small.h | 2 +- src/fix.h | 2 +- src/mpiio.h | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/MPIIO/restart_mpiio.cpp b/src/MPIIO/restart_mpiio.cpp index db511c7bc0..f813a217e8 100644 --- a/src/MPIIO/restart_mpiio.cpp +++ b/src/MPIIO/restart_mpiio.cpp @@ -36,7 +36,7 @@ RestartMPIIO::RestartMPIIO(LAMMPS *lmp) : Pointers(lmp) for some file servers it is most efficient to only read or only write ------------------------------------------------------------------------- */ -void RestartMPIIO::openForRead(char *filename) +void RestartMPIIO::openForRead(const char *filename) { int err = MPI_File_open(world, filename, MPI_MODE_RDONLY , MPI_INFO_NULL, &mpifh); @@ -56,7 +56,7 @@ void RestartMPIIO::openForRead(char *filename) for some file servers it is most efficient to only read or only write ------------------------------------------------------------------------- */ -void RestartMPIIO::openForWrite(char *filename) +void RestartMPIIO::openForWrite(const char *filename) { int err = MPI_File_open(world, filename, MPI_MODE_WRONLY, MPI_INFO_NULL, &mpifh); diff --git a/src/MPIIO/restart_mpiio.h b/src/MPIIO/restart_mpiio.h index bf1df656f6..4cc7558d46 100644 --- a/src/MPIIO/restart_mpiio.h +++ b/src/MPIIO/restart_mpiio.h @@ -28,8 +28,8 @@ class RestartMPIIO : protected Pointers { RestartMPIIO(class LAMMPS *); ~RestartMPIIO() {} - void openForRead(char *); - void openForWrite(char *); + void openForRead(const char *); + void openForWrite(const char *); void write(MPI_Offset, int, double *); void read(MPI_Offset, bigint, double *); void close(); diff --git a/src/RIGID/fix_rigid.cpp b/src/RIGID/fix_rigid.cpp index 28a348e58b..e13099d4e3 100644 --- a/src/RIGID/fix_rigid.cpp +++ b/src/RIGID/fix_rigid.cpp @@ -2406,7 +2406,7 @@ void FixRigid::readfile(int which, double *vec, only proc 0 writes list of global bodies to file ------------------------------------------------------------------------- */ -void FixRigid::write_restart_file(char *file) +void FixRigid::write_restart_file(const char *file) { if (me) return; diff --git a/src/RIGID/fix_rigid.h b/src/RIGID/fix_rigid.h index c261d89cce..cd32d0ca72 100644 --- a/src/RIGID/fix_rigid.h +++ b/src/RIGID/fix_rigid.h @@ -36,7 +36,7 @@ class FixRigid : public Fix { virtual void final_integrate(); void initial_integrate_respa(int, int, int); void final_integrate_respa(int, int); - void write_restart_file(char *); + void write_restart_file(const char *); virtual double compute_scalar(); double memory_usage(); diff --git a/src/RIGID/fix_rigid_small.cpp b/src/RIGID/fix_rigid_small.cpp index 89fa3add4b..3186c154ea 100644 --- a/src/RIGID/fix_rigid_small.cpp +++ b/src/RIGID/fix_rigid_small.cpp @@ -2562,7 +2562,7 @@ void FixRigidSmall::readfile(int which, double **array, int *inbody) each proc contributes info for rigid bodies it owns ------------------------------------------------------------------------- */ -void FixRigidSmall::write_restart_file(char *file) +void FixRigidSmall::write_restart_file(const char *file) { FILE *fp; diff --git a/src/RIGID/fix_rigid_small.h b/src/RIGID/fix_rigid_small.h index 974f5711e2..d6e97c06fd 100644 --- a/src/RIGID/fix_rigid_small.h +++ b/src/RIGID/fix_rigid_small.h @@ -38,7 +38,7 @@ class FixRigidSmall : public Fix { virtual void final_integrate(); void initial_integrate_respa(int, int, int); void final_integrate_respa(int, int); - void write_restart_file(char *); + void write_restart_file(const char *); void grow_arrays(int); void copy_arrays(int, int, int); diff --git a/src/fix.h b/src/fix.h index 558caf23e9..1cb1cc3ca4 100644 --- a/src/fix.h +++ b/src/fix.h @@ -137,7 +137,7 @@ class Fix : protected Pointers { virtual void end_of_step() {} virtual void post_run() {} virtual void write_restart(FILE *) {} - virtual void write_restart_file(char *) {} + virtual void write_restart_file(const char *) {} virtual void restart(char *) {} virtual void grow_arrays(int) {} diff --git a/src/mpiio.h b/src/mpiio.h index 0098fca0e1..03c6ff6744 100644 --- a/src/mpiio.h +++ b/src/mpiio.h @@ -38,8 +38,8 @@ class RestartMPIIO { RestartMPIIO(class LAMMPS *) {mpiio_exists = 0;} ~RestartMPIIO() {} - void openForRead(char *) {} - void openForWrite(char *) {} + void openForRead(const char *) {} + void openForWrite(const char *) {} void write(MPI_Offset,int,double *) {} void read(MPI_Offset,long,double *) {} void close() {}