more memory madness

CMakeLists.txt

@@ -80,7 +80,7 @@ elseif(UNIX)
 	#	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 	#endif()
 	
-	add_definitions(-DLINUX -D_REENTRANT -Dlinux -DSTELLA_INTERNAL -D_USING_STL -D__STL_NO_BAD_ALLOC -D_GNU_SOURCE -D_XOPEN_SOURCE=500)
+	add_definitions(-DLINUX -D_REENTRANT -Dlinux -DSTELLA_INTERNAL -D_USING_STL -D_GNU_SOURCE -D_XOPEN_SOURCE=500)
 endif()
 
 add_subdirectory(external)

engine/shared/library/sharedDatabaseInterface/src_oci/OciSession.cpp

@@ -81,26 +81,6 @@ bool DB::OCISession::connect()
 	// so that each session can be used by a different thread concurrently.
 
 	sword result=OCI_ERROR;
-	if (m_server->getUseMemoryManager())
-	{
-		result = OCIEnvCreate(&envhp, // OCIEnv        **envhpp,
-							  OCI_THREADED | OCI_OBJECT, //ub4           mode, //TODO:  do we have to use threaded mode?
-							  0, // CONST dvoid   *ctxp,
-							  &mallocHook, // CONST dvoid   *(*malocfp)
-							  //           (dvoid *ctxp,
-							  //               size_t size),
-							  &reallocHook, // CONST dvoid   *(*ralocfp)
-							  //            (dvoid *ctxp,
-							  //             dvoid *memptr,
-							  //             size_t newsize),
-							  &freeHook, // CONST void    (*mfreefp)
-							  //            (dvoid *ctxp,
-							  //             dvoid *memptr))
-							  0, //size_t    xtramemsz,
-							  0 ); //dvoid     **usrmempp );
-	}
-	else
-	{
 		result = OCIEnvCreate(&envhp, // OCIEnv        **envhpp,
 							  OCI_THREADED | OCI_OBJECT, //ub4           mode, //TODO:  do we have to use threaded mode?
 							  0, // CONST dvoid   *ctxp,
@@ -117,7 +97,6 @@ bool DB::OCISession::connect()
 							  0, //size_t    xtramemsz,
 							  0 ); //dvoid     **usrmempp );
 		
-	}
 	FATAL(result != OCI_SUCCESS,("OciEnvCreate failed with error code %hd",result));
 	
 	// Create error handle.