From 3c95162afd8b3b825034ef92474da6c5277cfe72 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Wed, 14 Dec 2011 09:19:51 +0100
Subject: [PATCH] Fixing a few compiler warnings
---
src/Atoms.cpp | 20 ++++++++++----------
src/GREX.cpp | 4 ++--
src/PlumedMain.cpp | 4 ++--
src/Tools.cpp | 9 +++++++++
src/Tools.h | 2 ++
5 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/Atoms.cpp b/src/Atoms.cpp
index 3095c7dae..e7fcef1a3 100644
--- a/src/Atoms.cpp
+++ b/src/Atoms.cpp
@@ -322,19 +322,19 @@ void Atoms::removeGroup(const std::string&name){
}
void Atoms::writeBinary(std::ostream&o)const{
- o.write((const char*)&positions[0][0],natoms*3*sizeof(double));
- o.write((const char*)&masses[0],natoms*sizeof(double));
- o.write((const char*)&charges[0],natoms*sizeof(double));
- o.write((const char*)&box(0,0),9*sizeof(double));
- o.write((const char*)&energy,sizeof(double));
+ o.write(reinterpret_cast<const char*>(&positions[0][0]),natoms*3*sizeof(double));
+ o.write(reinterpret_cast<const char*>(&masses[0]),natoms*sizeof(double));
+ o.write(reinterpret_cast<const char*>(&charges[0]),natoms*sizeof(double));
+ o.write(reinterpret_cast<const char*>(&box(0,0)),9*sizeof(double));
+ o.write(reinterpret_cast<const char*>(&energy),sizeof(double));
}
void Atoms::readBinary(std::istream&i){
- i.read((char*)&positions[0][0],natoms*3*sizeof(double));
- i.read((char*)&masses[0],natoms*sizeof(double));
- i.read((char*)&charges[0],natoms*sizeof(double));
- i.read((char*)&box(0,0),9*sizeof(double));
- i.read((char*)&energy,sizeof(double));
+ i.read(reinterpret_cast<char*>(&positions[0][0]),natoms*3*sizeof(double));
+ i.read(reinterpret_cast<char*>(&masses[0]),natoms*sizeof(double));
+ i.read(reinterpret_cast<char*>(&charges[0]),natoms*sizeof(double));
+ i.read(reinterpret_cast<char*>(&box(0,0)),9*sizeof(double));
+ i.read(reinterpret_cast<char*>(&energy),sizeof(double));
}
double Atoms::getKBoltzmann()const{
diff --git a/src/GREX.cpp b/src/GREX.cpp
index 00a4ad23e..6271e5fb3 100644
--- a/src/GREX.cpp
+++ b/src/GREX.cpp
@@ -73,8 +73,8 @@ void GREX::cmd(const string&key,void*val){
int nw=words.size();
if(false){
} else if(nw==2 && words[0]=="getDeltaBias"){
- assert(allDeltaBias.size()==intercomm.Get_size());
- int rep;
+ assert(allDeltaBias.size()==static_cast<unsigned>(intercomm.Get_size()));
+ unsigned rep;
Tools::convert(words[1],rep);
assert(rep>=0 && rep<allDeltaBias.size());
double d=allDeltaBias[rep]/(atoms.getMDUnits().energy/atoms.getUnits().energy);
diff --git a/src/PlumedMain.cpp b/src/PlumedMain.cpp
index 134071a70..feb132653 100644
--- a/src/PlumedMain.cpp
+++ b/src/PlumedMain.cpp
@@ -17,8 +17,8 @@ using namespace PLMD;
using namespace std;
PlumedMain::PlumedMain():
- initialized(false),
grex(NULL),
+ initialized(false),
log(comm),
step(0),
active(false),
@@ -217,7 +217,7 @@ void PlumedMain::cmd(const std::string & word,void*val){
if(!grex) grex=new GREX(*this);
assert(grex);
std::string kk=words[1];
- for(int i=2;i<words.size();i++) kk+=" "+words[i];
+ for(unsigned i=2;i<words.size();i++) kk+=" "+words[i];
grex->cmd(kk.c_str(),val);
} else{
// error
diff --git a/src/Tools.cpp b/src/Tools.cpp
index 6b08d2b42..9e79c5c4e 100644
--- a/src/Tools.cpp
+++ b/src/Tools.cpp
@@ -15,6 +15,15 @@ bool Tools::convert(const string & str,int & t){
return remaining.length()==0;
}
+bool Tools::convert(const string & str,unsigned & t){
+ istringstream istr(str.c_str());
+ bool ok=istr>>t;
+ if(!ok) return false;
+ string remaining;
+ istr>>remaining;
+ return remaining.length()==0;
+}
+
bool Tools::convert(const string & str,AtomNumber &a){
int i;
bool r=convert(str,i);
diff --git a/src/Tools.h b/src/Tools.h
index 7ab3937aa..b398ca053 100644
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -33,6 +33,8 @@ public:
static bool convert(const std::string & str,double & t);
/// Convert a string to a int, reading it
static bool convert(const std::string & str,int & t);
+/// Convert a string to an unsigned int, reading it
+ static bool convert(const std::string & str,unsigned & t);
/// Convert a string to a atom number, reading it
static bool convert(const std::string & str,AtomNumber & t);
/// Convert a string to a string (i.e. copy)
--
GitLab