summaryrefslogtreecommitdiffstats
path: root/hl/examples
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2006-04-12 21:21:38 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2006-04-12 21:21:38 (GMT)
commitbc66efc788bc77c9c133a9fc3cc29e26fa659bab (patch)
treed94f011f1813b4bc479a74f29048418c83f86d02 /hl/examples
parent3dfec8d73b65c5c715581e41844e075b84e8f581 (diff)
downloadhdf5-bc66efc788bc77c9c133a9fc3cc29e26fa659bab.zip
hdf5-bc66efc788bc77c9c133a9fc3cc29e26fa659bab.tar.gz
hdf5-bc66efc788bc77c9c133a9fc3cc29e26fa659bab.tar.bz2
[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:
Diffstat (limited to 'hl/examples')
-rw-r--r--hl/examples/Makefile.in3
-rw-r--r--hl/examples/ex_ds1.c4
-rw-r--r--hl/examples/ex_image1.c2
-rw-r--r--hl/examples/ex_image2.c2
-rw-r--r--hl/examples/ex_lite1.c2
-rw-r--r--hl/examples/ex_lite2.c2
-rw-r--r--hl/examples/ex_lite3.c2
-rw-r--r--hl/examples/ex_table_01.c2
-rw-r--r--hl/examples/ex_table_02.c2
-rw-r--r--hl/examples/ex_table_03.c2
-rw-r--r--hl/examples/ex_table_04.c2
-rw-r--r--hl/examples/ex_table_05.c2
-rw-r--r--hl/examples/ex_table_06.c2
-rw-r--r--hl/examples/ex_table_07.c2
-rw-r--r--hl/examples/ex_table_08.c2
-rw-r--r--hl/examples/ex_table_09.c2
-rw-r--r--hl/examples/ex_table_10.c2
-rw-r--r--hl/examples/ex_table_11.c2
-rw-r--r--hl/examples/ex_table_12.c2
-rw-r--r--hl/examples/ptExampleFL.c2
-rw-r--r--hl/examples/ptExampleVL.c2
21 files changed, 24 insertions, 21 deletions
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index 3a48602..10c65d0 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -264,6 +264,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/examples/ex_ds1.c b/hl/examples/ex_ds1.c
index 5db5e1d..0bcfe10 100644
--- a/hl/examples/ex_ds1.c
+++ b/hl/examples/ex_ds1.c
@@ -12,8 +12,8 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5DS.h"
-#include "H5LT.h"
+#include "hdf5.h"
+
#define RANK 2
#define DIM_DATA 12
diff --git a/hl/examples/ex_image1.c b/hl/examples/ex_image1.c
index 0535cbc..a2ac884 100644
--- a/hl/examples/ex_image1.c
+++ b/hl/examples/ex_image1.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5IM.h"
+#include "hdf5.h"
#define WIDTH (hsize_t)400
#define HEIGHT (hsize_t)200
diff --git a/hl/examples/ex_image2.c b/hl/examples/ex_image2.c
index 6740b06..0b4038c 100644
--- a/hl/examples/ex_image2.c
+++ b/hl/examples/ex_image2.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5IM.h"
+#include "hdf5.h"
#include <stdlib.h>
#include <string.h>
diff --git a/hl/examples/ex_lite1.c b/hl/examples/ex_lite1.c
index 6915b59..1c709f5 100644
--- a/hl/examples/ex_lite1.c
+++ b/hl/examples/ex_lite1.c
@@ -13,7 +13,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5LT.h"
+#include "hdf5.h"
#define RANK 2
diff --git a/hl/examples/ex_lite2.c b/hl/examples/ex_lite2.c
index eee213d..181bf83 100644
--- a/hl/examples/ex_lite2.c
+++ b/hl/examples/ex_lite2.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5LT.h"
+#include "hdf5.h"
int main( void )
{
diff --git a/hl/examples/ex_lite3.c b/hl/examples/ex_lite3.c
index 34c798a..c205b58 100644
--- a/hl/examples/ex_lite3.c
+++ b/hl/examples/ex_lite3.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5LT.h"
+#include "hdf5.h"
#include <stdlib.h>
#define ATTR_SIZE 5
diff --git a/hl/examples/ex_table_01.c b/hl/examples/ex_table_01.c
index 0b4cc9c..b9ca3a1 100644
--- a/hl/examples/ex_table_01.c
+++ b/hl/examples/ex_table_01.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5TB.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ex_table_02.c b/hl/examples/ex_table_02.c
index 16cf33e..71671c1 100644
--- a/hl/examples/ex_table_02.c
+++ b/hl/examples/ex_table_02.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5TB.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ex_table_03.c b/hl/examples/ex_table_03.c
index fbe66a1..f8287e1 100644
--- a/hl/examples/ex_table_03.c
+++ b/hl/examples/ex_table_03.c
@@ -13,7 +13,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5TB.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ex_table_04.c b/hl/examples/ex_table_04.c
index f31cc40..4f378e1 100644
--- a/hl/examples/ex_table_04.c
+++ b/hl/examples/ex_table_04.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5TB.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ex_table_05.c b/hl/examples/ex_table_05.c
index e658ee3..321c060 100644
--- a/hl/examples/ex_table_05.c
+++ b/hl/examples/ex_table_05.c
@@ -13,7 +13,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5TB.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ex_table_06.c b/hl/examples/ex_table_06.c
index 8d48b3c..c755ed0 100644
--- a/hl/examples/ex_table_06.c
+++ b/hl/examples/ex_table_06.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5TB.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ex_table_07.c b/hl/examples/ex_table_07.c
index f577c59..6f73d10 100644
--- a/hl/examples/ex_table_07.c
+++ b/hl/examples/ex_table_07.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5TB.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ex_table_08.c b/hl/examples/ex_table_08.c
index 0be5bbc..e77c632 100644
--- a/hl/examples/ex_table_08.c
+++ b/hl/examples/ex_table_08.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5TB.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ex_table_09.c b/hl/examples/ex_table_09.c
index 164f6aa..67dc2ce 100644
--- a/hl/examples/ex_table_09.c
+++ b/hl/examples/ex_table_09.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5TB.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ex_table_10.c b/hl/examples/ex_table_10.c
index b1e6705..ef84446 100644
--- a/hl/examples/ex_table_10.c
+++ b/hl/examples/ex_table_10.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5TB.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ex_table_11.c b/hl/examples/ex_table_11.c
index 4d12fd7..81af4e4 100644
--- a/hl/examples/ex_table_11.c
+++ b/hl/examples/ex_table_11.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5TB.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ex_table_12.c b/hl/examples/ex_table_12.c
index 3f44bf1..17bcf7e 100644
--- a/hl/examples/ex_table_12.c
+++ b/hl/examples/ex_table_12.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5TB.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ptExampleFL.c b/hl/examples/ptExampleFL.c
index 0dbf935..1596f7a 100644
--- a/hl/examples/ptExampleFL.c
+++ b/hl/examples/ptExampleFL.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5PT.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------
diff --git a/hl/examples/ptExampleVL.c b/hl/examples/ptExampleVL.c
index b813b54..eebb3c3 100644
--- a/hl/examples/ptExampleVL.c
+++ b/hl/examples/ptExampleVL.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5PT.h"
+#include "hdf5.h"
#include <stdlib.h>
/*-------------------------------------------------------------------------