[Csp-commits] APPLICATIONS/SimData/Source DataArchive.cpp,1.1.2.2,1.1.2.3 Enum.cpp,1.1.2.1,1.1.2.2 Exception.cpp,1.1.2.1,1.1.2.2 InterfaceRegistry.cpp,1.1.2.2,1.1.2.3 Path.cpp,1.1.2.2,1.1.2.3 Spread.cpp,1.1.2.1,1.1.2.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv2741/Source

Modified Files:
      Tag: simdata
	DataArchive.cpp Enum.cpp Exception.cpp InterfaceRegistry.cpp 
	Path.cpp Spread.cpp 
Log Message:
more gcc 3.2 compatibility fixes


Index: DataArchive.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/DataArchive.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** DataArchive.cpp	20 Jan 2003 04:29:38 -0000	1.1.2.2
--- DataArchive.cpp	20 Jan 2003 05:53:12 -0000	1.1.2.3
***************
*** 340,344 ****
  
  
! void DataArchive::_addStatic(Object* ptr, const char* path, hasht key=0) {
  	if (key == 0) key = hash_string(path);
  	static_map[key] = ptr;
--- 340,344 ----
  
  
! void DataArchive::_addStatic(Object* ptr, const char* path, hasht key) {
  	if (key == 0) key = hash_string(path);
  	static_map[key] = ptr;

Index: Enum.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/Enum.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Enum.cpp	19 Jan 2003 20:31:41 -0000	1.1.2.1
--- Enum.cpp	20 Jan 2003 05:53:12 -0000	1.1.2.2
***************
*** 22,26 ****
  }
  
! Enum::Enum(const Enumeration& parent, int idx=0): _parent(&parent) {
  	_id = idx;
  	_name = parent[idx].asString();
--- 22,26 ----
  }
  
! Enum::Enum(const Enumeration& parent, int idx): _parent(&parent) {
  	_id = idx;
  	_name = parent[idx].asString();

Index: Exception.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/Exception.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Exception.cpp	19 Jan 2003 20:31:41 -0000	1.1.2.1
--- Exception.cpp	20 Jan 2003 05:53:12 -0000	1.1.2.2
***************
*** 26,30 ****
  
  
! Exception::Exception(std::string type="Exception", std::string msg="") {
  	 //: std::runtime_error(type+": "+msg) {
  	_type = type;
--- 26,30 ----
  
  
! Exception::Exception(std::string type, std::string msg) {
  	 //: std::runtime_error(type+": "+msg) {
  	_type = type;

Index: InterfaceRegistry.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/InterfaceRegistry.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** InterfaceRegistry.cpp	20 Jan 2003 04:56:49 -0000	1.1.2.2
--- InterfaceRegistry.cpp	20 Jan 2003 05:53:12 -0000	1.1.2.3
***************
*** 72,76 ****
  
  //MemberAccessorBase * InterfaceProxy::getAccessor(const char *name, const char *cname = 0) const throw(InterfaceError) { 
! MemberAccessorBase * InterfaceProxy::getAccessor(const char *name, const char *cname = 0) const { 
  	if (!cname) cname = "?";
  	throw InterfaceError("variable \"" + std::string(name) + "\" not defined in interface to class " + cname); 
--- 72,76 ----
  
  //MemberAccessorBase * InterfaceProxy::getAccessor(const char *name, const char *cname = 0) const throw(InterfaceError) { 
! MemberAccessorBase * InterfaceProxy::getAccessor(const char *name, const char *cname) const { 
  	if (!cname) cname = "?";
  	throw InterfaceError("variable \"" + std::string(name) + "\" not defined in interface to class " + cname); 

Index: Path.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/Path.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** Path.cpp	20 Jan 2003 04:56:49 -0000	1.1.2.2
--- Path.cpp	20 Jan 2003 05:53:12 -0000	1.1.2.3
***************
*** 147,151 ****
  }
  
! void PathPointerBase::_load(DataArchive* archive, ObjectID path=0) {
  	assert(archive != 0);
  	if (path == 0) path = _path;
--- 147,151 ----
  }
  
! void PathPointerBase::_load(DataArchive* archive, ObjectID path) {
  	assert(archive != 0);
  	if (path == 0) path = _path;

Index: Spread.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/Spread.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Spread.cpp	19 Jan 2003 20:31:41 -0000	1.1.2.1
--- Spread.cpp	20 Jan 2003 05:53:12 -0000	1.1.2.2
***************
*** 56,60 ****
  }
  
! Spread::Spread(float mean=0.0, float sigma=0.0) {
  	set(mean, sigma);
  	regen();
--- 56,60 ----
  }
  
! Spread::Spread(float mean, float sigma) {
  	set(mean, sigma);
  	regen();