2 files changed, 8 insertions, 1 deletions
diff --git a/src/H5P.c b/src/H5P.c
index aa88694..8704f4d 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -2451,11 +2451,18 @@ 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))
diff --git a/src/H5R.c b/src/H5R.c
index 25c38db..3cbba0a 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -891,7 +891,7 @@ H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref)
     hid_t ret_value = H5G_UNKNOWN;
 
     FUNC_ENTER(H5Rget_obj_type, H5G_UNKNOWN);
-    H5TRACE2("Is","ix",id,_ref);
+    H5TRACE3("Is","iRtx",id,ref_type,_ref);
 
     /* Check args */
     if (NULL == (loc = H5G_loc(id)))