[cig-commits] r5149 - in long/3D/Gale/trunk/src/StgFEM: . Discretisation/src

[walter at geodynamics.org]

Author: walter
Date: 2006-10-31 13:31:45 -0800 (Tue, 31 Oct 2006)
New Revision: 5149

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
Log:
 r854 at earth:  boo | 2006-10-31 13:30:38 -0800
  r844 at earth (orig r660):  KathleenHumble | 2006-10-25 22:51:31 -0700
  adding in a return statement after the assert statement in
  file FeVariable.c in function
  void* FeVariable_ImportExportInfo_Copy
  
  created a null pointer of type FeVariable_ImportExportInfo
  to return.
  
  
  
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:853
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:659
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:854
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:660

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2006-10-31 21:31:42 UTC (rev 5148)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2006-10-31 21:31:45 UTC (rev 5149)
@@ -1954,8 +1954,10 @@
 		Bool					deep,
 		Name					nameExt, 
 		struct PtrMap*				ptrMap ) {
+	FeVariable_ImportExportInfo*	 feVariable_ImportExportInfo = NULL;		
 	/* TODO */
-	assert( 0 );	
+	assert( 0 );
+	return feVariable_ImportExportInfo;		
 }