Changeset 437a0af in tol for tol/bbasic/out.cpp

Timestamp:

Jan 5, 2011, 2:18:37 PM (16 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

beb3a50

Parents:

6562295

Message:

closes #1051

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2980 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bbasic/out.cpp (modified) (4 diffs)

tol/bbasic/out.cpp

@@ -92 +92 @@
 //--------------------------------------------------------------------
 BTraceInit("out.cpp");
-BHciWriter BOut::hciWriter_;
-BHciWriter BOut::logHciWriter_;
+BHciWriter BOut::hciWriter_=NULL;
+BHciWriter BOut::logHciWriter_=NULL;
+BHciWriterEx BOut::hciWriterEx_=NULL;
+BHciWriterEx BOut::logHciWriterEx_=NULL;
+void*      BOut::hciWriterExData_=NULL;
+void*      BOut::logHciWriterExData_=NULL;
 BBool      BOut::initialized_;
 BBool      BOut::enabled_;
@@ -145 +149 @@
     BOut::hciWriter_   = NIL;
     BOut::logHciWriter_ = NIL;
+    BOut::hciWriterEx_   = NIL;
+    BOut::logHciWriterEx_ = NIL;
+    BOut::hciWriterExData_   = NIL;
+    BOut::logHciWriterExData_ = NIL;
     BOut::errorOpenTag_    = "<E>\nERROR: ";
     BOut::errorCloseTag_   = "</E>\n";
@@ -524 +532 @@
 {
   if(!BOut::IsEnabled()) { return; }
-  if(hciWriter_)    { (*hciWriter_)(txt); }
+  if(hciWriter_) {
+    (*hciWriter_)(txt);
+  } else if( hciWriterEx_ ) {
+    (*hciWriterEx_)( txt, hciWriterExData_ );    
+  }
 }
 
@@ -535 +547 @@
 //--------------------------------------------------------------------
 {
-  if(logHciWriter_) { (*logHciWriter_)(txt); } 
-  else              { Std(txt); }
+  if( logHciWriter_ ) {
+    (*logHciWriter_)(txt);
+  } else if ( logHciWriterEx_ ) {
+    (*logHciWriterEx_)( txt, logHciWriterExData_ );
+  } else {
+    Std( txt );
+  }
 }