From 3cc8c67e2188063203344205ce382a50a7e7fda5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (laptop)" <j.wuttke@fz-juelich.de>
Date: Fri, 9 Oct 2009 22:15:53 +0200
Subject: [PATCH] function name << a01
---
pub/src/coord.cpp | 4 ++--
pub/src/coord.h | 2 +-
pub/src/file_io.cpp | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pub/src/coord.cpp b/pub/src/coord.cpp
index 42b065f5..c324420b 100644
--- a/pub/src/coord.cpp
+++ b/pub/src/coord.cpp
@@ -79,7 +79,7 @@ string CCoord::to_a01() const
return name + "\t" + unit;
}
-string CCoord::load(string in)
+string CCoord::load_a01(string in)
{
string::size_type t1, t2;
if(!in.size()) {
@@ -112,7 +112,7 @@ int CParam::init_from_a01( const string in )
int ret=-9;
if( ji>=20 || ( ret = mystd::any2dbl( in.substr(ji,20), &val ) ) )
return ret;
- Co.load( in.substr(21) );
+ Co.load_a01( in.substr(21) );
return 0;
}
diff --git a/pub/src/coord.h b/pub/src/coord.h
index 2c560d26..cdd83421 100644
--- a/pub/src/coord.h
+++ b/pub/src/coord.h
@@ -14,7 +14,7 @@ class CCoord {
string ps_str() const;
string to_a01() const;
inline bool defined(void) { return name!=""; };
- string load(string);
+ string load_a01(string);
inline bool operator== (const CCoord& Co2) const {
return (name==Co2.name) && (unit==Co2.unit); };
diff --git a/pub/src/file_io.cpp b/pub/src/file_io.cpp
index c19b95d0..087e3e2b 100644
--- a/pub/src/file_io.cpp
+++ b/pub/src/file_io.cpp
@@ -237,15 +237,15 @@ void NFileIO::Load_01( FILE *F_in, string flong )
} else if (key=="doc ") {
old.lDoc.push_back(val);
} else if (key=="x ") {
- old.xco.load(val);
+ old.xco.load_a01(val);
} else if (key=="y ") {
- old.yco.load(val);
+ old.yco.load_a01(val);
} else if (lin[0]=='z') {
if ( sscanf(lin.substr(1,3).c_str(), "%u", &iz)!=1 )
throw string( "z coordinates must be numbered" );
if ( iz!=old.ZCo.size() )
throw string( "z coordinates must be sorted" );
- co.load(val);
+ co.load_a01(val);
old.ZCo.push_back(co);
} else if (lin.substr(0,4)=="rpa ") {
old.RPar.push_back( CParam() );
--
GitLab