From 8d9a7d3eb74b40a685c523600afa56ce5436884d Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 16 Jan 2002 14:39:56 -0500 Subject: [svn-r4839] Purpose: Bug fix Description: Missed CVS conflict in ifdef'd code Solution: Editted to remove CVS conflicted code. Platforms tested: FreeBSD 4.5 (sleipnir) --- src/H5P.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/H5P.c b/src/H5P.c index 8704f4d..aa88694 100644 --- a/src/H5P.c +++ b/src/H5P.c @@ -2451,18 +2451,11 @@ hsize_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/) { H5P_genplist_t *plist; /* Property list pointer */ -<<<<<<< H5P.c - herr_t ret_value=SUCCEED; /* return value */ - - FUNC_ENTER (H5Pget_cache, FAIL); - H5TRACE3("h","ixx",plist_id,tconv,bkg); -======= size_t size; /* Type conversion buffer size */ hsize_t ret_value=0; /* Type conversion buffer size */ FUNC_ENTER (H5Pget_buffer, 0); H5TRACE3("h","ixx",plist_id,tconv,bkg); ->>>>>>> 1.183 /* Check arguments */ if (TRUE!=H5P_isa_class(plist_id,H5P_DATASET_XFER)) -- cgit v0.12