[svn-r18175] Description:

	Bring r17986:18172 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode

4 files changed, 14 insertions, 10 deletions

diff --git a/c++/src/H5CommonFG.cpp b/c++/src/H5CommonFG.cpp
index dd4a419..8c1237d 100644
--- a/c++/src/H5CommonFG.cpp
+++ b/c++/src/H5CommonFG.cpp
@@ -249,7 +249,7 @@ DataSet CommonFG::openDataSet( const H5std_string& name ) const
 //--------------------------------------------------------------------------
 void CommonFG::link( H5L_type_t link_type, const char* curr_name, const char* new_name ) const
 {
-    herr_t ret_value;
+    herr_t ret_value = -1;
 
     switch(link_type) {
         case H5L_TYPE_HARD:
@@ -265,8 +265,7 @@ void CommonFG::link( H5L_type_t link_type, const char* curr_name, const char* ne
             break;
     } /* end switch */
 
-   if( ret_value < 0 )
-   {
+   if( ret_value < 0 ) {
       throwException("link", "creating link failed");
    }
 }
diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp
index 020bf18..579c8ac 100644
--- a/c++/src/H5PropList.cpp
+++ b/c++/src/H5PropList.cpp
@@ -27,6 +27,7 @@
 #include "H5PropList.h"
 #include "H5private.h"		// for HDfree
 
+
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
 #ifndef H5_NO_STD
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index 420292b..15d9add 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -351,12 +351,12 @@ CP = cp
 
 # Some machines need a command to run executables; this is that command
 # so that our tests will run.
-# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# We use RUNEXEC instead of RUNSERIAL directly because it may be that
 # some tests need to be run with a different command.  Older versions
 # of the makefiles used the command
 # $(LIBTOOL) --mode=execute
 # in some directories, for instance.
-RUNTESTS = $(RUNSERIAL)
+RUNEXEC = $(RUNSERIAL)
 
 # Libraries to link to while building
 LIBHDF5 = $(top_builddir)/src/libhdf5.la
@@ -390,7 +390,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 44
+LT_VERS_REVISION = 49
 LT_VERS_AGE = 0
 
 # Include src directory
@@ -968,7 +968,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      fi; \
 	      echo "============================" >> $${log}; \
 	      srcdir="$(srcdir)" \
-	         $(TIME) $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
+	         $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
 	         && touch $(@:.chkexe_=.chkexe) || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
@@ -1039,7 +1039,7 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	@for test in $(TEST_PROG_PARA) dummy; do                             \
 	   if test $$test != dummy; then                                      \
 	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
-	      RUNTESTS="$(RUNPARALLEL)" || exit 1; \
+	      RUNEXEC="$(RUNPARALLEL)" || exit 1; \
 	   fi;                                                                \
 	done
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
index aac8f40..4e51c94 100755
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -36,6 +36,10 @@ HL="@HL@"
 ##                                                                        ##
 ############################################################################
 
+# Constants definitions
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
 host_os="@host_os@"
 
 prog_name="`basename $0`"
@@ -91,7 +95,7 @@ usage() {
   echo "   HDF5_CXX                 -  use a different C++ compiler"
   echo "   HDF5_CXXLINKER           -  use a different linker"
   echo " "
-  exit 1
+  exit $EXIT_FAILURE
 }
 
 # Show the configuration summary of the library recorded in the
@@ -103,7 +107,7 @@ showconfigure()
 }
 
 # Main
-status=0
+status=$EXIT_SUCCESS
 
 if test "$#" = "0"; then
   # No parameters specified, issue usage statement and exit.