summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2000-11-15 16:26:14 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2000-11-15 16:26:14 (GMT)
commit426be778aa3169a848e33378bae655f3ba0a8df4 (patch)
tree1a9c04e4780d44da3f40d9226cc15e8cef0bc71f
parent8d6ec211c165325b214ca6e559edc4fdfa4d21f9 (diff)
downloadhdf5-426be778aa3169a848e33378bae655f3ba0a8df4.zip
hdf5-426be778aa3169a848e33378bae655f3ba0a8df4.tar.gz
hdf5-426be778aa3169a848e33378bae655f3ba0a8df4.tar.bz2
[svn-r2918] Purpose:
Bug fix Description: It would be nice if I'd done this correctly the first time. Solution: Doh! NEeded to use the ``using'' keyword... Platforms tested: Linux
-rwxr-xr-xc++/configure18
-rw-r--r--c++/configure.in6
2 files changed, 16 insertions, 8 deletions
diff --git a/c++/configure b/c++/configure
index 1576a53..d7b64ea 100755
--- a/c++/configure
+++ b/c++/configure
@@ -1835,10 +1835,14 @@ namespace H5 {
int fnord;
}
-int main(void) { fnord = 37; return 0; }
+int main(void) {
+ using namespace H5;
+ fnord = 37;
+ return 0;
+}
EOF
-if { (eval echo configure:1842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo yes
@@ -1857,12 +1861,12 @@ fi
echo $ac_n "checking if $CXX needs old style header files in includes""... $ac_c" 1>&6
-echo "configure:1861: checking if $CXX needs old style header files in includes" >&5
+echo "configure:1865: checking if $CXX needs old style header files in includes" >&5
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1866 "configure"
+#line 1870 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@@ -1873,7 +1877,7 @@ extern "C" void exit(int);
int main(void) { return 0; }
EOF
-if { (eval echo configure:1877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo no
@@ -1941,7 +1945,7 @@ rm -f confcache
echo $ac_n "checking make""... $ac_c" 1>&6
-echo "configure:1945: checking make" >&5
+echo "configure:1949: checking make" >&5
if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\
sed -n 1p|cut -c1-8`" = "GNU Make"; then
@@ -1958,7 +1962,7 @@ fi
if test -z "$DEPEND"; then
echo $ac_n "checking how to include a makefile""... $ac_c" 1>&6
-echo "configure:1962: checking how to include a makefile" >&5
+echo "configure:1966: checking how to include a makefile" >&5
cat >makeinc <<EOF
foo:
diff --git a/c++/configure.in b/c++/configure.in
index 575d5f8..18bf836 100644
--- a/c++/configure.in
+++ b/c++/configure.in
@@ -232,7 +232,11 @@ namespace H5 {
int fnord;
}
-int main(void) { fnord = 37; return 0; }
+int main(void) {
+ using namespace H5;
+ fnord = 37;
+ return 0;
+}
], [
echo yes
], [