[svn-r12229] Purpose:

new feature

Description:
1) separated the HL library into "public" and "private" header files, with the same caracteristics as the basic library
2) added the public headers to hdf5.h (with a conditional include macro, defined in configure.in)
3) added the path to HL in all Makefile.am 's , because of the inclusion in hdf5.h

Solution:

Platforms tested:
linux 32, 64
AIX
solaris
with fortran and c++

(one packet table example fails)

Misc. update:

6 files changed, 26 insertions, 22 deletions

diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index 14b3fcc..1e28bc3 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -303,6 +303,9 @@ RM = rm -f
 CP = cp
 TIME = time
 
+# Path for hl needed in hdf5.h
+INCLUDES = -I$(top_srcdir)/hl/src
+
 # Some machines need a command to run executables; this is that command
 # so that our tests will run.
 # We use RUNTESTS instead of RUNSERIAL directly because it may be that
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 17af015..3e72766 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -12,11 +12,11 @@
  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "H5DS.h"
-#include "H5LT.h"
 #include <stdlib.h>
 #include <string.h>
-#include "H5IM.h"
+#include "H5DSprivate.h"
+#include "H5LTprivate.h"
+#include "H5IMprivate.h"
 
 /* operator functions */
 static herr_t verifiy_scale(hid_t dset, unsigned dim, hid_t scale, void *visitor_data);
@@ -776,7 +776,7 @@ static int test_simple(void)
   goto out;
 
  /* detach again, it should fail */
- if (H5DSdetach_scale(did,dsid,DIM1)==SUCCESS)
+ if (H5DSdetach_scale(did,dsid,DIM1)==SUCCEED)
   goto out;
 
  /* verify attach, it must return 0 for no attach */
@@ -1751,7 +1751,7 @@ static int test_errors(void)
 
  TESTING2("attach a dataset to itself");
 
- if (H5DSattach_scale(did,did,0)==SUCCESS)
+ if (H5DSattach_scale(did,did,0)==SUCCEED)
   goto out;
 
  PASSED();
@@ -1762,7 +1762,7 @@ static int test_errors(void)
  */
  TESTING2("attach a group with a dataset");
 
- if (H5DSattach_scale(gid,dsid,0)==SUCCESS)
+ if (H5DSattach_scale(gid,dsid,0)==SUCCEED)
   goto out;
 
  PASSED();
@@ -1773,7 +1773,7 @@ static int test_errors(void)
  */
  TESTING2("attach a dataset with a group");
 
- if (H5DSattach_scale(did,gid,0)==SUCCESS)
+ if (H5DSattach_scale(did,gid,0)==SUCCEED)
   goto out;
 
  PASSED();
@@ -1784,7 +1784,7 @@ static int test_errors(void)
  */
  TESTING2("set scale for a group");
 
- if (H5DSset_scale(gid,"scale 1")==SUCCESS)
+ if (H5DSset_scale(gid,"scale 1")==SUCCEED)
   goto out;
 
  PASSED();
@@ -1847,7 +1847,7 @@ static int test_errors(void)
   goto out;
 
  /* try to attach "ds_a" to "dset_a", not valid */
- if(H5DSattach_scale(did,dsid,0)==SUCCESS)
+ if(H5DSattach_scale(did,dsid,0)==SUCCEED)
   goto out;
 
  /* close */
@@ -1892,7 +1892,7 @@ static int test_errors(void)
   goto out;
 
  /* try to attach "ds_a" to "ds_b", not valid */
- if(H5DSattach_scale(dsid,did,0)==SUCCESS)
+ if(H5DSattach_scale(dsid,did,0)==SUCCEED)
   goto out;
 
  /* close */
@@ -1927,7 +1927,7 @@ static int test_errors(void)
   goto out;
 
  /* try to attach "ds_a" to the image, not valid */
- if(H5DSattach_scale(did,dsid,0)==SUCCESS)
+ if(H5DSattach_scale(did,dsid,0)==SUCCEED)
   goto out;
 
  /* close */
@@ -1988,7 +1988,7 @@ static int test_errors(void)
   goto out;
 
  /* try to detach "ds_a" from "dset_a" */
- if(H5DSdetach_scale(did,dsid,0)==SUCCESS)
+ if(H5DSdetach_scale(did,dsid,0)==SUCCEED)
   goto out;
 
  /* close */
@@ -2016,7 +2016,7 @@ static int test_errors(void)
   goto out;
 
  /* try to detach "ds_a" from "grp" */
- if(H5DSdetach_scale(gid,dsid,0)==SUCCESS)
+ if(H5DSdetach_scale(gid,dsid,0)==SUCCEED)
   goto out;
 
  /* close */
@@ -2044,7 +2044,7 @@ static int test_errors(void)
   goto out;
 
  /* try to detach "grp" from "dset_a" */
- if(H5DSdetach_scale(did,gid,0)==SUCCESS)
+ if(H5DSdetach_scale(did,gid,0)==SUCCEED)
   goto out;
 
  /* close */
@@ -2153,7 +2153,7 @@ static int test_iterators(void)
   goto out;
 
  /* try to iterate trough the 3rd dimension of "dset_a", return error */
- if (H5DSiterate_scales(did,3,NULL,verifiy_scale,NULL)==SUCCESS)
+ if (H5DSiterate_scales(did,3,NULL,verifiy_scale,NULL)==SUCCEED)
   goto out;
 
  /* close */
@@ -2212,7 +2212,7 @@ static int test_iterators(void)
   goto out;
 
  /* try to iterate, return error */
- if (H5DSiterate_scales(gid,0,NULL,verifiy_scale,NULL)==SUCCESS)
+ if (H5DSiterate_scales(gid,0,NULL,verifiy_scale,NULL)==SUCCEED)
   goto out;
 
  /* close */
@@ -2237,7 +2237,7 @@ static int test_iterators(void)
   goto out;
 
  /* iterate  */
- if (H5DSiterate_scales(did,0,NULL,op_bogus,NULL)==SUCCESS)
+ if (H5DSiterate_scales(did,0,NULL,op_bogus,NULL)==SUCCEED)
   goto out;
 
  /* close */
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index b47bab8..6d1f445 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -12,7 +12,8 @@
  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "H5IM.h"
+#include "H5LTprivate.h"
+#include "H5IMprivate.h"
 #include "pal_rgb.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index b7e1af5..1816f7f 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "H5LT.h"
+#include "H5LTprivate.h"
 
 #define FILE_NAME "test_lite1.h5"
 #define FILE_NAME2 "test_lite2.h5"
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index 70199b9..739b0f7 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -12,8 +12,8 @@
  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "H5PT.h"
-#include "H5TB.h"
+#include "H5PTprivate.h"
+#include "H5TBprivate.h"
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index 48d87b0..e3d248a 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -12,7 +12,7 @@
  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "H5TB.h"
+#include "H5TBprivate.h"
 
 #include <stdlib.h>
 #include <string.h>