[Csp-commits] APPLICATIONS/SimData/Include/SimData Enum.h,1.4,1.5 ObjectInterface.h,1.8,1.9 Spread.h,1.2,1.3

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

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

Modified Files:
	Enum.h ObjectInterface.h Spread.h 
Log Message:


Index: Enum.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Enum.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Enum.h	20 Mar 2003 00:24:47 -0000	1.4
--- Enum.h	22 Mar 2003 00:40:26 -0000	1.5
***************
*** 63,67 ****
   * Base class for Enum exceptions.
   */
! class EnumError {
  protected:
  	std::string _msg;
--- 63,67 ----
   * Base class for Enum exceptions.
   */
! class SIMDATA_EXPORT EnumError {
  protected:
  	std::string _msg;
***************
*** 78,82 ****
   * Enum exception for values not defined in the associated enumeration set.
   */
! class EnumIndexError: public EnumError {
  public:
  	EnumIndexError(const std::string s=""): EnumError() { _msg = "Enumeration::IndexError: " + s; }
--- 78,82 ----
   * Enum exception for values not defined in the associated enumeration set.
   */
! class SIMDATA_EXPORT EnumIndexError: public EnumError {
  public:
  	EnumIndexError(const std::string s=""): EnumError() { _msg = "Enumeration::IndexError: " + s; }
***************
*** 87,91 ****
   * Enum exception for errors related to mixing multiple enumeration sets.
   */
! class EnumTypeError: public EnumError {
  public:
  	EnumTypeError(const std::string s=""): EnumError() { _msg = "Enumeration::TypeError: " + s; }
--- 87,91 ----
   * Enum exception for errors related to mixing multiple enumeration sets.
   */
! class SIMDATA_EXPORT EnumTypeError: public EnumError {
  public:
  	EnumTypeError(const std::string s=""): EnumError() { _msg = "Enumeration::TypeError: " + s; }
***************
*** 100,104 ****
   * A class representing a particular value from an associated enumeration set.
   */
! class Enum: public BaseType {
  	friend class Enumeration;
  	Enum(const Enumeration& parent, const std::string &s, int idx);
--- 100,104 ----
   * A class representing a particular value from an associated enumeration set.
   */
! class SIMDATA_EXPORT Enum: public BaseType {
  	friend class Enumeration;
  	Enum(const Enumeration& parent, const std::string &s, int idx);
***************
*** 150,154 ****
   * An enumeration class representing a set of possible values indexed by strings.
   */
! class Enumeration {
  	typedef std::map<std::string, int> string_map;
  	string_map _map;
--- 150,154 ----
   * An enumeration class representing a set of possible values indexed by strings.
   */
! class SIMDATA_EXPORT Enumeration {
  	typedef std::map<std::string, int> string_map;
  	string_map _map;

Index: ObjectInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/ObjectInterface.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ObjectInterface.h	21 Mar 2003 18:23:38 -0000	1.8
--- ObjectInterface.h	22 Mar 2003 00:40:26 -0000	1.9
***************
*** 188,192 ****
  		C * object = dynamic_cast<C *>(o);
  		T &m = object->*member;
! 		p.pack(m.size());
  		typename T::iterator idx;
  		for (idx = m.begin(); idx != m.end(); idx++) {
--- 188,192 ----
  		C * object = dynamic_cast<C *>(o);
  		T &m = object->*member;
! 		p.pack(static_cast<int>(m.size()));
  		typename T::iterator idx;
  		for (idx = m.begin(); idx != m.end(); idx++) {

Index: Spread.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Spread.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Spread.h	28 Jan 2003 23:26:06 -0000	1.2
--- Spread.h	22 Mar 2003 00:40:26 -0000	1.3
***************
*** 31,35 ****
  
  
! class Spread: public BaseType {
  	float _mean, _sigma;
  	float _value;
--- 31,35 ----
  
  
! class SIMDATA_EXPORT Spread: public BaseType {
  	float _mean, _sigma;
  	float _value;