NRI : Merge delta [V1_2, V1_2c].

[modules/superv.git] / src / GraphBase / DataFlowBase_Base.hxx

diff --git a/src/GraphBase/DataFlowBase_Base.hxx b/src/GraphBase/DataFlowBase_Base.hxx
index 174a1ea18397e0a1917c3eec899a4ca46e292b9e..3b0a7fc9ae4b835491fb46c13a57dacf8785f79a 100644 (file)
--- a/src/GraphBase/DataFlowBase_Base.hxx
+++ b/src/GraphBase/DataFlowBase_Base.hxx
@@ -29,9 +29,10 @@
 #ifndef _DATAFLOW_BASE_HXX
 #define _DATAFLOW_BASE_HXX
 
+//#include <strstream>
 #include <iostream>
 #include <fstream>
-#include <strstream>
+#include <sstream>
 #include <iomanip>
 #include <string>
 #include <map>
@@ -48,8 +49,6 @@
 #include "utilities.h"
 #include "OpUtil.hxx"
 
-#include "SALOME_NamingService.hxx"
-
 extern char *SuperVision_Version ;
 
 extern char *NULLSTRING ;
@@ -146,14 +145,14 @@ namespace GraphBase {
 
     public:   
 
-      int *     _prof_debug;
-      ostream * _fdebug;
+      int      * _prof_debug ;
+      ofstream * _fdebug ;
                      
       Base() ;
       virtual ~Base() {} ;
 
       void SetDebug( CORBA::ORB_ptr ORB ,
-                     int * prof_debug , ostream * fdebug ) ;
+                     int * prof_debug , ofstream * fdebug ) ;
 
       char * ObjectToString( CORBA::Object_ptr obj ) const ;
       CORBA::Object_ptr StringToObject(char * obj ) const ;
@@ -161,17 +160,14 @@ namespace GraphBase {
   } ;
 # ifdef _DEBUG_
 
-#   define cdebug \
-           if ( GraphBase::Base::_prof_debug ) \
-             *GraphBase::Base::_fdebug << "      " /*<< setw(3*(*GraphBase::Base::_prof_debug)) */<< " "
+//             *GraphBase::Base::_fdebug << "      " /*<< setw(3*(*GraphBase::Base::_prof_debug)) */<< " "
+
+#   define cdebug if ( GraphBase::Base::_fdebug )  *GraphBase::Base::_fdebug << "      " << " "
+
+#   define cdebug_in if ( GraphBase::Base::_fdebug ) *GraphBase::Base::_fdebug << endl << "-->" << " "
 
-#   define cdebug_in \
-           if ( GraphBase::Base::_prof_debug ) \
-             *GraphBase::Base::_fdebug << endl << "-->" /*<< setw(3*((*GraphBase::Base::_prof_debug)++)) */<< " "
+#   define cdebug_out if ( GraphBase::Base::_fdebug ) *GraphBase::Base::_fdebug << endl << "<--" << " "
 
-#   define cdebug_out \
-           if ( GraphBase::Base::_prof_debug ) \
-             *GraphBase::Base::_fdebug << endl << "<--" /*<< setw(3*(--(*GraphBase::Base::_prof_debug)))*/ << " "
 # else
 
 #   define cdebug while (false) std::cerr