18 files changed, 3199 insertions, 4 deletions

diff --git a/hl/Makefile.am b/hl/Makefile.am
index 780e494..4e6db6a 100644
--- a/hl/Makefile.am
+++ b/hl/Makefile.am
@@ -20,9 +20,9 @@ include $(top_srcdir)/config/commence.am
 if BUILD_FORTRAN_CONDITIONAL
   FORTRAN_DIR = fortran
 endif
-##if BUILD_CXX_CONDITIONAL
-##  CXX_DIR = c++
-##endif
+if BUILD_CXX_CONDITIONAL
+  CXX_DIR = c++
+endif
 
 SUBDIRS=src test $(CXX_DIR) $(FORTRAN_DIR)
 
diff --git a/hl/Makefile.in b/hl/Makefile.in
index 634e3bd..81124d6 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -67,7 +67,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = src test fortran
+DIST_SUBDIRS = src test c++ fortran
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 # Set the paths for autotools to be correct on heping.
@@ -254,6 +254,7 @@ LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
 LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
 LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
 LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
+LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 docdir = $(exec_prefix)/doc
 
 # Scripts used to build examples
@@ -262,6 +263,7 @@ H5CC_PP = $(bindir)/h5pcc
 H5FC = $(bindir)/h5fc
 H5FC_PP = $(bindir)/h5pfc
 @BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran
+@BUILD_CXX_CONDITIONAL_TRUE@CXX_DIR = c++
 SUBDIRS = src test $(CXX_DIR) $(FORTRAN_DIR)
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
diff --git a/hl/c++/Makefile.am b/hl/c++/Makefile.am
new file mode 100644
index 0000000..a2d4315
--- /dev/null
+++ b/hl/c++/Makefile.am
@@ -0,0 +1,24 @@
+#
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+##
+## Makefile.am
+## Run automake to generate a Makefile.in from this file.
+#
+# High-Level API C++ Makefile(.in)
+# 
+
+include $(top_srcdir)/config/commence.am
+
+SUBDIRS=src test
+
+include $(top_srcdir)/config/conclude.am
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
new file mode 100644
index 0000000..11108e0
--- /dev/null
+++ b/hl/c++/Makefile.in
@@ -0,0 +1,717 @@
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+#
+# High-Level API C++ Makefile(.in)
+# 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/commence.am \
+	$(top_srcdir)/config/conclude.am
+subdir = hl/c++
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/src/H5config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AR = @AR@
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
+AUTOMAKE = /usr/bin/automake
+AWK = @AWK@
+BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
+BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
+BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
+BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
+BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
+BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
+BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
+BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
+BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
+BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
+BUILD_PDB2HDF = @BUILD_PDB2HDF@
+BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
+BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
+BYTESEX = @BYTESEX@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CONFIG_DATE = @CONFIG_DATE@
+CONFIG_MODE = @CONFIG_MODE@
+CONFIG_USER = @CONFIG_USER@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEBUG_PKG = @DEBUG_PKG@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DYNAMIC_DIRS = @DYNAMIC_DIRS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+
+# Make sure that these variables are exported to the Makefiles
+F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
+F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
+FC = @FC@
+FCFLAGS = @FCFLAGS@
+FFLAGS = @FFLAGS@
+FILTERS = @FILTERS@
+FSEARCH_DIRS = @FSEARCH_DIRS@
+H5_VERSION = @H5_VERSION@
+HADDR_T = @HADDR_T@
+HDF5_INTERFACES = @HDF5_INTERFACES@
+HID_T = @HID_T@
+HL = @HL@
+HL_FOR = @HL_FOR@
+HSIZET = @HSIZET@
+HSIZE_T = @HSIZE_T@
+HSSIZE_T = @HSSIZE_T@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_STATIC_EXEC = @LT_STATIC_EXEC@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MPE = @MPE@
+OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLEL = @PARALLEL@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PTHREAD = @PTHREAD@
+RANLIB = @RANLIB@
+ROOT = @ROOT@
+RUNPARALLEL = @RUNPARALLEL@
+RUNSERIAL = @RUNSERIAL@
+R_INTEGER = @R_INTEGER@
+R_LARGE = @R_LARGE@
+SEARCH = @SEARCH@
+SETX = @SETX@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIZE_T = @SIZE_T@
+SRB = @SRB@
+STATIC_SHARED = @STATIC_SHARED@
+STRIP = @STRIP@
+TESTPARALLEL = @TESTPARALLEL@
+TESTSRB = @TESTSRB@
+TRACE_API = @TRACE_API@
+USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
+USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
+USE_FILTER_NBIT = @USE_FILTER_NBIT@
+USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
+USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
+USE_FILTER_SZIP = @USE_FILTER_SZIP@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_FC = @ac_ct_FC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+
+# Install directories that automake doesn't know about
+includedir = $(exec_prefix)/include
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+# Shell commands used in Makefiles
+RM = rm -f
+CP = cp
+
+# Libraries to link to while building
+LIBHDF5 = $(top_builddir)/src/libhdf5.la
+LIBH5TEST = $(top_builddir)/test/libh5test.la
+LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
+LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
+LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
+LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
+LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
+LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
+LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
+docdir = $(exec_prefix)/doc
+
+# Scripts used to build examples
+H5CC = $(bindir)/h5cc
+H5CC_PP = $(bindir)/h5pcc
+H5FC = $(bindir)/h5fc
+H5FC_PP = $(bindir)/h5pfc
+SUBDIRS = src test
+
+# Automake needs to be taught how to build lib, progs, and tests targets.
+# These will be filled in automatically for the most part (e.g.,
+# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
+# EXTRA_TEST variables are supplied to allow the user to force targets to
+# be built at certain times. 
+LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
+      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
+
+PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
+        $(EXTRA_PROG)
+
+TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  hl/c++/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  hl/c++/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-recursive
+all-am: Makefile all-local
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \
+	check-TESTS check-am clean clean-generic clean-libtool \
+	clean-recursive ctags ctags-recursive distclean \
+	distclean-generic distclean-libtool distclean-recursive \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am
+
+
+# lib/progs/tests targets recurse into subdirectories. build-* targets
+# build files in this directory.
+build-lib: $(LIB)
+build-progs: $(LIB) $(PROGS)
+build-tests: $(LIB) $(PROGS) $(TESTS)
+
+lib progs tests ::
+	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Tell Automake to build tests when the user types `make all' (this is
+# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
+# Automake won't build them automatically, either.
+all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
+
+# make install-doc doesn't do anything outside of doc directory, but
+# Makefiles should recognize it.
+install-doc uninstall-doc:
+	@echo "Nothing to be done."
+
+# Run each test in order, passing $(TEST_FLAGS) to the program.
+# Since tests are done in a shell loop, "make -i" does apply inside it.
+# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
+# The timestamps give a rough idea how much time the tests use.
+#
+# Note that targets in TESTS (defined above) will be built when the user
+# types 'make tests' or 'make check', but only programs in TEST_PROG,
+# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
+check-TESTS: test
+
+test _test: $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
+	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
+	@for test in $(TEST_PROG) dummy; do                                  \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      srcdir="$(srcdir)"                                              \
+	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	   fi;                                                                \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG_PARA)"; then                                \
+	    echo "**** Hint ****";                                            \
+	    echo "Parallel test files reside in the current directory"        \
+	         "by default.";                                               \
+	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
+	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
+	    echo "    export HDF5_PARAPREFIX";                                \
+	    echo "    make check";                                            \
+	    echo "**** end of Hint ****";                                     \
+	fi
+	@for test in $(TEST_PROG_PARA) dummy; do                             \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      srcdir="$(srcdir)"                                              \
+	         $(RUNPARALLEL) ./$$test $(TEST_FLAGS) ||                     \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	   fi;                                                                \
+	done;                                                                 \
+	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
+	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+# Run test with different Virtual File Driver
+check-vfd:
+	@for vfd in $(VFD_LIST) dummy; do                                     \
+	    if test $$vfd != dummy; then                                      \
+	        echo "============================";                          \
+	        echo "Testing Virtual File Driver $$vfd";                     \
+	        echo "============================";                          \
+	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check;              \
+	    fi;                                                               \
+	done
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/hl/c++/src/H5PacketTable.cpp b/hl/c++/src/H5PacketTable.cpp
new file mode 100644
index 0000000..3f77d8f
--- /dev/null
+++ b/hl/c++/src/H5PacketTable.cpp
@@ -0,0 +1,293 @@
+/* Packet Table wrapper classes
+ *
+ * Wraps the H5PT Packet Table C functions in C++ objects
+ *
+ * Nat Furrer and James Laird
+ * February 2004
+ */
+
+#include "H5PacketTable.h"
+
+    /********************************/
+    /* PacketTable superclass       */
+    /********************************/
+
+    /* "Open" Constructor
+     * Opens an existing packet table, which can contain either fixed-length or
+     * variable-length records.
+     */
+    PacketTable::PacketTable(hid_t fileID, char* name)
+    {
+        table_id = H5PTopen( fileID, name);
+    }
+
+    /* Destructor
+     * Cleans up the packet table
+     */
+    PacketTable::~PacketTable()
+    {
+        H5PTclose( table_id);
+    }
+
+    /* IsValid
+     * Returns true if this packet table is valid, false otherwise.  
+     * Use this after the constructor to ensure HDF did not have
+     * any trouble making or opening the packet table.
+     */
+    bool PacketTable::IsValid()
+    {
+        if (H5PTis_valid(table_id) == 0)
+            return true;
+        else
+            return false;
+    }
+
+    /* IsVariableLength
+     * Return 1 if this packet table is a Variable Length packet table,
+     * return 0 if it is Fixed Length.  Returns -1 if the table is
+     * invalid (not open).
+     */
+    int PacketTable::IsVariableLength()
+    {
+        return H5PTis_varlen(table_id);
+    }
+
+    /* ResetIndex
+     * Sets the "current record" to the first record in the packet table
+     */
+    void PacketTable::ResetIndex()
+    {
+        H5PTcreate_index(table_id);
+    }
+
+    /* SetIndex
+     * Sets the current record to point to the record specified by index.
+     * Returns 0 on success, negative on failure (if index is out of bounds)
+     */
+    int PacketTable::SetIndex(unsigned int index)
+    {
+        return H5PTset_index(table_id, index);
+    }
+
+    /* GetPacketCount
+     * Returns the number of records in the packet table.  Error
+     * is set to 0 on success.  On failure, returns 0 and
+     * error is set to negative.
+     */
+    unsigned int PacketTable::GetPacketCount(int& error)
+    {
+        hsize_t nrecords;
+
+        error = H5PTget_num_packets( table_id, (hsize_t *)&nrecords);
+        return nrecords;
+    }
+
+    /********************************/
+    /* Fixed-Length Packet Table    */
+    /********************************/
+
+    /* Constructor
+     * Creates a packet table in which to store fixed length records.
+     * Takes the ID of the file the packet table will be created in, the name of
+     * the packet table, the ID of the datatype of the set, and the size 
+     * of a memory chunk used in chunking.
+     */
+    FL_PacketTable::FL_PacketTable(hid_t fileID, char* name, hid_t dtypeID, int chunkSize)
+    {
+        table_id = H5PTcreate_fl ( fileID, name, dtypeID, chunkSize);
+    }
+
+    /* "Open" Constructor
+     * Opens an existing fixed-length packet table.
+     * Fails if the packet table specified is variable-length.
+     */
+    FL_PacketTable::FL_PacketTable(hid_t fileID, char* name) : PacketTable(fileID, name)
+    {
+        if( H5PTis_varlen(table_id) != 0 )    // If this is not a fixed-length table
+        {
+            H5PTclose(table_id);
+            table_id = NULL;
+        }
+    }
+
+    /* AppendPacket
+     * Adds a single packet to the packet table.  Takes a pointer
+     * to the location of the data in memory.
+     * Returns 0 on success, negative on failure
+     */
+    int FL_PacketTable::AppendPacket(void * data)
+    {
+        return H5PTappend(table_id, 1, data);
+    }
+
+    /* AppendPackets (multiple packets)
+     * Adds multiple records to the packet table.  Takes the number of records to be
+     * added and a pointer to their location in memory.
+     * Returns 0 on success, -1 on failure.
+     */
+    int FL_PacketTable::AppendPackets(unsigned int numRecords, void * data)
+    {
+        return H5PTappend(table_id, numRecords, data);
+    }
+
+    /* GetPacket (indexed)
+     * Gets a single packet from the packet table.  Takes the index
+     * of the record (with 0 being the first record) and a pointer
+     * to memory where the data should be stored.
+     * Returns 0 on success, negative on failure
+     */
+    int FL_PacketTable::GetPacket(unsigned int index, void * data)
+    {
+        return H5PTread_packets(table_id, index, 1, data);
+    }
+
+    /* GetPackets (multiple packets)
+     * Gets multiple packets at once, all records between
+     * startIndex and endIndex inclusive.  Also takes a pointer to
+     * the memory where these records should be stored.
+     * Returns 0 on success, negative on failure.
+     */
+    int FL_PacketTable::GetPackets(unsigned int startIndex, unsigned int endIndex, void * data)
+    {
+        // Make sure the range of indexes is valid
+        if (startIndex > endIndex)
+            return -1;
+
+        return  H5PTread_packets(table_id, startIndex, endIndex-startIndex+1, data);
+    }
+
+    /* GetNextPacket (single packet)
+     * Gets the next record in the packet table.  Takes a pointer to
+     * memory where the record should be stored.
+     * Returns 0 on success, negative on failure.  Current record
+     * is not advanced to the next record on failure.
+     */
+    int FL_PacketTable::GetNextPacket(void * data)
+    {
+        return H5PTget_next(table_id, 1, data);
+    }
+
+    /* GetNextPackets (multiple packets)
+     * Gets the next numRecords records in the packet table.  Takes a
+     * pointer to memory where these records should be stored.
+     * Returns 0 on success, negative on failure.  Current record
+     * is not advanced on failure.
+     */
+    int FL_PacketTable::GetNextPackets(unsigned int numRecords, void * data)
+    {
+        return H5PTget_next(table_id, numRecords, data);
+    }
+    
+
+    /********************************/
+    /* Variable-Length Packet Table */
+    /********************************/
+
+    /* Constructor
+     * Creates a packet table in which to store variable length records.
+     * Takes the ID of the file the packet table will be created in, the name of
+     * the packet table, and the size of a memory chunk used in chunking.
+     */
+    VL_PacketTable::VL_PacketTable(hid_t fileID, char* name, int chunkSize)
+    {
+        table_id = H5PTcreate_vl ( fileID, name, chunkSize);
+    }
+
+    /* "Open" Constructor
+     * Opens an existing variable-length packet table.
+     * Fails if the packet table specified is fixed-length.
+     */
+    VL_PacketTable::VL_PacketTable(hid_t fileID, char* name) : PacketTable(fileID, name)
+    {
+        if( H5PTis_varlen(table_id) != 1 )    // If this is not a variable-length table
+        {
+            H5PTclose(table_id);
+            table_id = NULL;
+        }
+    }
+
+    /* AppendPacket (variable-length)
+     * Adds a single variable-length packet to the packet table.
+     * Takes a pointer to the location of the data in memory and the length of the data
+     * in bytes.
+     * Returns 0 on success, negative on failure.
+     */
+       int VL_PacketTable::AppendPacket(void * data, unsigned int length)
+    {
+        hvl_t packet;
+
+        packet.len = length;
+        packet.p = data;
+
+        return H5PTappend(table_id, 1, &packet);
+    }
+
+    /* AppendPackets (multiple packets)
+     * Adds multiple variable-length records to the packet table.  Takes the number of
+     * records to be added and a pointer to an array of hvl_t structs in memory.
+     * Returns 0 on success, negative on failure.
+     */
+    int VL_PacketTable::AppendPackets(unsigned int numRecords, hvl_t * data)
+    {
+        return H5PTappend(table_id, numRecords, data);
+    }
+
+    /* GetPacket (indexed)
+     * Gets a single variable-length record from the packet table.  Takes the index
+     * of the record (with 0 being the first record) and a pointer
+     * to a hvl_t struct in which to store the record's size and location.
+     * Returns 0 on success, negative on failure.
+     */
+    int VL_PacketTable::GetPacket(unsigned int index, hvl_t * data)
+    {
+        return H5PTread_packets(table_id, index, 1, data);
+    }
+
+    /* GetPackets (multiple packets)
+     * Gets multiple variable-length records at once, all records between
+     * startIndex and endIndex inclusive.  Takes a pointer to an array
+     * of hvl_t structs in memory in which to store pointers to the records.
+     * Returns 0 on success, negative on failure.
+     */
+    int VL_PacketTable::GetPackets(unsigned int startIndex, unsigned int endIndex, hvl_t * data)
+    {
+        // Make sure the range of indexes is valid
+        if (startIndex > endIndex)
+            return -1;
+
+        return  H5PTread_packets(table_id, startIndex, endIndex-startIndex+1, data);
+    }
+
+    /* GetNextPacket (single packet)
+     * Gets the next record in the packet table.  Takes a pointer to
+     * an hvl_t struct where the record should be stored.
+     * Returns 0 on success, negative on failure.  Current record
+     * is not advanced to the next record on failure.
+     */
+    int VL_PacketTable::GetNextPacket(hvl_t * data)
+    {
+        return H5PTget_next(table_id, 1, data);
+    }
+
+    /* GetNextPackets (multiple packets)
+     * Gets the next numRecords records in the packet table.  Takes a
+     * pointer to an array of hvl_t structs where pointers to the records
+     * should be stored.
+     * Returns 0 on success, negative on failure.  Current record
+     * is not advanced on failure.
+     */
+    int VL_PacketTable::GetNextPackets(unsigned int numRecords, hvl_t * data)
+    {
+        return H5PTget_next(table_id, numRecords, data);
+    }
+
+    /* FreeReadbuff
+     * Frees the buffers created when variable-length records are read.
+     * Takes the number of hvl_t structs to be freed and a pointer to their location
+     * in memory.
+     * Returns 0 on success, negative on error.
+     */
+    int VL_PacketTable::FreeReadbuff(unsigned int numStructs, hvl_t * buffer)
+    {
+        return H5PTfree_vlen_readbuff( table_id, numStructs, buffer);
+    }
diff --git a/hl/c++/src/H5PacketTable.h b/hl/c++/src/H5PacketTable.h
new file mode 100644
index 0000000..559656c
--- /dev/null
+++ b/hl/c++/src/H5PacketTable.h
@@ -0,0 +1,212 @@
+/* Packet Table wrapper classes
+ *
+ * Wraps the H5PT Packet Table C functions in C++ objects
+ *
+ * Nat Furrer and James Laird
+ * February 2004
+ */
+
+#ifndef H5PTWRAP_H
+#define H5PTWRAP_H
+
+#include "H5PT.h"
+
+class PacketTable
+{
+public:
+    /* Null constructor
+     * Sets table_id to "invalid"
+     */
+    PacketTable() {table_id = H5I_BADID;}
+
+    /* "Open" Constructor
+     * Opens an existing packet table, which can contain either fixed-length or
+     * variable-length records.
+     */
+    PacketTable(hid_t fileID, char* name);
+
+    /* Destructor
+     * Cleans up the packet table
+     */
+    ~PacketTable();
+
+    /* IsValid
+     * Returns true if this packet table is valid, false otherwise.  
+     * Use this after the constructor to ensure HDF did not have
+     * any trouble making or opening the packet table.
+     */
+    bool IsValid();
+
+    /* IsVariableLength
+     * Return 1 if this packet table is a Variable Length packet table,
+     * return 0 if it is Fixed Length.  Returns -1 if the table is
+     * invalid (not open).
+     */
+    int IsVariableLength();
+
+    /* ResetIndex
+     * Sets the "current record" to the first record in the packet table
+     */
+    void ResetIndex();
+
+    /* SetIndex
+     * Sets the current record to point to the record specified by index.
+     * Returns 0 on success, negative on failure (if index is out of bounds)
+     */
+    int SetIndex(unsigned int index);
+
+    /* GetPacketCount
+     * Returns the number of records in the packet table.  Error
+     * is set to 0 on success.  On failure, returns 0 and
+     * error is set to negative.
+     */
+    unsigned int GetPacketCount(int& error);
+
+    unsigned int GetPacketCount()
+    {
+        int ignoreError;
+        return GetPacketCount(ignoreError);
+    }
+
+protected:
+    hid_t table_id;
+};
+
+class FL_PacketTable : virtual public PacketTable
+{
+public:
+    /* Constructor
+     * Creates a packet table in which to store fixed length records.
+     * Takes the ID of the file the packet table will be created in, the name of
+     * the packet table, the ID of the datatype of the set, and the size 
+     * of a memory chunk used in chunking.
+     */
+    FL_PacketTable(hid_t fileID, char* name, hid_t dtypeID, int chunkSize);
+
+    /* "Open" Constructor
+     * Opens an existing fixed-length packet table.
+     * Fails if the packet table specified is variable-length.
+     */
+    FL_PacketTable(hid_t fileID, char* name);
+
+    /* AppendPacket
+     * Adds a single packet to the packet table.  Takes a pointer
+     * to the location of the data in memory.
+     * Returns 0 on success, negative on failure
+     */
+    int AppendPacket(void * data);
+
+    /* AppendPackets (multiple records)
+     * Adds multiple records to the packet table.  Takes the number of records to be
+     * added and a pointer to their location in memory.
+     * Returns 0 on success, -1 on failure.
+     */
+    int AppendPackets(unsigned int numRecords, void * data);
+
+    /* GetPacket (indexed)
+     * Gets a single packet from the packet table.  Takes the index
+     * of the record (with 0 being the first record) and a pointer
+     * to memory where the data should be stored.
+     * Returns 0 on success, negative on failure
+     */
+    int GetPacket(unsigned int index, void * data);
+
+    /* GetPackets (multiple records)
+     * Gets multiple packets at once, all records between
+     * startIndex and endIndex inclusive.  Also takes a pointer to
+     * the memory where these records should be stored.
+     * Returns 0 on success, negative on failure.
+     */
+    int GetPackets(unsigned int startIndex, unsigned int endIndex, void * data);
+
+    /* GetNextPacket (single record)
+     * Gets the next record in the packet table.  Takes a pointer to
+     * memory where the record should be stored.
+     * Returns 0 on success, negative on failure.  Current record
+     * is not advanced to the next record on failure.
+     */
+    int GetNextPacket(void * data);
+
+    /* GetNextPackets (multiple records)
+     * Gets the next numRecords records in the packet table.  Takes a
+     * pointer to memory where these records should be stored.
+     * Returns 0 on success, negative on failure.  Current record
+     * is not advanced on failure.
+     */
+    int GetNextPackets(unsigned int numRecords, void * data);
+};
+
+class VL_PacketTable : virtual public PacketTable
+{
+public:
+    /* Constructor
+     * Creates a packet table in which to store variable length records.
+     * Takes the ID of the file the packet table will be created in, the name of
+     * the packet table, and the size of a memory chunk used in chunking.
+     */
+    VL_PacketTable(hid_t fileID, char* name, int chunkSize);
+
+    /* "Open" Constructor
+     * Opens an existing variable-length packet table.
+     * Fails if the packet table specified is fixed-length.
+     */
+    VL_PacketTable(hid_t fileID, char* name);
+
+    /* AppendPacket
+     * Adds a single packet of any length to the packet table.
+     * Takes a pointer to the location of the data in memory and the length of the data
+     * in bytes.
+     * Returns 0 on success, negative on failure.
+     */
+    int AppendPacket(void * data, unsigned int length);
+
+    /* AppendPackets (multiple records)
+     * Adds multiple variable-length records to the packet table.  Takes the number of
+     * records to be added and a pointer to an array of hvl_t structs in memory.
+     * Returns 0 on success, negative on failure.
+     */
+    int AppendPackets(unsigned int numRecords, hvl_t * data);
+
+    /* GetPacket (indexed)
+     * Gets a single variable-length record from the packet table.  Takes the index
+     * of the record (with 0 being the first record) and a pointer
+     * to a hvl_t struct in which to store the record's size and location.
+     * Returns 0 on success, negative on failure.
+     */
+    int GetPacket(unsigned int index, hvl_t * data);
+
+    /* GetPackets (multiple records)
+     * Gets multiple variable-length records at once, all records between
+     * startIndex and endIndex inclusive.  Takes a pointer to an array
+     * of hvl_t structs in memory in which to store pointers to the records.
+     * Returns 0 on success, negative on failure.
+     */
+    int GetPackets(unsigned int startIndex, unsigned int endIndex, hvl_t * data);
+
+    /* GetNextPacket (single record)
+     * Gets the next record in the packet table.  Takes a pointer to
+     * an hvl_t struct where the record should be stored.
+     * Returns 0 on success, negative on failure.  Current record
+     * is not advanced to the next record on failure.
+     */
+    int GetNextPacket(hvl_t * data);
+
+    /* GetNextPackets (multiple records)
+     * Gets the next numRecords records in the packet table.  Takes a
+     * pointer to an array of hvl_t structs where pointers to the records
+     * should be stored.
+     * Returns 0 on success, negative on failure.  Current record
+     * is not advanced on failure.
+     */
+    int GetNextPackets(unsigned int numRecords, hvl_t * data);
+
+    /* FreeReadbuff
+     * Frees the buffers created when variable-length records are read.
+     * Takes the number of hvl_t structs to be freed and a pointer to their location
+     * in memory.
+     * Returns 0 on success, negative on error.
+     */
+    int FreeReadbuff(unsigned int numStructs, hvl_t * buffer);
+};
+
+#endif /* H5PTWRAP_H */
diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am
new file mode 100644
index 0000000..9e44c23
--- /dev/null
+++ b/hl/c++/src/Makefile.am
@@ -0,0 +1,40 @@
+#
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+##
+## Makefile.am
+## Run automake to generate a Makefile.in from this file.
+#
+# HDF5-C++ Makefile(.in)
+# 
+
+include $(top_srcdir)/config/commence.am
+
+# Include src directory
+INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src
+
+# Build the library statically because some compliers can only link one
+# dynamic library, and that's the main hdf5 library (which is much larger
+# than this one).
+AM_LDFLAGS=-static
+
+# This is our main target
+lib_LTLIBRARIES=libhdf5_hl_cpp.la
+
+# Source files for the library
+# At the moment, only the H5PT Packet Table has a C++ API.
+libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp
+
+# Public headers
+include_HEADERS=H5PacketTable.h
+
+include $(top_srcdir)/config/conclude.am
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
new file mode 100644
index 0000000..23df74a
--- /dev/null
+++ b/hl/c++/src/Makefile.in
@@ -0,0 +1,739 @@
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+#
+# HDF5-C++ Makefile(.in)
+# 
+
+
+SOURCES = $(libhdf5_hl_cpp_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/config/commence.am \
+	$(top_srcdir)/config/conclude.am
+subdir = hl/c++/src
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/src/H5config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libhdf5_hl_cpp_la_LIBADD =
+am_libhdf5_hl_cpp_la_OBJECTS = H5PacketTable.lo
+libhdf5_hl_cpp_la_OBJECTS = $(am_libhdf5_hl_cpp_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src
+depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libhdf5_hl_cpp_la_SOURCES)
+DIST_SOURCES = $(libhdf5_hl_cpp_la_SOURCES)
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AR = @AR@
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
+AUTOMAKE = /usr/bin/automake
+AWK = @AWK@
+BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
+BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
+BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
+BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
+BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
+BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
+BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
+BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
+BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
+BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
+BUILD_PDB2HDF = @BUILD_PDB2HDF@
+BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
+BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
+BYTESEX = @BYTESEX@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CONFIG_DATE = @CONFIG_DATE@
+CONFIG_MODE = @CONFIG_MODE@
+CONFIG_USER = @CONFIG_USER@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEBUG_PKG = @DEBUG_PKG@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DYNAMIC_DIRS = @DYNAMIC_DIRS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+
+# Make sure that these variables are exported to the Makefiles
+F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
+F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
+FC = @FC@
+FCFLAGS = @FCFLAGS@
+FFLAGS = @FFLAGS@
+FILTERS = @FILTERS@
+FSEARCH_DIRS = @FSEARCH_DIRS@
+H5_VERSION = @H5_VERSION@
+HADDR_T = @HADDR_T@
+HDF5_INTERFACES = @HDF5_INTERFACES@
+HID_T = @HID_T@
+HL = @HL@
+HL_FOR = @HL_FOR@
+HSIZET = @HSIZET@
+HSIZE_T = @HSIZE_T@
+HSSIZE_T = @HSSIZE_T@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_STATIC_EXEC = @LT_STATIC_EXEC@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MPE = @MPE@
+OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLEL = @PARALLEL@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PTHREAD = @PTHREAD@
+RANLIB = @RANLIB@
+ROOT = @ROOT@
+RUNPARALLEL = @RUNPARALLEL@
+RUNSERIAL = @RUNSERIAL@
+R_INTEGER = @R_INTEGER@
+R_LARGE = @R_LARGE@
+SEARCH = @SEARCH@
+SETX = @SETX@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIZE_T = @SIZE_T@
+SRB = @SRB@
+STATIC_SHARED = @STATIC_SHARED@
+STRIP = @STRIP@
+TESTPARALLEL = @TESTPARALLEL@
+TESTSRB = @TESTSRB@
+TRACE_API = @TRACE_API@
+USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
+USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
+USE_FILTER_NBIT = @USE_FILTER_NBIT@
+USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
+USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
+USE_FILTER_SZIP = @USE_FILTER_SZIP@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_FC = @ac_ct_FC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+
+# Install directories that automake doesn't know about
+includedir = $(exec_prefix)/include
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+# Shell commands used in Makefiles
+RM = rm -f
+CP = cp
+
+# Libraries to link to while building
+LIBHDF5 = $(top_builddir)/src/libhdf5.la
+LIBH5TEST = $(top_builddir)/test/libh5test.la
+LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
+LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
+LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
+LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
+LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
+LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
+LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
+docdir = $(exec_prefix)/doc
+
+# Scripts used to build examples
+H5CC = $(bindir)/h5cc
+H5CC_PP = $(bindir)/h5pcc
+H5FC = $(bindir)/h5fc
+H5FC_PP = $(bindir)/h5pfc
+
+# Include src directory
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src
+
+# Build the library statically because some compliers can only link one
+# dynamic library, and that's the main hdf5 library (which is much larger
+# than this one).
+AM_LDFLAGS = -static
+
+# This is our main target
+lib_LTLIBRARIES = libhdf5_hl_cpp.la
+
+# Source files for the library
+# At the moment, only the H5PT Packet Table has a C++ API.
+libhdf5_hl_cpp_la_SOURCES = H5PacketTable.cpp
+
+# Public headers
+include_HEADERS = H5PacketTable.h
+
+# Automake needs to be taught how to build lib, progs, and tests targets.
+# These will be filled in automatically for the most part (e.g.,
+# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
+# EXTRA_TEST variables are supplied to allow the user to force targets to
+# be built at certain times. 
+LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
+      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
+
+PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
+        $(EXTRA_PROG)
+
+TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  hl/c++/src/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  hl/c++/src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libhdf5_hl_cpp.la: $(libhdf5_hl_cpp_la_OBJECTS) $(libhdf5_hl_cpp_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libhdf5_hl_cpp_la_LDFLAGS) $(libhdf5_hl_cpp_la_OBJECTS) $(libhdf5_hl_cpp_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5PacketTable.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	@list='$(include_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+uninstall-includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(include_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../../../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-includeHEADERS
+
+install-exec-am: install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+	uninstall-libLTLIBRARIES
+
+.PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
+	clean clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am \
+	install-includeHEADERS install-info install-info-am \
+	install-libLTLIBRARIES install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-includeHEADERS \
+	uninstall-info-am uninstall-libLTLIBRARIES
+
+
+# lib/progs/tests targets recurse into subdirectories. build-* targets
+# build files in this directory.
+build-lib: $(LIB)
+build-progs: $(LIB) $(PROGS)
+build-tests: $(LIB) $(PROGS) $(TESTS)
+
+lib progs tests ::
+	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Tell Automake to build tests when the user types `make all' (this is
+# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
+# Automake won't build them automatically, either.
+all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
+
+# make install-doc doesn't do anything outside of doc directory, but
+# Makefiles should recognize it.
+install-doc uninstall-doc:
+	@echo "Nothing to be done."
+
+# Run each test in order, passing $(TEST_FLAGS) to the program.
+# Since tests are done in a shell loop, "make -i" does apply inside it.
+# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
+# The timestamps give a rough idea how much time the tests use.
+#
+# Note that targets in TESTS (defined above) will be built when the user
+# types 'make tests' or 'make check', but only programs in TEST_PROG,
+# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
+check-TESTS: test
+
+test _test: $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
+	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
+	@for test in $(TEST_PROG) dummy; do                                  \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      srcdir="$(srcdir)"                                              \
+	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	   fi;                                                                \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG_PARA)"; then                                \
+	    echo "**** Hint ****";                                            \
+	    echo "Parallel test files reside in the current directory"        \
+	         "by default.";                                               \
+	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
+	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
+	    echo "    export HDF5_PARAPREFIX";                                \
+	    echo "    make check";                                            \
+	    echo "**** end of Hint ****";                                     \
+	fi
+	@for test in $(TEST_PROG_PARA) dummy; do                             \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      srcdir="$(srcdir)"                                              \
+	         $(RUNPARALLEL) ./$$test $(TEST_FLAGS) ||                     \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	   fi;                                                                \
+	done;                                                                 \
+	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
+	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+# Run test with different Virtual File Driver
+check-vfd:
+	@for vfd in $(VFD_LIST) dummy; do                                     \
+	    if test $$vfd != dummy; then                                      \
+	        echo "============================";                          \
+	        echo "Testing Virtual File Driver $$vfd";                     \
+	        echo "============================";                          \
+	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check;              \
+	    fi;                                                               \
+	done
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/hl/c++/test/Makefile.am b/hl/c++/test/Makefile.am
new file mode 100644
index 0000000..f81a4e1
--- /dev/null
+++ b/hl/c++/test/Makefile.am
@@ -0,0 +1,37 @@
+#
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+##
+## Makefile.am
+## Run automake to generate a Makefile.in from this file.
+#
+# HDF5-C++ Makefile(.in)
+# 
+
+include $(top_srcdir)/config/commence.am
+
+# Include src and c++/src directories
+INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src
+
+# C++ libraries and tests are built statically
+AM_LDFLAGS=-static
+
+# These are our main targets.  They should be listed in the order to be
+# executed, generally most specific tests to least specific tests.
+TEST_PROG=ptableTest
+check_PROGRAMS=$(TEST_PROG)
+
+# The tests depend on the hdf5 library and the hdf5_hl library
+LDADD=$(LIBH5CPP_HL) $(LIBH5_HL) $(LIBHDF5)
+
+ptableTest_SOURCES=ptableTest.cpp
+include $(top_srcdir)/config/conclude.am
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
new file mode 100644
index 0000000..546dc83
--- /dev/null
+++ b/hl/c++/test/Makefile.in
@@ -0,0 +1,688 @@
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+#
+# HDF5-C++ Makefile(.in)
+# 
+SOURCES = $(ptableTest_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/commence.am \
+	$(top_srcdir)/config/conclude.am
+check_PROGRAMS = $(am__EXEEXT_1)
+subdir = hl/c++/test
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/src/H5config.h
+CONFIG_CLEAN_FILES =
+am__EXEEXT_1 = ptableTest$(EXEEXT)
+am_ptableTest_OBJECTS = ptableTest.$(OBJEXT)
+ptableTest_OBJECTS = $(am_ptableTest_OBJECTS)
+ptableTest_LDADD = $(LDADD)
+am__DEPENDENCIES_1 = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
+am__DEPENDENCIES_2 = $(top_builddir)/hl/src/libhdf5_hl.la
+am__DEPENDENCIES_3 = $(top_builddir)/src/libhdf5.la
+ptableTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_3)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src
+depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(ptableTest_SOURCES)
+DIST_SOURCES = $(ptableTest_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+# Set the paths for autotools to be correct on heping.
+# Ideally, these tools should never be needed during the build.
+ACLOCAL = /usr/bin/aclocal
+ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AR = @AR@
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
+AUTOMAKE = /usr/bin/automake
+AWK = @AWK@
+BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
+BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
+BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
+BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
+BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
+BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
+BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
+BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
+BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
+BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
+BUILD_PDB2HDF = @BUILD_PDB2HDF@
+BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
+BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
+BYTESEX = @BYTESEX@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
+CONFIG_DATE = @CONFIG_DATE@
+CONFIG_MODE = @CONFIG_MODE@
+CONFIG_USER = @CONFIG_USER@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEBUG_PKG = @DEBUG_PKG@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DYNAMIC_DIRS = @DYNAMIC_DIRS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+
+# Make sure that these variables are exported to the Makefiles
+F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
+F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
+FC = @FC@
+FCFLAGS = @FCFLAGS@
+FFLAGS = @FFLAGS@
+FILTERS = @FILTERS@
+FSEARCH_DIRS = @FSEARCH_DIRS@
+H5_VERSION = @H5_VERSION@
+HADDR_T = @HADDR_T@
+HDF5_INTERFACES = @HDF5_INTERFACES@
+HID_T = @HID_T@
+HL = @HL@
+HL_FOR = @HL_FOR@
+HSIZET = @HSIZET@
+HSIZE_T = @HSIZE_T@
+HSSIZE_T = @HSSIZE_T@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_STATIC_EXEC = @LT_STATIC_EXEC@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MPE = @MPE@
+OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLEL = @PARALLEL@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PTHREAD = @PTHREAD@
+RANLIB = @RANLIB@
+ROOT = @ROOT@
+RUNPARALLEL = @RUNPARALLEL@
+RUNSERIAL = @RUNSERIAL@
+R_INTEGER = @R_INTEGER@
+R_LARGE = @R_LARGE@
+SEARCH = @SEARCH@
+SETX = @SETX@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIZE_T = @SIZE_T@
+SRB = @SRB@
+STATIC_SHARED = @STATIC_SHARED@
+STRIP = @STRIP@
+TESTPARALLEL = @TESTPARALLEL@
+TESTSRB = @TESTSRB@
+TRACE_API = @TRACE_API@
+USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
+USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
+USE_FILTER_NBIT = @USE_FILTER_NBIT@
+USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
+USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
+USE_FILTER_SZIP = @USE_FILTER_SZIP@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_FC = @ac_ct_FC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+
+# Install directories that automake doesn't know about
+includedir = $(exec_prefix)/include
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+# Shell commands used in Makefiles
+RM = rm -f
+CP = cp
+
+# Libraries to link to while building
+LIBHDF5 = $(top_builddir)/src/libhdf5.la
+LIBH5TEST = $(top_builddir)/test/libh5test.la
+LIBH5F = $(top_builddir)/fortran/src/libhdf5_fortran.la
+LIBH5FTEST = $(top_builddir)/fortran/test/libh5test_fortran.la
+LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
+LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
+LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
+LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
+LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
+docdir = $(exec_prefix)/doc
+
+# Scripts used to build examples
+H5CC = $(bindir)/h5cc
+H5CC_PP = $(bindir)/h5pcc
+H5FC = $(bindir)/h5fc
+H5FC_PP = $(bindir)/h5pfc
+
+# Include src and c++/src directories
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src
+
+# C++ libraries and tests are built statically
+AM_LDFLAGS = -static
+
+# These are our main targets.  They should be listed in the order to be
+# executed, generally most specific tests to least specific tests.
+TEST_PROG = ptableTest
+
+# The tests depend on the hdf5 library and the hdf5_hl library
+LDADD = $(LIBH5CPP_HL) $(LIBH5_HL) $(LIBHDF5)
+ptableTest_SOURCES = ptableTest.cpp
+
+# Automake needs to be taught how to build lib, progs, and tests targets.
+# These will be filled in automatically for the most part (e.g.,
+# lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
+# EXTRA_TEST variables are supplied to allow the user to force targets to
+# be built at certain times. 
+LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
+      $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
+
+PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
+        $(EXTRA_PROG)
+
+TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  hl/c++/test/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  hl/c++/test/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+ptableTest$(EXEEXT): $(ptableTest_OBJECTS) $(ptableTest_DEPENDENCIES) 
+	@rm -f ptableTest$(EXEEXT)
+	$(CXXLINK) $(ptableTest_LDFLAGS) $(ptableTest_OBJECTS) $(ptableTest_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptableTest.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../../../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile all-local
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
+	clean clean-checkPROGRAMS clean-generic clean-libtool ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-info-am
+
+
+# lib/progs/tests targets recurse into subdirectories. build-* targets
+# build files in this directory.
+build-lib: $(LIB)
+build-progs: $(LIB) $(PROGS)
+build-tests: $(LIB) $(PROGS) $(TESTS)
+
+lib progs tests ::
+	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Tell Automake to build tests when the user types `make all' (this is
+# not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
+# Automake won't build them automatically, either.
+all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
+
+# make install-doc doesn't do anything outside of doc directory, but
+# Makefiles should recognize it.
+install-doc uninstall-doc:
+	@echo "Nothing to be done."
+
+# Run each test in order, passing $(TEST_FLAGS) to the program.
+# Since tests are done in a shell loop, "make -i" does apply inside it.
+# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
+# The timestamps give a rough idea how much time the tests use.
+#
+# Note that targets in TESTS (defined above) will be built when the user
+# types 'make tests' or 'make check', but only programs in TEST_PROG,
+# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
+check-TESTS: test
+
+test _test: $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
+	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
+	@for test in $(TEST_PROG) dummy; do                                  \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      srcdir="$(srcdir)"                                              \
+	         $(RUNTEST) ./$$test $(TEST_FLAGS) ||                         \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	   fi;                                                                \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG_PARA)"; then                                \
+	    echo "**** Hint ****";                                            \
+	    echo "Parallel test files reside in the current directory"        \
+	         "by default.";                                               \
+	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
+	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
+	    echo "    export HDF5_PARAPREFIX";                                \
+	    echo "    make check";                                            \
+	    echo "**** end of Hint ****";                                     \
+	fi
+	@for test in $(TEST_PROG_PARA) dummy; do                             \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      srcdir="$(srcdir)"                                              \
+	         $(RUNPARALLEL) ./$$test $(TEST_FLAGS) ||                     \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	   fi;                                                                \
+	done;                                                                 \
+	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
+	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+# Run test with different Virtual File Driver
+check-vfd:
+	@for vfd in $(VFD_LIST) dummy; do                                     \
+	    if test $$vfd != dummy; then                                      \
+	        echo "============================";                          \
+	        echo "Testing Virtual File Driver $$vfd";                     \
+	        echo "============================";                          \
+	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check;              \
+	    fi;                                                               \
+	done
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
new file mode 100644
index 0000000..e82d581
--- /dev/null
+++ b/hl/c++/test/ptableTest.cpp
@@ -0,0 +1,398 @@
+#include "ptableTest.h"
+
+/* Main test function */
+int main(void)
+{
+    herr_t err;
+
+    /* Create new HDF5 file */
+    fileID = H5Fcreate("test.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if(fileID <0)
+        fprintf(stderr, "Couldn't open file.\n");
+    else {
+
+            BasicTest();
+
+            TestCompoundDatatype();
+
+            TestGetPacket();
+
+            TestGetNext();
+
+            TestErrors();
+
+            SystemTest();
+
+            VariableLengthTest();
+
+        /* Terminate access to the file. */
+        err = H5Fclose(fileID);
+        if( err < 0 )
+            fprintf(stderr, "Failed to close file.\n");
+    }
+}
+
+
+void BasicTest()
+{
+    printf("Basic Test running...\n");
+
+    herr_t err;
+    int myRecord;
+    int count;
+    int error;
+
+    FL_PacketTable wrapper(fileID, "/basicTest", H5T_NATIVE_INT, 1);
+    assert(wrapper.IsValid());
+
+    /* Ensure initial count is zero */
+    count = wrapper.GetPacketCount(error);
+    assert(count == 0);
+    assert(error == 0);
+
+    myRecord = 1;
+
+    /* add some records test */
+    err = wrapper.AppendPacket(&myRecord);
+    if(err == -1)
+        printf("AppendHorizontalRecord failed.\n");
+    else{
+
+    myRecord = 2;
+
+    wrapper.AppendPacket(&myRecord);
+
+    /* get number of records test */
+    count = wrapper.GetPacketCount();    
+
+    assert(count == 2);
+
+    /* get records test */
+    err = wrapper.GetPacket(0, &myRecord);
+    if(err == -1)
+        fprintf(stderr, "Error in GetPacket.\n");
+
+    assert(myRecord == 1);
+
+    err = wrapper.GetPacket(1, &myRecord);
+    if(err == -1)
+        fprintf(stderr, "Error in GetPacket.\n");
+
+    assert(myRecord == 2);
+}
+}
+
+void TestCompoundDatatype()
+{
+printf("TestCompoundDatatype running...\n");
+
+    hid_t dtypeID;
+    int error;
+
+    /* Create compound datatype */
+    typedef struct compoundType
+    {
+        short a, b, c;
+        int e;
+    } compoundType;
+
+    dtypeID = H5Tcreate( H5T_COMPOUND, sizeof(compoundType));
+
+    H5Tinsert(dtypeID, "abbey", HOFFSET( compoundType, a ), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID, "bert", HOFFSET( compoundType, b ), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID, "charlie", HOFFSET( compoundType, c ), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID, "ebert", HOFFSET( compoundType, e ), H5T_NATIVE_INT);
+
+    /* Create packet table */
+    FL_PacketTable wrapper(fileID, "/compoundTest", dtypeID, 1);
+
+    assert(wrapper.IsValid());
+
+    compoundType first;
+    first.a = 1;
+    first.b = first.c = 3;
+    first.e = 5;
+
+    /* Write packet */
+    wrapper.AppendPacket(&first);
+
+    int count = wrapper.GetPacketCount(error);
+    assert(count == 1);
+
+    first.a = first.b = first.c = 0;
+    first.e = 0;
+
+    /* Read packet back */
+    wrapper.GetPacket(0, &first);
+
+    assert(first.a == 1);
+    assert(first.e == 5);
+}
+
+void TestGetNext()
+{
+printf("TestGetNext running...\n");
+
+    int error;
+
+    /* Create a dataset */
+    FL_PacketTable wrapper(fileID, "/TestGetNext", H5T_NATIVE_INT, 1);
+
+    assert(wrapper.IsValid());
+
+    int record;
+    int records[2];
+
+    /* Append 5 records to the dataset */
+    for(record = 1; record < 6; record++)
+        wrapper.AppendPacket(&record);
+
+    /* Ensure that we can interate through the records and get the right ones */
+    for(int i = 1; i < 6; i++)
+    {
+        wrapper.GetNextPacket(&record);
+        assert(record == i);
+    }
+
+    wrapper.ResetIndex();
+
+    /* Ensure that we can interate through the records and get the right ones */
+    for(int i = 1; i < 6; i++)
+    {
+        error = wrapper.GetNextPacket(&record);
+        assert(record == i);
+        assert(error == 0);
+    }
+
+    wrapper.SetIndex(1);
+
+    /* Ensure we can get multiple records with our index pointer */
+    wrapper.GetNextPackets(2, records);
+    assert(records[0] == 2);
+    assert(records[1] == 3);
+
+    /* Ensure our pointer was updated correctly */
+    wrapper.GetNextPacket(&record);
+    assert(record == 4);
+}
+
+void TestGetPacket()
+{
+    printf("TestGetPacket running...\n");
+
+    /* Create a dataset */
+    FL_PacketTable wrapper(fileID, "/TestGetPacket", H5T_NATIVE_INT, 1);
+
+    assert(wrapper.IsValid());
+
+    int record;
+
+    /* Append 5 records to the dataset */
+    for(record = 1; record < 6; record++)
+        wrapper.AppendPacket(&record);
+
+    /* Ensure that the records were written properly */
+    wrapper.GetPacket(1, &record);
+    assert(record == 2);
+
+    /* Ensure that we can retrieve multiple records */
+    int theRecs[3] = {0, 0, 0};
+    wrapper.GetPackets(1, 3, theRecs);
+    for(int i = 0; i < 3; i++)
+        assert(theRecs[i] == i+2);
+}
+
+void TestErrors()
+{
+    printf("TestErrors running...\n");
+
+    /* Create a dataset */
+    FL_PacketTable wrapper(fileID, "/TestErrors", H5T_NATIVE_INT, 1);
+
+    assert(wrapper.IsValid());
+
+    int record;
+    int records[3];
+    int error;
+
+    /* Append 4 records to the dataset */
+    for(record = 1; record < 5; record++)
+        wrapper.AppendPacket(&record);
+
+    /* Try to confuse functions with bad indexes */
+    error = wrapper.GetPacket(-1, &record);
+    assert(error == -1);
+    error = wrapper.GetPacket(4, &record);
+    assert(error == -1);
+    error = wrapper.GetPacket(-250, &record);
+    assert(error == -1);
+    error = wrapper.GetPacket(3000, &record);
+    assert(error == -1);
+    error = wrapper.GetPacket(1, &record);
+    assert(error == 0);
+
+    error = wrapper.GetPackets(-1, 1, records);
+    assert(error == -1);
+    error = wrapper.GetPackets(2, 4, records);
+    assert(error == -1);
+    error = wrapper.GetPackets(-60, -62, records);
+    assert(error == -1);
+    error = wrapper.GetPackets(10, 12, records);
+    assert(error == -1);
+    error = wrapper.GetPackets(0, 2, records);
+    assert(error == 0);
+    error = wrapper.GetPackets(2, 0, records);
+    assert(error == -1);
+    error = wrapper.GetPackets(1, 1, records);
+    assert(error == 0);
+    error = wrapper.GetPackets(1, 3, records);
+    assert(error == 0);
+
+    wrapper.ResetIndex();
+    error = wrapper.SetIndex(-1);
+    assert(error == -1);
+    error = wrapper.GetNextPacket(&record);
+    assert(error == 0);
+    assert(record == 1);
+    error = wrapper.SetIndex(20);
+    assert(error == -1);
+    error = wrapper.GetNextPacket(&record);
+    assert(error == 0);
+    assert(record == 2);
+    wrapper.SetIndex(3);
+    error = wrapper.GetNextPacket(&record);
+    assert(error == 0);
+    assert(record == 4);
+    error = wrapper.GetNextPacket(&record);
+    assert(error == -1);
+
+    wrapper.ResetIndex();
+    error = wrapper.GetNextPackets(10, records);
+    assert(error == -1);
+    error = wrapper.GetNextPackets(0, records);
+    assert(error == 0);
+}
+
+void SystemTest()
+{
+    printf("SystemTest running...\n");
+
+    hid_t dtypeID1, dtypeID2;
+
+    /* Creating two inter-related datatypes.  Create two datasets and put 
+     * one datatype in each. */
+    typedef struct compoundType
+    {
+        short a, b, c;
+        int e;
+    } compoundType;
+
+    dtypeID1 = H5Tcreate( H5T_COMPOUND, sizeof(compoundType));
+
+    H5Tinsert(dtypeID1, "abbey", HOFFSET( compoundType, a ), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID1, "bert", HOFFSET( compoundType, b ), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID1, "charlie", HOFFSET( compoundType, c ), H5T_NATIVE_SHORT);
+    H5Tinsert(dtypeID1, "ebert", HOFFSET( compoundType, e ), H5T_NATIVE_INT);
+
+    typedef struct cType2
+    {
+        char f;
+        compoundType g;
+    } cType2;
+
+    dtypeID2 = H5Tcreate ( H5T_COMPOUND, sizeof(cType2));
+
+    H5Tinsert(dtypeID2, "f", HOFFSET( cType2, f ), H5T_NATIVE_CHAR);
+    H5Tinsert(dtypeID2, "g", HOFFSET( cType2, g ), dtypeID1);
+
+    cType2 ct2[10];
+    ct2[0].f = 'h';
+    ct2[0].g.a = 9;
+    ct2[0].g.b = -13;
+    ct2[0].g.c = 0;
+    ct2[0].g.e = 3000;
+
+    /* Create the packet table datasets */
+    FL_PacketTable wrapper1(fileID, "/SystemTest1", dtypeID1, 1);
+    FL_PacketTable wrapper2(fileID, "/SystemTest2", dtypeID2, 1);
+
+    assert(wrapper1.IsValid());
+    assert(wrapper2.IsValid());
+
+    /* Write and read packets, ensure that nothing is unusual */
+    wrapper2.AppendPacket(ct2);
+
+    unsigned int count = wrapper1.GetPacketCount();
+    assert(count == 0);
+
+    compoundType ct1[10];
+    ct1[0].a = 31;
+    ct1[0].b = 4607;
+    ct1[0].c = -1002;
+    ct1[0].e = 3;
+
+    ct2[1].f = 'b';
+    ct2[1].g = ct1[0];
+
+    wrapper1.AppendPacket(ct1);
+    wrapper2.AppendPacket(&ct2[1]);
+
+    wrapper1.ResetIndex();
+    wrapper1.GetNextPacket(&ct1[1]);
+    wrapper2.GetPacket(1, &ct2[2]);
+
+    assert(ct1[1].b == ct2[2].g.b);
+}
+
+void VariableLengthTest(void)
+{
+    long test_long;
+    short test_short;
+    hvl_t read_buf;
+
+    printf("VariableLengthTest running...\n");
+
+    /* Create a variable length table */
+    VL_PacketTable* test_VLPT = new VL_PacketTable(fileID, "/VariableLengthTest", 1);
+
+    /* Verify that the creation succeeded */
+    assert(test_VLPT->IsValid());
+
+    /* Append some packets */
+    test_short = 9;
+    test_VLPT->AppendPacket(&test_short, sizeof(short));
+    test_long = 16;
+    test_VLPT->AppendPacket(&test_long, sizeof(long));
+
+    /* Read them back and make sure they are correct */
+    test_VLPT->GetNextPackets(1, &read_buf);
+
+    assert(read_buf.len == sizeof(short));
+    assert(*(short *)(read_buf.p) == test_short);
+
+    /* Free the memory used by the read */
+    test_VLPT->FreeReadbuff(1, &read_buf);
+
+    /* Read the second record */
+    test_VLPT->GetNextPackets(1, &read_buf);
+
+    assert(read_buf.len == sizeof(long));
+    assert(*(long *)(read_buf.p) == test_long);
+
+    /* Free the memory used by the read */
+    test_VLPT->FreeReadbuff(1, &read_buf);
+
+    /* Close the packet table */
+    delete test_VLPT;
+
+    /* Reopen the packet table and verify that it is variable length */
+    PacketTable * new_pt = new PacketTable(fileID, "/VariableLengthTest");
+
+    /* Verify that the open succeeded */
+    assert(new_pt->IsValid());
+
+    assert(new_pt->IsVariableLength() == 1);
+
+    /* Close the packet table */
+    delete new_pt;
+}
diff --git a/hl/c++/test/ptableTest.h b/hl/c++/test/ptableTest.h
new file mode 100644
index 0000000..387a574
--- /dev/null
+++ b/hl/c++/test/ptableTest.h
@@ -0,0 +1,39 @@
+/* Test header for Packet Table C++ wrapper API */
+/* These tests are not as thorough as the tests for the C API because
+ * the C++ API is simply a wrapper.  We don't need to test the
+ * actual Packet Table functionality, just that the C APIs are
+ * invoked correctly.
+ */
+
+#ifndef PTABLETEST
+#define PTABLETEST
+
+#include "H5PacketTable.h"
+#include <assert.h>
+
+static hid_t fileID;
+
+/* Test some basic functionality; adding and getting records */
+void BasicTest(void);
+
+/* Test a compound fixed-length datatype */
+void TestCompoundDatatype(void);
+
+/* Test the GetNext functions and their indexes */
+void TestGetNext(void);
+
+/* Ensure that the functions return the correct errors in
+ * response to invalid indexes */
+void TestErrors(void);
+
+/* Test getting multiple records at once using GetPacket */
+void TestGetPacket(void);
+
+/* Create two packet tables at once using compound datatypes.
+   Test for unusual interactions between multiple packet tables. */
+void SystemTest(void);
+
+/* Test the variable length dataset functionality */
+void VariableLengthTest(void);
+
+#endif // PTABLETEST
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index 7053afb..18bbbc9 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -254,6 +254,7 @@ LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
 LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
 LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
 LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
+LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 docdir = $(exec_prefix)/doc
 
 # Scripts used to build examples
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 677674c..7367f67 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -276,6 +276,7 @@ LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
 LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
 LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
 LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
+LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 docdir = $(exec_prefix)/doc
 
 # Scripts used to build examples
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 014b39d..b80f595 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -274,6 +274,7 @@ LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
 LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
 LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
 LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
+LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 docdir = $(exec_prefix)/doc
 
 # Scripts used to build examples
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 060ada9..814633d 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -272,6 +272,7 @@ LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
 LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
 LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
 LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
+LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 docdir = $(exec_prefix)/doc
 
 # Scripts used to build examples
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index f193beb..81347bd 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -284,6 +284,7 @@ LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
 LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
 LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
 LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
+LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 docdir = $(exec_prefix)/doc
 
 # Scripts used to build examples
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 37d0d50..176fdbe 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -282,6 +282,7 @@ LIBH5CPP = $(top_builddir)/c++/src/libhdf5_cpp.la
 LIBH5TOOLS = $(top_builddir)/tools/lib/libh5tools.la
 LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
 LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
+LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 docdir = $(exec_prefix)/doc
 
 # Scripts used to build examples