csp-commits

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

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

Modified Files:
	Log.h LogStream.h 
Log Message:
see CHANGES.current

Index: Log.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Log.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Log.h	23 Apr 2003 09:14:20 -0000	1.4
--- Log.h	4 May 2003 07:23:23 -0000	1.5
***************
*** 57,62 ****
  log()
  {
! 	static logstream logstrm(std::cerr);
! 	return logstrm;
  }
  
--- 57,64 ----
  log()
  {
! 	//static logstream logstrm(std::cerr);
! 	static logstream *logstrm = 0;
! 	if (logstrm == 0) logstrm = new logstream(std::cerr);
! 	return *logstrm;
  }
  

Index: LogStream.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/LogStream.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LogStream.h	23 Apr 2003 09:14:20 -0000	1.5
--- LogStream.h	4 May 2003 07:23:23 -0000	1.6
***************
*** 100,104 ****
  	* @param p priority
  	*/
! 	static void set_log_level(int c, int p);
  
  
--- 100,104 ----
  	* @param p priority
  	*/
! 	void set_log_level(int c, int p);
  
  
***************
*** 107,111 ****
  	* @param c All enabled logging classes anded together.
  	*/
! 	static void set_log_classes(int c);
  
  
--- 107,111 ----
  	* @param c All enabled logging classes anded together.
  	*/
! 	void set_log_classes(int c);
  
  
***************
*** 114,118 ****
  	* @return All enabled debug logging anded together.
  	*/
! 	static int get_log_classes ();
  
  
--- 114,118 ----
  	* @return All enabled debug logging anded together.
  	*/
! 	int get_log_classes ();
  
  
***************
*** 121,125 ****
  	* @param p The priority cutoff for logging messages.
  	*/
! 	static void set_log_priority(int p);
  
  
--- 121,125 ----
  	* @param p The priority cutoff for logging messages.
  	*/
! 	void set_log_priority(int p);
  
  
***************
*** 128,132 ****
  	* @return The priority cutoff for logging messages.
  	*/
! 	static int get_log_priority ();
  
  
--- 128,132 ----
  	* @return The priority cutoff for logging messages.
  	*/
! 	int get_log_priority ();
  
  
***************
*** 148,156 ****
  
  	// The streambuf used for actual output. Defaults to cerr.rdbuf().
! 	static std::streambuf* sbuf;
  
! 	static bool logging_enabled;
! 	static int logClass;
! 	static int logPriority;
  
  private:
--- 148,156 ----
  
  	// The streambuf used for actual output. Defaults to cerr.rdbuf().
! 	std::streambuf* sbuf;
  
! 	bool logging_enabled;
! 	int logClass;
! 	int logPriority;
  
  private:
***************
*** 165,169 ****
  {
  	if (!sbuf) return -1;
! 	return 0;
  }
  
--- 165,169 ----
  {
  	if (!sbuf) return -1;
! 	return sbuf->pubsync();
  }
  
***************
*** 241,245 ****
  	* @param out output stream
  	*/
! 	void set_output( std::ostream& out ) { 
  		_close();
  		lbuf.set_sb( out.rdbuf() ); 
--- 241,245 ----
  	* @param out output stream
  	*/
! 	void setOutput( std::ostream& out ) { 
  		_close();
  		lbuf.set_sb( out.rdbuf() ); 
***************
*** 250,254 ****
  	* @param fn output file path
  	*/
! 	void set_output( std::string const &fn ) { 
  		_close();
  		m_out = new std::ofstream(fn.c_str());
--- 250,254 ----
  	* @param fn output file path
  	*/
! 	void setOutput( std::string const &fn ) { 
  		_close();
  		m_out = new std::ofstream(fn.c_str());