[cig-commits] commit: Disabling Debug stream.

[Mercurial]

changeset:   715:85cf523e5784
branch:      pcu_rejig
parent:      713:e34e3a4ddb48
user:        JericoRevote
date:        Tue Dec 08 17:52:34 2009 +1100
files:       Base/Context/src/AbstractContext.c Base/Foundation/src/NewClass.c Base/IO/src/XML_IO_Handler.c
description:
Disabling Debug stream.


diff -r e34e3a4ddb48 -r 85cf523e5784 Base/Context/src/AbstractContext.c
--- a/Base/Context/src/AbstractContext.c	Fri Dec 04 18:58:34 2009 +1100
+++ b/Base/Context/src/AbstractContext.c	Tue Dec 08 17:52:34 2009 +1100
@@ -130,6 +130,9 @@ void _AbstractContext_Init( AbstractCont
 	MPI_Comm_rank( self->communicator, &self->rank );
 	MPI_Comm_size( self->communicator, &self->nproc );
 	self->debug = debug;
+
+	Journal_Enable_TypedStream( DebugStream_Type, False );
+	Journal_Enable_TypedStream( DumpStream_Type, False );
 
 	if( self->rank == 0 ) {
 		Journal_Printf( 
@@ -590,7 +593,7 @@ void _AbstractContext_Execute( void* con
 	
 	Journal_Printf( self->debug, "In: %s\n", __func__ );
 
-	#if DEBUG
+	#ifdef DEBUG
 		AbstractContext_WarnIfNoHooks( self, self->executeK, __func__ );
 	#endif
 	
@@ -604,7 +607,7 @@ void _AbstractContext_Execute( void* con
 
 void _AbstractContext_Destroy( void* context, void* data ) {
 	AbstractContext* self = (AbstractContext*)context;
-	
+
 	Journal_Printf( self->debug, "In: %s\n", __func__ );
 
 	/* Pre-mark the phase as complete as a default hook will attempt to initialise all live components (including this again) */
diff -r e34e3a4ddb48 -r 85cf523e5784 Base/Foundation/src/NewClass.c
--- a/Base/Foundation/src/NewClass.c	Fri Dec 04 18:58:34 2009 +1100
+++ b/Base/Foundation/src/NewClass.c	Tue Dec 08 17:52:34 2009 +1100
@@ -54,10 +54,7 @@ void _NewClass_Destruct( void* _self ) {
 
 #ifndef NDEBUG
    if( ((NewClass*)self)->curAllocd != 0 ) {
-      fprintf( stderr, "\nWhile destructing a class memory has been leaked.\n"
-	       "Class type:    %s\n"
-	       "Memory leaked: %ld\n", 
-	       self->type, self->curAllocd );
+      fprintf( stderr, "\nWhile destructing a class memory has been leaked.\n" "Class type: %s\n" "Memory leaked: %ld\n", self->type, self->curAllocd );
    }
 #endif
 }
diff -r e34e3a4ddb48 -r 85cf523e5784 Base/IO/src/XML_IO_Handler.c
--- a/Base/IO/src/XML_IO_Handler.c	Fri Dec 04 18:58:34 2009 +1100
+++ b/Base/IO/src/XML_IO_Handler.c	Tue Dec 08 17:52:34 2009 +1100
@@ -1435,11 +1435,11 @@ static char* _XML_IO_Handler_GetNextAsci
 
 /** parses a node containing struct info. */
 static void _XML_IO_Handler_ParseStruct( 
-		XML_IO_Handler*					self, 
-		xmlNodePtr					cur, 
-		Dictionary_Entry_Value*				parent, 
-		Dictionary_MergeType				defaultMergeType,
-		Dictionary_Entry_Source				source )
+	XML_IO_Handler*			self, 
+	xmlNodePtr					cur, 
+	Dictionary_Entry_Value*	parent, 
+	Dictionary_MergeType		defaultMergeType,
+	Dictionary_Entry_Source	source )
 {
 	xmlChar* name = xmlGetProp( cur, NAME_ATTR );
 	xmlChar* sourceFile = xmlGetProp( cur, SOURCEFILE_ATTR );