[Csp-commits] APPLICATIONS/SimData/Source DataManager.cpp,1.3,1.4 LogStream.cpp,1.1,1.2

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

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

Modified Files:
	DataManager.cpp LogStream.cpp 
Log Message:
see CHANGES.current

Index: DataManager.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/DataManager.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DataManager.cpp	2 May 2003 20:59:05 -0000	1.3
--- DataManager.cpp	4 May 2003 07:23:23 -0000	1.4
***************
*** 103,107 ****
  	DataArchive *archive = 0;
  	if (idx != _archive_map.end()) {
! 		assert(idx->second >= 0 && idx->second < _archives.size());
  		archive = _archives[idx->second];
  	}
--- 103,107 ----
  	DataArchive *archive = 0;
  	if (idx != _archive_map.end()) {
! 		assert(idx->second >= 0 && idx->second < int(_archives.size()));
  		archive = _archives[idx->second];
  	}

Index: LogStream.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/LogStream.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LogStream.cpp	18 Mar 2003 10:04:05 -0000	1.1
--- LogStream.cpp	4 May 2003 07:23:23 -0000	1.2
***************
*** 32,48 ****
  
  
- bool logbuf::logging_enabled = true;
- 
- int logbuf::logClass = 0xffffffff;
- 
- int logbuf::logPriority = 0;
- 
- std::streambuf* logbuf::sbuf = NULL;
  
  
  logbuf::logbuf()
  {
! //     if ( sbuf == NULL )
! // 	sbuf = std::cerr.rdbuf();
  }
  
--- 32,44 ----
  
  
  
  
  logbuf::logbuf()
  {
! 	logging_enabled = true;
! 	logClass = 0xffffffff;
! 	logPriority = 0;
! 	sbuf = NULL;
!  	//sbuf = std::cerr.rdbuf();
  }
  
***************
*** 86,90 ****
  void logstream::setLogLevels(int c, int p)
  {
!     logbuf::set_log_level( c, p );
  }
  
--- 82,86 ----
  void logstream::setLogLevels(int c, int p)
  {
!     lbuf.set_log_level( c, p );
  }