From 46d917001cc78bb7250167f755c12ae6dea6854c Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Mon, 23 Jun 2008 14:16:31 -0500 Subject: [svn-r15262] Description: Merge revisions 15037:15130 from trunk into metadata journaling branch Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.5.2 (amazon) in debug mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode --- MANIFEST | 10 +- Makefile.am | 9 +- Makefile.in | 9 +- configure | 4 +- configure.in | 4 +- fortran/src/H5Df.c | 5 +- fortran/src/H5Tff.f90 | 2 +- fortran/test/Makefile.am | 1 + fortran/test/fortranlib_test.f90 | 404 ++++++--------- fortran/test/fortranlib_test_1_8.f90 | 82 +-- fortran/test/tH5A_1_8.f90 | 120 ++++- fortran/test/tH5G_1_8.f90 | 81 ++- fortran/test/tH5O.f90 | 8 +- fortran/test/tf.f90 | 42 +- fortran/testpar/hyper.f90 | 457 ++++++++--------- fortran/testpar/mdset.f90 | 487 +++++++++--------- fortran/testpar/ptest.f90 | 212 ++++---- perform/Makefile.am | 2 - perform/Makefile.in | 2 - perform/perf.c | 6 +- perform/sio_engine.c | 5 +- perform/sio_perf.c | 5 +- release_docs/RELEASE.txt | 4 - src/H5Eint.c | 8 +- src/H5detect.c | 6 - test/h5test.c | 4 +- tools/h52jpeg/h52jpeg.c | 132 +++++ tools/h52jpeg/h52jpegtst.c | 4 + tools/h5diff/h5diffgentest.c | 21 +- tools/h5repack/h5repack.sh.in | 48 +- tools/h5repack/h5repack_main.c | 204 +++++++- tools/testfiles/h5diff_empty.h5 | Bin 0 -> 800 bytes windows/c++/examples/chunkstest/chunkstest.vcproj | 88 ++-- .../examples/chunkstestdll/chunkstestdll.vcproj | 2 +- .../c++/examples/compoundtest/compoundtest.vcproj | 88 ++-- .../compoundtestdll/compoundtestdll.vcproj | 2 +- windows/c++/examples/createtest/createtest.vcproj | 90 ++-- .../examples/createtestdll/createtestdll.vcproj | 2 +- .../examples/extend_dstest/extend_dstest.vcproj | 88 ++-- .../extend_dstestdll/extend_dstestdll.vcproj | 2 +- .../c++/examples/h5grouptest/h5grouptest.vcproj | 88 ++-- .../examples/h5grouptestdll/h5grouptestdll.vcproj | 2 +- .../c++/examples/readdatatest/readdatatest.vcproj | 90 ++-- .../readdatatestdll/readdatatestdll.vcproj | 2 +- .../examples/writedatatest/writedatatest.vcproj | 88 ++-- .../writedatatestdll/writedatatestdll.vcproj | 2 +- windows/c++/test/dsets_cpp/dsets_cpp.vcproj | 10 +- windows/c++/test/dsets_cppdll/dsets_cppdll.vcproj | 2 +- windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj | 10 +- .../test/testhdf5_cppdll/testhdf5_cppdll.vcproj | 2 +- .../examples/attributetest/attributetest.vcproj | 6 +- .../attributetestdll/attributetestdll.vcproj | 2 +- windows/examples/chunkread/chunkread.vcproj | 6 +- windows/examples/chunkreaddll/chunkreaddll.vcproj | 2 +- windows/examples/compoundtest/compoundtest.vcproj | 6 +- .../compoundtestdll/compoundtestdll.vcproj | 2 +- .../extendwritetest/extendwritetest.vcproj | 6 +- .../extendwritetestdll/extendwritetestdll.vcproj | 2 +- windows/examples/grouptest/grouptest.vcproj | 6 +- windows/examples/grouptestdll/grouptestdll.vcproj | 2 +- .../intermgrouptest/intermgrouptest.vcproj | 6 +- .../intermgrouptestdll/intermgrouptestdll.vcproj | 2 +- windows/examples/readtest/readtest.vcproj | 6 +- windows/examples/readtestdll/readtestdll.vcproj | 2 +- windows/examples/selectest/selectest.vcproj | 6 +- windows/examples/selectestdll/selectestdll.vcproj | 2 +- windows/examples/writetest/writetest.vcproj | 6 +- windows/examples/writetestdll/writetestdll.vcproj | 2 +- .../attreexampletest/attreexampletest.vfproj | 32 +- .../examples/compoundtest/compoundtest.vfproj | 32 +- .../dsetexampletest/dsetexampletest.vfproj | 32 +- .../fileexampletest/fileexampletest.vfproj | 32 +- .../groupexampletest/groupexampletest.vfproj | 32 +- .../grpdsetexampletest/grpdsetexampletest.vfproj | 32 +- .../fortran/examples/grpittest/grpittest.vfproj | 32 +- .../grpsexampletest/grpsexampletest.vfproj | 32 +- .../examples/hyperslabtest/hyperslabtest.vfproj | 32 +- .../mountexampletest/mountexampletest.vfproj | 32 +- .../refobjexampletest/refobjexampletest.vfproj | 32 +- .../refregexampletest/refregexampletest.vfproj | 32 +- .../rwdsetexampletest/rwdsetexampletest.vfproj | 32 +- .../examples/selecteletest/selecteletest.vfproj | 32 +- windows/fortran/src/H5f90i_gen.h | 40 -- windows/fortran/src/H5fortran_types.f90 | 34 -- .../test/flush1_fortran/flush1_fortran.vfproj | 32 +- .../flush1_fortrandll/flush1_fortrandll.vfproj | 28 +- .../test/flush2_fortran/flush2_fortran.vfproj | 32 +- .../flush2_fortrandll/flush2_fortrandll.vfproj | 28 +- .../test/libtest_cstubdll/libtest_cstubdll.vcproj | 2 +- .../test/libtest_fortran/libtest_cstub.vcproj | 2 +- .../libtest_fortrandll/libtest_fortrandll.vfproj | 24 +- .../test/testhdf5_fortran/testhdf5_fortran.vfproj | 32 +- .../testhdf5_fortrandll/testhdf5_fortrandll.vfproj | 28 +- windows/hdf5bt.BAT | 16 +- windows/hdf5build.BAT | 108 ++-- .../hl_test_table_cpp/hl_test_table_cpp.vcproj | 2 +- .../hl_test_table_cppdll.vcproj | 2 +- windows/hl/examples/ex_ds1/ex_ds1.vcproj | 2 +- windows/hl/examples/ex_ds1dll/ex_ds1dll.vcproj | 2 +- windows/hl/examples/ex_image1/ex_image1.vcproj | 2 +- .../hl/examples/ex_image1dll/ex_image1dll.vcproj | 2 +- windows/hl/examples/ex_image2/ex_image2.vcproj | 2 +- .../hl/examples/ex_image2dll/ex_image2dll.vcproj | 2 +- windows/hl/examples/ex_lite1/ex_lite1.vcproj | 2 +- windows/hl/examples/ex_lite1dll/ex_lite1dll.vcproj | 2 +- windows/hl/examples/ex_lite2/ex_lite2.vcproj | 2 +- windows/hl/examples/ex_lite2dll/ex_lite2dll.vcproj | 2 +- windows/hl/examples/ex_lite3/ex_lite3.vcproj | 2 +- windows/hl/examples/ex_lite3dll/ex_lite3dll.vcproj | 2 +- windows/hl/examples/ex_table01/ex_table01.vcproj | 2 +- .../hl/examples/ex_table01dll/ex_table01dll.vcproj | 2 +- windows/hl/examples/ex_table02/ex_table02.vcproj | 2 +- .../hl/examples/ex_table02dll/ex_table02dll.vcproj | 2 +- windows/hl/examples/ex_table03/ex_table03.vcproj | 2 +- .../hl/examples/ex_table03dll/ex_table03dll.vcproj | 2 +- windows/hl/examples/ex_table04/ex_table04.vcproj | 2 +- .../hl/examples/ex_table04dll/ex_table04dll.vcproj | 2 +- windows/hl/examples/ex_table05/ex_table05.vcproj | 2 +- .../hl/examples/ex_table05dll/ex_table05dll.vcproj | 2 +- windows/hl/examples/ex_table06/ex_table06.vcproj | 2 +- .../hl/examples/ex_table06dll/ex_table06dll.vcproj | 2 +- windows/hl/examples/ex_table07/ex_table07.vcproj | 2 +- .../hl/examples/ex_table07dll/ex_table07dll.vcproj | 2 +- windows/hl/examples/ex_table08/ex_table08.vcproj | 2 +- .../hl/examples/ex_table08dll/ex_table08dll.vcproj | 2 +- windows/hl/examples/ex_table09/ex_table09.vcproj | 2 +- .../hl/examples/ex_table09dll/ex_table09dll.vcproj | 2 +- windows/hl/examples/ex_table10/ex_table10.vcproj | 2 +- .../hl/examples/ex_table10dll/ex_table10dll.vcproj | 2 +- windows/hl/examples/ex_table11/ex_table11.vcproj | 2 +- .../hl/examples/ex_table11dll/ex_table11dll.vcproj | 2 +- windows/hl/examples/ex_table12/ex_table12.vcproj | 2 +- .../hl/examples/ex_table12dll/ex_table12dll.vcproj | 2 +- windows/hl/examples/ptExampleFL/ptExampleFL.vcproj | 2 +- .../examples/ptExampleFLdll/ptExampleFLdll.vcproj | 2 +- windows/hl/examples/ptExampleVL/ptExampleVL.vcproj | 2 +- .../examples/ptExampleVLdll/ptExampleVLdll.vcproj | 2 +- windows/hl/fortran/examples/ex_lite/ex_lite.vfproj | 28 +- .../fortran/examples/ex_litedll/ex_litedll.vfproj | 28 +- .../hl_test_image_fortran.vfproj | 28 +- .../hl_test_lite_fortran.vfproj | 28 +- .../hl_test_table_fortran.vfproj | 28 +- windows/hl/test/hl_test_ds/hl_test_ds.vcproj | 6 +- windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj | 2 +- windows/hl/test/hl_test_image/hl_test_image.vcproj | 6 +- .../test/hl_test_imagedll/hl_test_imagedll.vcproj | 2 +- windows/hl/test/hl_test_lite/hl_test_lite.vcproj | 6 +- .../hl/test/hl_test_litedll/hl_test_litedll.vcproj | 2 +- .../hl/test/hl_test_packet/hl_test_packet.vcproj | 6 +- .../hl_test_packetdll/hl_test_packetdll.vcproj | 2 +- windows/hl/test/hl_test_table/hl_test_table.vcproj | 6 +- .../test/hl_test_tabledll/hl_test_tabledll.vcproj | 2 +- windows/hl/tools/gifconv/gif2h5.vcproj | 10 +- windows/hl/tools/gifconv/h52gif.vcproj | 10 +- windows/hl/tools/gifconvdll/gif2h5dll.vcproj | 2 +- windows/hl/tools/gifconvdll/h52gifdll.vcproj | 2 +- .../h5fort_type_defines/h5fort_type_defines.vfproj | 32 +- .../h5fortran_detect/h5fortran_detect.vfproj | 32 +- .../typegen/h5match_types/h5match_types.vcproj | 18 +- windows/misc/typegen/h5tinit/h5tinit.vcproj | 24 +- windows/proj/hdf5/hdf5.vcproj | 4 +- windows/proj/hdf5_cpp/hdf5_cpp.vcproj | 2 +- windows/proj/hdf5_cppdll/hdf5_cppdll.vcproj | 2 +- windows/proj/hdf5_f90cstub/hdf5_f90cstub.vcproj | 2 +- .../proj/hdf5_f90cstubdll/hdf5_f90cstubdll.vcproj | 2 +- windows/proj/hdf5_hl/hdf5_hl.vcproj | 2 +- windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj | 2 +- windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj | 2 +- .../hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj | 2 +- .../proj/hdf5_hl_fortran/hdf5_hl_f90cstub.vcproj | 2 +- windows/proj/hdf5_hldll/hdf5_hldll.vcproj | 2 +- windows/proj/hdf5dll/hdf5dll.vcproj | 2 +- windows/src/H5Tinit.c | 569 --------------------- windows/test/big/big.vcproj | 10 +- windows/test/bigdll/bigdll.vcproj | 2 +- windows/test/bittests/bittests.vcproj | 10 +- windows/test/bittestsdll/bittestsdll.vcproj | 2 +- windows/test/btree2/btree2.vcproj | 10 +- windows/test/btree2dll/btree2dll.vcproj | 2 +- windows/test/cache/cache.vcproj | 10 +- windows/test/cache_api/cache_api.vcproj | 10 +- windows/test/cache_apidll/cache_apidll.vcproj | 2 +- windows/test/cachedll/cachedll.vcproj | 2 +- windows/test/chunk/chunk.vcproj | 10 +- windows/test/chunk_info/chunk_info.vcproj | 2 +- windows/test/chunk_infodll/chunk_infodll.vcproj | 2 +- windows/test/chunkdll/chunkdll.vcproj | 2 +- windows/test/cmpd_dset/cmpd_dset.vcproj | 10 +- windows/test/cmpd_dsetdll/cmpd_dsetdll.vcproj | 2 +- windows/test/cross_read/cross_read.vcproj | 10 +- windows/test/cross_readdll/cross_readdll.vcproj | 2 +- windows/test/dangle/dangle.vcproj | 10 +- windows/test/dangledll/dangledll.vcproj | 2 +- windows/test/dsets/dsets.vcproj | 10 +- windows/test/dsetsdll/dsetsdll.vcproj | 2 +- windows/test/dt_arith/dt_arith.vcproj | 10 +- windows/test/dt_arithdll/dt_arithdll.vcproj | 2 +- windows/test/dtransform/dtransform.vcproj | 10 +- windows/test/dtransformdll/dtransformdll.vcproj | 2 +- windows/test/dtypes/dtypes.vcproj | 10 +- windows/test/dtypesdll/dtypesdll.vcproj | 2 +- windows/test/enum/enum.vcproj | 10 +- windows/test/enumdll/enumdll.vcproj | 2 +- windows/test/err_compat/err_compat.vcproj | 10 +- windows/test/err_compatdll/err_compatdll.vcproj | 2 +- windows/test/error_test/error_test.vcproj | 10 +- windows/test/error_testdll/error_testdll.vcproj | 2 +- windows/test/extend/extend.vcproj | 10 +- windows/test/extenddll/extenddll.vcproj | 2 +- windows/test/external/external.vcproj | 10 +- windows/test/externaldll/externaldll.vcproj | 2 +- windows/test/fheap/fheap.vcproj | 10 +- windows/test/fheapdll/fheapdll.vcproj | 2 +- windows/test/fillval/fillval.vcproj | 10 +- windows/test/fillvaldll/fillvaldll.vcproj | 2 +- windows/test/flush1/flush1.vcproj | 10 +- windows/test/flush1dll/flush1dll.vcproj | 2 +- windows/test/flush2/flush2.vcproj | 10 +- windows/test/flush2dll/flush2dll.vcproj | 2 +- windows/test/getname/getname.vcproj | 10 +- windows/test/getnamedll/getnamedll.vcproj | 10 +- windows/test/getub/getub.vcproj | 6 +- windows/test/gheap/gheap.vcproj | 10 +- windows/test/gheapdll/gheapdll.vcproj | 2 +- windows/test/hyperslab/hyperslab.vcproj | 10 +- windows/test/hyperslabdll/hyperslabdll.vcproj | 2 +- windows/test/iopipe/iopipe.vcproj | 10 +- windows/test/iopipedll/iopipedll.vcproj | 2 +- windows/test/istore/istore.vcproj | 10 +- windows/test/istoredll/istoredll.vcproj | 2 +- windows/test/lheap/lheap.vcproj | 10 +- windows/test/lheapdll/lheapdll.vcproj | 2 +- windows/test/libtest/libtest.vcproj | 2 +- windows/test/libtestdll/libtestdll.vcproj | 2 +- windows/test/links/links.vcproj | 10 +- windows/test/linksdll/linksdll.vcproj | 2 +- windows/test/mount/mount.vcproj | 10 +- windows/test/mountdll/mountdll.vcproj | 2 +- windows/test/mtime/mtime.vcproj | 10 +- windows/test/mtimedll/mtimedll.vcproj | 2 +- windows/test/ntypes/ntypes.vcproj | 10 +- windows/test/ntypesdll/ntypesdll.vcproj | 10 +- windows/test/objcopy/objcopy.vcproj | 6 +- windows/test/objcopydll/objcopydll.vcproj | 2 +- windows/test/ohdr/ohdr.vcproj | 10 +- windows/test/ohdrdll/ohdrdll.vcproj | 2 +- windows/test/overhead/overhead.vcproj | 10 +- windows/test/overheaddll/overheaddll.vcproj | 2 +- windows/test/pool/pool.vcproj | 10 +- windows/test/pooldll/pooldll.vcproj | 2 +- windows/test/reserved/reserved.vcproj | 10 +- windows/test/reserveddll/reserveddll.vcproj | 2 +- windows/test/set_extent/set_extent.vcproj | 10 +- windows/test/set_extentdll/set_extentdll.vcproj | 2 +- windows/test/stab/stab.vcproj | 10 +- windows/test/stabdll/stabdll.vcproj | 2 +- windows/test/tellub/tellub.vcproj | 6 +- windows/test/testhdf5/testhdf5.vcproj | 10 +- windows/test/testhdf5dll/testhdf5dll.vcproj | 2 +- windows/test/ttsafedll/ttsafedll.vcproj | 2 +- windows/test/unlink/unlink.vcproj | 10 +- windows/test/unlinkdll/unlinkdll.vcproj | 2 +- windows/test/vfd/vfd.vcproj | 10 +- windows/test/vfddll/vfddll.vcproj | 10 +- windows/tools/h5copy/h5copy.vcproj | 10 +- windows/tools/h5debug/h5debug.vcproj | 10 +- windows/tools/h5debugdll/h5debugdll.vcproj | 2 +- windows/tools/h5diff/h5diff.vcproj | 10 +- windows/tools/h5diffdll/h5diffdll.vcproj | 2 +- windows/tools/h5dump/h5dump.vcproj | 10 +- windows/tools/h5dump/testh5dumpxml.bat | 19 +- windows/tools/h5dumpdll/h5dumpdll.vcproj | 2 +- windows/tools/h5import/h5import.vcproj | 10 +- windows/tools/h5importdll/h5importdll.vcproj | 2 +- windows/tools/h5jam/h5jam.vcproj | 6 +- windows/tools/h5ls/h5ls.vcproj | 10 +- windows/tools/h5lsdll/h5lsdll.vcproj | 2 +- windows/tools/h5mkgrp/h5mkgrp.vcproj | 2 +- windows/tools/h5repack/h5repack.bat | 54 +- windows/tools/h5repack/h5repack.vcproj | 10 +- windows/tools/h5repackdll/h5repackdll.vcproj | 2 +- windows/tools/h5repart/h5repart.vcproj | 10 +- windows/tools/h5repartdll/h5repartdll.vcproj | 2 +- windows/tools/h5stat/h5stat.vcproj | 2 +- windows/tools/h5statdll/h5statdll.vcproj | 2 +- windows/tools/h5unjam/h5unjam.vcproj | 6 +- windows/tools/talign/talign.vcproj | 10 +- windows/tools/taligndll/taligndll.vcproj | 2 +- windows/tools/testfiles/binread/binread.vcproj | 2 +- windows/tools/testfiles/h5difftst/h5difftst.vcproj | 10 +- windows/tools/testfiles/h5dumptst/h5dumptst.vcproj | 10 +- .../tools/testfiles/h5importtst/h5importtst.vcproj | 2 +- windows/tools/testfiles/h5jamtst/h5jamtst.vcproj | 6 +- .../tools/testfiles/h5repacktst/h5repacktst.vcproj | 6 +- .../h5repart_gentest/h5repart_gentest.vcproj | 2 +- .../tools/testfiles/h5reparttst/h5reparttst.vcproj | 2 +- .../testh5repack_detect_szip.vcproj | 6 +- .../testh5repack_detect_szipdll.vcproj | 2 +- windows/tools/toolslib/toolslib.vcproj | 4 +- windows/tools/toolslibdll/toolslibdll.vcproj | 2 +- .../examples/allcppexamples/allcppexamples.vcproj | 2 +- .../c++/examples/chunkstest/chunkstest.vcproj | 6 +- .../examples/chunkstestdll/chunkstestdll.vcproj | 2 +- .../c++/examples/compoundtest/compoundtest.vcproj | 6 +- .../compoundtestdll/compoundtestdll.vcproj | 2 +- .../c++/examples/createtest/createtest.vcproj | 6 +- .../examples/createtestdll/createtestdll.vcproj | 2 +- .../examples/extend_dstest/extend_dstest.vcproj | 6 +- .../extend_dstestdll/extend_dstestdll.vcproj | 2 +- .../c++/examples/h5grouptest/h5grouptest.vcproj | 6 +- .../examples/h5grouptestdll/h5grouptestdll.vcproj | 2 +- .../c++/examples/readdatatest/readdatatest.vcproj | 6 +- .../readdatatestdll/readdatatestdll.vcproj | 2 +- .../examples/writedatatest/writedatatest.vcproj | 6 +- .../writedatatestdll/writedatatestdll.vcproj | 2 +- windows_vnet/c++/test/dsets_cpp/dsets_cpp.vcproj | 6 +- .../c++/test/dsets_cppdll/dsets_cppdll.vcproj | 2 +- .../c++/test/testhdf5_cpp/testhdf5_cpp.vcproj | 6 +- .../test/testhdf5_cppdll/testhdf5_cppdll.vcproj | 2 +- .../examples/allexamples/allexamples.vcproj | 2 +- .../examples/attributetest/attributetest.vcproj | 4 +- .../attributetestdll/attributetestdll.vcproj | 2 +- windows_vnet/examples/chunkread/chunkread.vcproj | 4 +- .../examples/chunkreaddll/chunkreaddll.vcproj | 2 +- .../examples/compoundtest/compoundtest.vcproj | 4 +- .../compoundtestdll/compoundtestdll.vcproj | 2 +- .../extendwritetest/extendwritetest.vcproj | 4 +- .../extendwritetestdll/extendwritetestdll.vcproj | 2 +- windows_vnet/examples/grouptest/grouptest.vcproj | 4 +- .../examples/grouptestdll/grouptestdll.vcproj | 2 +- .../intermgrouptest/intermgrouptest.vcproj | 4 +- .../intermgrouptestdll/intermgrouptestdll.vcproj | 2 +- windows_vnet/examples/readtest/readtest.vcproj | 4 +- .../examples/readtestdll/readtestdll.vcproj | 2 +- windows_vnet/examples/selectest/selectest.vcproj | 4 +- .../examples/selectestdll/selectestdll.vcproj | 2 +- windows_vnet/examples/writetest/writetest.vcproj | 4 +- .../examples/writetestdll/writetestdll.vcproj | 2 +- .../hl_test_table_cpp/hl_test_table_cpp.vcproj | 2 +- .../hl_test_table_cppdll.vcproj | 2 +- windows_vnet/hl/examples/ex_ds1/ex_ds1.vcproj | 2 +- .../hl/examples/ex_ds1dll/ex_ds1dll.vcproj | 2 +- .../hl/examples/ex_image1/ex_image1.vcproj | 2 +- .../hl/examples/ex_image1dll/ex_image1dll.vcproj | 2 +- .../hl/examples/ex_image2/ex_image2.vcproj | 2 +- .../hl/examples/ex_image2dll/ex_image2dll.vcproj | 2 +- windows_vnet/hl/examples/ex_lite1/ex_lite1.vcproj | 2 +- .../hl/examples/ex_lite1dll/ex_lite1dll.vcproj | 2 +- windows_vnet/hl/examples/ex_lite2/ex_lite2.vcproj | 2 +- .../hl/examples/ex_lite2dll/ex_lite2dll.vcproj | 2 +- windows_vnet/hl/examples/ex_lite3/ex_lite3.vcproj | 2 +- .../hl/examples/ex_lite3dll/ex_lite3dll.vcproj | 2 +- .../hl/examples/ex_table01/ex_table01.vcproj | 2 +- .../hl/examples/ex_table01dll/ex_table01dll.vcproj | 2 +- .../hl/examples/ex_table02/ex_table02.vcproj | 2 +- .../hl/examples/ex_table02dll/ex_table02dll.vcproj | 2 +- .../hl/examples/ex_table03/ex_table03.vcproj | 2 +- .../hl/examples/ex_table03dll/ex_table03dll.vcproj | 2 +- .../hl/examples/ex_table04/ex_table04.vcproj | 2 +- .../hl/examples/ex_table04dll/ex_table04dll.vcproj | 2 +- .../hl/examples/ex_table05/ex_table05.vcproj | 2 +- .../hl/examples/ex_table05dll/ex_table05dll.vcproj | 2 +- .../hl/examples/ex_table06/ex_table06.vcproj | 2 +- .../hl/examples/ex_table06dll/ex_table06dll.vcproj | 2 +- .../hl/examples/ex_table07/ex_table07.vcproj | 2 +- .../hl/examples/ex_table07dll/ex_table07dll.vcproj | 2 +- .../hl/examples/ex_table08/ex_table08.vcproj | 2 +- .../hl/examples/ex_table08dll/ex_table08dll.vcproj | 2 +- .../hl/examples/ex_table09/ex_table09.vcproj | 2 +- .../hl/examples/ex_table09dll/ex_table09dll.vcproj | 2 +- .../hl/examples/ex_table10/ex_table10.vcproj | 2 +- .../hl/examples/ex_table10dll/ex_table10dll.vcproj | 2 +- .../hl/examples/ex_table11/ex_table11.vcproj | 2 +- .../hl/examples/ex_table11dll/ex_table11dll.vcproj | 2 +- .../hl/examples/ex_table12/ex_table12.vcproj | 2 +- .../hl/examples/ex_table12dll/ex_table12dll.vcproj | 2 +- .../hl/examples/ptExampleFL/ptExampleFL.vcproj | 2 +- .../examples/ptExampleFLdll/ptExampleFLdll.vcproj | 2 +- .../hl/examples/ptExampleVL/ptExampleVL.vcproj | 2 +- .../examples/ptExampleVLdll/ptExampleVLdll.vcproj | 2 +- windows_vnet/hl/test/hl_test_ds/hl_test_ds.vcproj | 4 +- .../hl/test/hl_test_dsdll/hl_test_dsdll.vcproj | 2 +- .../hl/test/hl_test_image/hl_test_image.vcproj | 4 +- .../test/hl_test_imagedll/hl_test_imagedll.vcproj | 2 +- .../hl/test/hl_test_lite/hl_test_lite.vcproj | 4 +- .../hl/test/hl_test_litedll/hl_test_litedll.vcproj | 2 +- .../hl/test/hl_test_packet/hl_test_packet.vcproj | 4 +- .../hl_test_packetdll/hl_test_packetdll.vcproj | 2 +- .../hl/test/hl_test_table/hl_test_table.vcproj | 4 +- .../test/hl_test_tabledll/hl_test_tabledll.vcproj | 2 +- windows_vnet/hl/tools/gifconv/gif2h5.vcproj | 6 +- windows_vnet/hl/tools/gifconv/h52gif.vcproj | 6 +- windows_vnet/hl/tools/gifconvdll/gif2h5dll.vcproj | 2 +- windows_vnet/hl/tools/gifconvdll/h52gifdll.vcproj | 2 +- windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj | 41 +- windows_vnet/proj/hdf5/hdf5.vcproj | 4 +- windows_vnet/proj/hdf5_cpp/hdf5_cpp.vcproj | 2 +- windows_vnet/proj/hdf5_cppdll/hdf5_cppdll.vcproj | 2 +- windows_vnet/proj/hdf5_hl/hdf5_hl.vcproj | 2 +- windows_vnet/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj | 2 +- .../proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj | 2 +- windows_vnet/proj/hdf5_hldll/hdf5_hldll.vcproj | 2 +- windows_vnet/proj/hdf5dll/hdf5dll.vcproj | 2 +- windows_vnet/test/big/big.vcproj | 6 +- windows_vnet/test/bigdll/bigdll.vcproj | 2 +- windows_vnet/test/bittests/bittests.vcproj | 6 +- windows_vnet/test/bittestsdll/bittestsdll.vcproj | 2 +- windows_vnet/test/btree2/btree2.vcproj | 6 +- windows_vnet/test/btree2dll/btree2dll.vcproj | 2 +- windows_vnet/test/cache/cache.vcproj | 6 +- windows_vnet/test/cache_api/cache_api.vcproj | 6 +- windows_vnet/test/cache_apidll/cache_apidll.vcproj | 2 +- windows_vnet/test/cachedll/cachedll.vcproj | 2 +- windows_vnet/test/chunk/chunk.vcproj | 6 +- windows_vnet/test/chunk_info/chunk_info.vcproj | 2 +- .../test/chunk_infodll/chunk_infodll.vcproj | 2 +- windows_vnet/test/chunkdll/chunkdll.vcproj | 2 +- windows_vnet/test/cmpd_dset/cmpd_dset.vcproj | 6 +- windows_vnet/test/cmpd_dsetdll/cmpd_dsetdll.vcproj | 2 +- windows_vnet/test/cross_read/cross_read.vcproj | 6 +- .../test/cross_readdll/cross_readdll.vcproj | 2 +- windows_vnet/test/dangle/dangle.vcproj | 6 +- windows_vnet/test/dangledll/dangledll.vcproj | 2 +- windows_vnet/test/dsets/dsets.vcproj | 6 +- windows_vnet/test/dsetsdll/dsetsdll.vcproj | 2 +- windows_vnet/test/dt_arith/dt_arith.vcproj | 6 +- windows_vnet/test/dt_arithdll/dt_arithdll.vcproj | 2 +- windows_vnet/test/dtransform/dtransform.vcproj | 6 +- .../test/dtransformdll/dtransformdll.vcproj | 2 +- windows_vnet/test/dtypes/dtypes.vcproj | 6 +- windows_vnet/test/dtypesdll/dtypesdll.vcproj | 2 +- windows_vnet/test/enum/enum.vcproj | 6 +- windows_vnet/test/enumdll/enumdll.vcproj | 2 +- windows_vnet/test/err_compat/err_compat.vcproj | 6 +- .../test/err_compatdll/err_compatdll.vcproj | 2 +- windows_vnet/test/error_test/error_test.vcproj | 6 +- .../test/error_testdll/error_testdll.vcproj | 2 +- windows_vnet/test/extend/extend.vcproj | 6 +- windows_vnet/test/extenddll/extenddll.vcproj | 2 +- windows_vnet/test/external/external.vcproj | 6 +- windows_vnet/test/externaldll/externaldll.vcproj | 2 +- windows_vnet/test/fheap/fheap.vcproj | 6 +- windows_vnet/test/fheapdll/fheapdll.vcproj | 2 +- windows_vnet/test/fillval/fillval.vcproj | 6 +- windows_vnet/test/fillvaldll/fillvaldll.vcproj | 2 +- windows_vnet/test/flush1/flush1.vcproj | 6 +- windows_vnet/test/flush1dll/flush1dll.vcproj | 2 +- windows_vnet/test/flush2/flush2.vcproj | 6 +- windows_vnet/test/flush2dll/flush2dll.vcproj | 2 +- windows_vnet/test/getname/getname.vcproj | 6 +- windows_vnet/test/getnamedll/getnamedll.vcproj | 6 +- windows_vnet/test/getub/getub.vcproj | 4 +- windows_vnet/test/gheap/gheap.vcproj | 6 +- windows_vnet/test/gheapdll/gheapdll.vcproj | 2 +- windows_vnet/test/hyperslab/hyperslab.vcproj | 6 +- windows_vnet/test/hyperslabdll/hyperslabdll.vcproj | 2 +- windows_vnet/test/iopipe/iopipe.vcproj | 6 +- windows_vnet/test/iopipedll/iopipedll.vcproj | 2 +- windows_vnet/test/istore/istore.vcproj | 6 +- windows_vnet/test/istoredll/istoredll.vcproj | 2 +- windows_vnet/test/lheap/lheap.vcproj | 6 +- windows_vnet/test/lheapdll/lheapdll.vcproj | 2 +- windows_vnet/test/libtest/libtest.vcproj | 2 +- windows_vnet/test/libtestD/libtestD.vcproj | 2 +- windows_vnet/test/links/links.vcproj | 6 +- windows_vnet/test/linksdll/linksdll.vcproj | 2 +- windows_vnet/test/mount/mount.vcproj | 6 +- windows_vnet/test/mountdll/mountdll.vcproj | 2 +- windows_vnet/test/mtime/mtime.vcproj | 6 +- windows_vnet/test/mtimedll/mtimedll.vcproj | 2 +- windows_vnet/test/ntypes/ntypes.vcproj | 6 +- windows_vnet/test/ntypesdll/ntypesdll.vcproj | 6 +- windows_vnet/test/objcopy/objcopy.vcproj | 4 +- windows_vnet/test/objcopydll/objcopydll.vcproj | 2 +- windows_vnet/test/ohdr/ohdr.vcproj | 6 +- windows_vnet/test/ohdrdll/ohdrdll.vcproj | 2 +- windows_vnet/test/overhead/overhead.vcproj | 6 +- windows_vnet/test/overheaddll/overheaddll.vcproj | 2 +- windows_vnet/test/pool/pool.vcproj | 6 +- windows_vnet/test/pooldll/pooldll.vcproj | 2 +- windows_vnet/test/reserved/reserved.vcproj | 6 +- windows_vnet/test/reserveddll/reserveddll.vcproj | 2 +- windows_vnet/test/set_extent/set_extent.vcproj | 6 +- .../test/set_extentdll/set_extentdll.vcproj | 2 +- windows_vnet/test/stab/stab.vcproj | 6 +- windows_vnet/test/stabdll/stabdll.vcproj | 2 +- windows_vnet/test/tellub/tellub.vcproj | 4 +- windows_vnet/test/testhdf5/testhdf5.vcproj | 6 +- windows_vnet/test/testhdf5dll/testhdf5dll.vcproj | 2 +- windows_vnet/test/ttsafedll/ttsafedll.vcproj | 2 +- windows_vnet/test/unlink/unlink.vcproj | 6 +- windows_vnet/test/unlinkdll/unlinkdll.vcproj | 2 +- windows_vnet/test/vfd/vfd.vcproj | 6 +- windows_vnet/test/vfddll/vfddll.vcproj | 6 +- windows_vnet/tools/h5copy/h5copy.vcproj | 6 +- windows_vnet/tools/h5debug/h5debug.vcproj | 6 +- windows_vnet/tools/h5debugdll/h5debugdll.vcproj | 2 +- windows_vnet/tools/h5diff/h5diff.vcproj | 6 +- windows_vnet/tools/h5diffdll/h5diffdll.vcproj | 2 +- windows_vnet/tools/h5dump/h5dump.vcproj | 6 +- windows_vnet/tools/h5dumpdll/h5dumpdll.vcproj | 2 +- windows_vnet/tools/h5import/h5import.vcproj | 6 +- windows_vnet/tools/h5importdll/h5importdll.vcproj | 2 +- windows_vnet/tools/h5jam/h5jam.vcproj | 4 +- windows_vnet/tools/h5ls/h5ls.vcproj | 6 +- windows_vnet/tools/h5lsdll/h5lsdll.vcproj | 2 +- windows_vnet/tools/h5mkgrp/h5mkgrp.vcproj | 2 +- windows_vnet/tools/h5repack/h5repack.vcproj | 6 +- windows_vnet/tools/h5repackdll/h5repackdll.vcproj | 2 +- windows_vnet/tools/h5repart/h5repart.vcproj | 6 +- windows_vnet/tools/h5repartdll/h5repartdll.vcproj | 2 +- windows_vnet/tools/h5stat/h5stat.vcproj | 2 +- windows_vnet/tools/h5statdll/h5statdll.vcproj | 2 +- windows_vnet/tools/h5unjam/h5unjam.vcproj | 4 +- windows_vnet/tools/talign/talign.vcproj | 6 +- windows_vnet/tools/taligndll/taligndll.vcproj | 2 +- .../tools/testfiles/binread/binread.vcproj | 2 +- .../tools/testfiles/h5difftst/h5difftst.vcproj | 6 +- .../tools/testfiles/h5dumptst/h5dumptst.vcproj | 6 +- .../tools/testfiles/h5importtst/h5importtst.vcproj | 2 +- .../tools/testfiles/h5jamtst/h5jamtst.vcproj | 4 +- .../tools/testfiles/h5repacktst/h5repacktst.vcproj | 4 +- .../h5repart_gentest/h5repart_gentest.vcproj | 2 +- .../tools/testfiles/h5reparttst/h5reparttst.vcproj | 2 +- .../testh5repack_detect_szip.vcproj | 4 +- .../testh5repack_detect_szipdll.vcproj | 2 +- windows_vnet/tools/toolslib/toolslib.vcproj | 4 +- windows_vnet/tools/toolslibD/toolslibD.vcproj | 4 +- 528 files changed, 3206 insertions(+), 3361 deletions(-) create mode 100644 tools/h52jpeg/h52jpeg.c create mode 100644 tools/h52jpeg/h52jpegtst.c create mode 100644 tools/testfiles/h5diff_empty.h5 delete mode 100755 windows/fortran/src/H5f90i_gen.h delete mode 100755 windows/fortran/src/H5fortran_types.f90 delete mode 100755 windows/src/H5Tinit.c diff --git a/MANIFEST b/MANIFEST index 08f673e..1ecc93f 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1455,6 +1455,7 @@ ./tools/testfiles/h5diff_dtypes.h5 ./tools/testfiles/h5diff_dset1.h5 ./tools/testfiles/h5diff_dset2.h5 +./tools/testfiles/h5diff_empty.h5 ./tools/testfiles/h5diff_hyper1.h5 ./tools/testfiles/h5diff_attr1.h5 ./tools/testfiles/h5diff_hyper2.h5 @@ -1517,7 +1518,9 @@ ./tools/testfiles/h5mkgrp_single_latest.ls ./tools/testfiles/h5mkgrp_version.ls - +#h52jpeg +./tools/h52jpeg/h52jpeg.c +./tools/h52jpeg/h52jpegtst.c # high level libraries ./hl/COPYING @@ -1803,10 +1806,6 @@ ./windows/fortran/examples/selecteletest/selecteletest.vfproj ./windows/fortran/examples/selecteletestdll/selecteletestdll.vfproj -# Windows-maintained Fortran Source -./windows/fortran/src/H5f90i_gen.h -./windows/fortran/src/H5fortran_types.f90 - # Fortran Tests ./windows/fortran/test/checkfortrantests.bat ./windows/fortran/test/flush1_fortran/flush1_fortran.vfproj @@ -1944,7 +1943,6 @@ # Windows-maintainted Source ./windows/src/H5pubconf.h -./windows/src/H5Tinit.c # Library Test Projects ./windows/test/checktests.bat diff --git a/Makefile.am b/Makefile.am index 9f2574a..c0d6827 100755 --- a/Makefile.am +++ b/Makefile.am @@ -73,7 +73,7 @@ else endif SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \ - $(HDF5_HL_DIR) + $(HDF5_HL_DIR) perform DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples # Some files generated during configure that should be cleaned @@ -101,13 +101,6 @@ tests: fi; \ done -check-perform: - @@SETX@; for d in perform; do \ - if test $$d != .; then \ - (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ - fi; \ - done - install-exec-local: @cd perform && $(MAKE) $(AM_MAKEFLAGS) install uninstall-local: diff --git a/Makefile.in b/Makefile.in index 9c443b6..ff384b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -370,7 +370,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog @BUILD_HDF5_HL_CONDITIONAL_FALSE@HDF5_HL_DIR = @BUILD_HDF5_HL_CONDITIONAL_TRUE@HDF5_HL_DIR = hl SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \ - $(HDF5_HL_DIR) + $(HDF5_HL_DIR) perform DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples @@ -840,13 +840,6 @@ tests: fi; \ done -check-perform: - @@SETX@; for d in perform; do \ - if test $$d != .; then \ - (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ - fi; \ - done - install-exec-local: @cd perform && $(MAKE) $(AM_MAKEFLAGS) install uninstall-local: diff --git a/configure b/configure index d0ed387..bdc0725 100755 --- a/configure +++ b/configure @@ -20862,7 +20862,9 @@ case "X-$RPATH" in X-no) { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - hardcode_libdir_flag_spec='' + runpath_var= + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= ;; X-|X-yes) { echo "$as_me:$LINENO: result: yes" >&5 diff --git a/configure.in b/configure.in index 92edd76..a96185c 100644 --- a/configure.in +++ b/configure.in @@ -960,7 +960,9 @@ AC_ARG_ENABLE([sharedlib-rpath], case "X-$RPATH" in X-no) AC_MSG_RESULT([no]) - hardcode_libdir_flag_spec='' + runpath_var= + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= ;; X-|X-yes) AC_MSG_RESULT([yes]) diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c index 49f8266..fab2eb5 100644 --- a/fortran/src/H5Df.c +++ b/fortran/src/H5Df.c @@ -1287,7 +1287,10 @@ nh5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims) if((c_space_id = H5Dget_space((hid_t)*dset_id)) < 0) return ret_value; - if((rank = H5Sget_simple_extent_ndims(c_space_id)) < 0) return ret_value; + rank = H5Sget_simple_extent_ndims(c_space_id); + H5Sclose(c_space_id); + if(rank < 0 ) return ret_value; + /* * Reverse dimensions due to C-FORTRAN storage order. diff --git a/fortran/src/H5Tff.f90 b/fortran/src/H5Tff.f90 index b78c2fd..8f12886 100644 --- a/fortran/src/H5Tff.f90 +++ b/fortran/src/H5Tff.f90 @@ -3041,7 +3041,7 @@ CONTAINS ! MS FORTRAN needs explicit interface for C functions called here. ! INTERFACE - INTEGER FUNCTION h5tset_tag_c(type_id, tag, namelen) + INTEGER FUNCTION h5tset_tag_c(type_id, tag, taglen) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_TAG_C'::h5tset_tag_c diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index 7d619d9..ca0a1b4 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -70,4 +70,5 @@ FORTRAN_API=yes # fflush2 depends on files created by fflush1 fflush2.chkexe_: fflush1.chkexe_ + include $(top_srcdir)/config/conclude.am diff --git a/fortran/test/fortranlib_test.f90 b/fortran/test/fortranlib_test.f90 index c3abf51..2bc2ab7 100644 --- a/fortran/test/fortranlib_test.f90 +++ b/fortran/test/fortranlib_test.f90 @@ -17,323 +17,209 @@ ! ! Testing Fortran functionality. ! - PROGRAM fortranlibtest - - USE HDF5 - - IMPLICIT NONE - INTEGER :: total_error = 0 - INTEGER :: error - INTEGER :: mounting_total_error = 0 - INTEGER :: reopen_total_error = 0 - INTEGER :: fclose_total_error = 0 - INTEGER :: fspace_total_error = 0 - INTEGER :: dataset_total_error = 0 - INTEGER :: extend_dataset_total_error = 0 - INTEGER :: refobj_total_error = 0 - INTEGER :: refreg_total_error = 0 - INTEGER :: dataspace_total_error = 0 - INTEGER :: hyperslab_total_error = 0 - INTEGER :: element_total_error = 0 - INTEGER :: basic_select_total_error = 0 - INTEGER :: total_error_compoundtest = 0 - INTEGER :: basic_datatype_total_error = 0 - INTEGER :: enum_total_error = 0 - INTEGER :: external_total_error = 0 - INTEGER :: multi_file_total_error = 0 - INTEGER :: attribute_total_error = 0 - INTEGER :: identifier_total_error = 0 - INTEGER :: group_total_error = 0 - INTEGER :: error_total_error = 0 - INTEGER :: vl_total_error = 0 - INTEGER :: z_total_error = 0 - INTEGER :: sz_total_error = 0 - INTEGER :: majnum, minnum, relnum - CHARACTER(LEN=8) error_string - CHARACTER(LEN=8) :: success = ' PASSED ' - CHARACTER(LEN=8) :: failure = '*FAILED*' - CHARACTER(LEN=8) :: skip = '--SKIP--' - CHARACTER(LEN=4) :: e_format ='(8a)' - LOGICAL :: cleanup = .TRUE. -! LOGICAL :: cleanup = .FALSE. - LOGICAL :: szip_flag - - CALL h5open_f(error) - write(*,*) ' ========================== ' - write(*,*) ' FORTRAN tests ' - write(*,*) ' ========================== ' - CALL h5get_libversion_f(majnum, minnum, relnum, total_error) - if(total_error .eq. 0) then - - write(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO") - write(*, '(I1)', advance="NO") majnum - write(*, '(".")', advance="NO") - write(*, '(I1)', advance="NO") minnum - write(*, '(" release ")', advance="NO") - write(*, '(I3)') relnum - else - total_error = total_error + 1 - endif - write(*,*) +PROGRAM fortranlibtest + + USE HDF5 + + IMPLICIT NONE + INTEGER :: total_error = 0 + INTEGER :: error + INTEGER :: majnum, minnum, relnum + LOGICAL :: cleanup = .TRUE. +! LOGICAL :: cleanup = .FALSE. + LOGICAL :: szip_flag + INTEGER :: ret_total_error + + CALL h5open_f(error) + WRITE(*,*) ' ========================== ' + WRITE(*,*) ' FORTRAN tests ' + WRITE(*,*) ' ========================== ' + CALL h5get_libversion_f(majnum, minnum, relnum, total_error) + IF(total_error .EQ. 0) THEN + + WRITE(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO") + WRITE(*, '(I1)', advance="NO") majnum + WRITE(*, '(".")', advance="NO") + WRITE(*, '(I1)', advance="NO") minnum + WRITE(*, '(" release ")', advance="NO") + WRITE(*, '(I3)') relnum + ELSE + total_error = total_error + 1 + ENDIF + WRITE(*,*) ! CALL h5check_version_f(1,4,4,total_error) ! write(*,*) '=========================================' ! write(*,*) 'Testing FILE Interface ' ! write(*,*) '=========================================' - error_string = failure - CALL mountingtest(cleanup, mounting_total_error) - IF (mounting_total_error == 0) error_string = success - write(*, fmt = '(14a)', advance = 'no') ' Mounting test' - write(*, fmt = '(56x,a)', advance = 'no') ' ' - - write(*, fmt = e_format) error_string - total_error = total_error + mounting_total_error - error_string = failure - CALL reopentest(cleanup, reopen_total_error) - IF (reopen_total_error == 0) error_string = success - write(*, fmt = '(12a)', advance = 'no') ' Reopen test' - write(*, fmt = '(58x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + reopen_total_error + + + ret_total_error = 0 + CALL mountingtest(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Mounting test', total_error) + + ret_total_error = 0 + CALL reopentest(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Reopen test', total_error) !DEC$ if defined(H5_VMS) - goto 100 + GOTO 8 !DEC$ else - error_string = failure - CALL file_close(cleanup, fclose_total_error) - IF (fclose_total_error == 0) error_string = success - write(*, fmt = '(21a)', advance = 'no') ' File open/close test' - write(*, fmt = '(49x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + fclose_total_error + ret_total_error = 0 + CALL file_close(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' File open/close test', total_error) !DEC$ endif -100 continue - error_string = failure - CALL file_space(cleanup, fspace_total_error) - IF (fspace_total_error == 0) error_string = success - write(*, fmt = '(21a)', advance = 'no') ' File free space test' - write(*, fmt = '(49x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + fspace_total_error +8 CONTINUE + + ret_total_error = 0 + CALL file_space(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' File free space test', total_error) ! write(*,*) ! write(*,*) '=========================================' ! write(*,*) 'Testing DATASET Interface ' ! write(*,*) '=========================================' - error_string = failure - CALL datasettest(cleanup, dataset_total_error) - IF (dataset_total_error == 0) error_string = success - write(*, fmt = '(13a)', advance = 'no') ' Dataset test' - write(*, fmt = '(57x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + dataset_total_error - error_string = failure - CALL extenddsettest(cleanup, extend_dataset_total_error) - IF (extend_dataset_total_error == 0) error_string = success - write(*, fmt = '(24a)', advance = 'no') ' Extendible dataset test' - write(*, fmt = '(46x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + extend_dataset_total_error + ret_total_error = 0 + CALL datasettest(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Dataset test', total_error) + + ret_total_error = 0 + CALL extenddsettest(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Extendible dataset test', total_error) + ! write(*,*) ! write(*,*) '=========================================' ! write(*,*) 'Testing DATASPACE Interface ' ! write(*,*) '=========================================' - error_string = failure - CALL dataspace_basic_test(cleanup, dataspace_total_error) - IF (dataspace_total_error == 0) error_string = success - write(*, fmt = '(21a)', advance = 'no') ' Basic dataspace test' - write(*, fmt = '(49x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + dataspace_total_error - + ret_total_error = 0 + CALL dataspace_basic_test(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Basic dataspace test', total_error) ! write(*,*) ! write(*,*) '=========================================' ! write(*,*) 'Testing REFERENCE Interface ' ! write(*,*) '=========================================' - error_string = failure - CALL refobjtest(cleanup, refobj_total_error) - IF (refobj_total_error == 0) error_string = success - write(*, fmt = '(25a)', advance = 'no') ' Reference to object test' - write(*, fmt = '(45x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + refobj_total_error - - error_string = failure - CALL refregtest(cleanup, refreg_total_error) - IF (refreg_total_error == 0) error_string = success - write(*, fmt = '(33a)', advance = 'no') ' Reference to dataset region test' - write(*, fmt = '(37x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + refreg_total_error + ret_total_error = 0 + CALL refobjtest(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Reference to object test', total_error) + + ret_total_error = 0 + CALL refregtest(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Reference to dataset region test', total_error) ! write(*,*) ! write(*,*) '=========================================' ! write(*,*) 'Testing selection functionalities ' ! write(*,*) '=========================================' - error_string = failure - CALL test_basic_select(cleanup, basic_select_total_error) - IF (basic_select_total_error == 0) error_string = success - write(*, fmt = '(21a)', advance = 'no') ' Basic selection test' - write(*, fmt = '(49x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + basic_select_total_error - - error_string = failure - CALL test_select_hyperslab( cleanup, hyperslab_total_error) - IF ( hyperslab_total_error == 0) error_string = success - write(*, fmt = '(25a)', advance = 'no') ' Hyperslab selection test' - write(*, fmt = '(45x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + hyperslab_total_error - - error_string = failure - CALL test_select_element(cleanup, element_total_error) - IF (element_total_error == 0) error_string = success - write(*, fmt = '(23a)', advance = 'no') ' Element selection test' - write(*, fmt = '(47x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + element_total_error + ret_total_error = 0 + CALL test_basic_select(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Basic selection test', total_error) + ret_total_error = 0 + CALL test_select_hyperslab( cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Hyperslab selection test', total_error) + + ret_total_error = 0 + CALL test_select_element(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Element selection test', total_error) + ! write(*,*) ! write(*,*) '=========================================' ! write(*,*) 'Testing DATATYPE interface ' ! write(*,*) '=========================================' - error_string = failure - CALL basic_data_type_test(cleanup, basic_datatype_total_error) - IF (basic_datatype_total_error == 0) error_string = success - write(*, fmt = '(20a)', advance = 'no') ' Basic datatype test' - write(*, fmt = '(50x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + basic_datatype_total_error - - error_string = failure - CALL compoundtest(cleanup, total_error_compoundtest) - IF (total_error_compoundtest == 0) error_string = success - write(*, fmt = '(23a)', advance = 'no') ' Compound datatype test' - write(*, fmt = '(47x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + total_error_compoundtest - error_string = failure - CALL enumtest(cleanup, enum_total_error) - IF (enum_total_error == 0) error_string = success - write(*, fmt = '(19a)', advance = 'no') ' Enum datatype test' - write(*, fmt = '(51x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + enum_total_error + ret_total_error = 0 + CALL basic_data_type_test(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Basic datatype test', total_error) + + ret_total_error = 0 + CALL compoundtest(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Compound datatype test', total_error) + + ret_total_error = 0 + CALL enumtest(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Enum datatype test', total_error) + ! write(*,*) ! write(*,*) '=========================================' ! write(*,*) 'Testing PROPERTY interface ' ! write(*,*) '=========================================' - error_string = failure - CALL external_test(cleanup, external_total_error) - IF (external_total_error == 0) error_string = success - write(*, fmt = '(22a)', advance = 'no') ' External dataset test' - write(*, fmt = '(48x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + external_total_error - - error_string = failure -! error_string = skip - cleanup = .FALSE. - CALL multi_file_test(cleanup, multi_file_total_error) - IF (multi_file_total_error == 0) error_string = success - write(*, fmt = '(23a)', advance = 'no') ' Multi file driver test' - write(*, fmt = '(47x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + multi_file_total_error + ret_total_error = 0 + CALL external_test(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' External dataset test', total_error) + + ret_total_error = 0 + cleanup = .FALSE. + CALL multi_file_test(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Multi file driver test', total_error) + ! write(*,*) ! write(*,*) '=========================================' ! write(*,*) 'Testing ATTRIBUTE interface ' ! write(*,*) '=========================================' - error_string = failure - CALL attribute_test(cleanup, attribute_total_error) - write(*, fmt = '(15a)', advance = 'no') ' Attribute test' - write(*, fmt = '(55x,a)', advance = 'no') ' ' - IF (attribute_total_error == 0) error_string = success - write(*, fmt = e_format) error_string - total_error = total_error + attribute_total_error + ret_total_error = 0 + CALL attribute_test(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Attribute test', total_error) ! write(*,*) ! write(*,*) '=========================================' ! write(*,*) 'Testing IDENTIFIER interface ' ! write(*,*) '=========================================' - error_string = failure - CALL identifier_test(cleanup, identifier_total_error) - IF (identifier_total_error == 0) error_string = success - write(*, fmt = '(16a)', advance = 'no') ' Identifier test' - write(*, fmt = '(54x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + identifier_total_error - error_string = failure - CALL filters_test(cleanup, z_total_error) - IF (z_total_error == 0) error_string = success - write(*, fmt = '(13a)', advance = 'no') ' Filters test' - write(*, fmt = '(57x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + z_total_error - - CALL szip_test(szip_flag, cleanup, sz_total_error) - IF (sz_total_error == 0) error_string = success - ! Reset the flag is compression was not available - IF (.NOT. szip_flag) error_string = skip - IF (sz_total_error .gt. 0) error_string = failure - write(*, fmt = '(18a)', advance = 'no') ' SZIP filter test' - write(*, fmt = '(53x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - if(sz_total_error .gt. 0) total_error = total_error + sz_total_error + ret_total_error = 0 + CALL identifier_test(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Identifier test', total_error) + + ret_total_error = 0 + CALL filters_test(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Filters test', total_error) + + ret_total_error = 0 + CALL szip_test(szip_flag, cleanup, ret_total_error) + + IF (.NOT. szip_flag) THEN ! test not available + CALL write_test_status(-1, ' SZIP filter test', total_error) + ELSE + CALL write_test_status(ret_total_error, ' SZIP filter test', total_error) + ENDIF ! write(*,*) ! write(*,*) '=========================================' ! write(*,*) 'Testing GROUP interface ' ! write(*,*) '=========================================' - error_string = failure - CALL group_test(cleanup, group_total_error) - IF (group_total_error == 0) error_string = success - write(*, fmt = '(11a)', advance = 'no') ' Group test' - write(*, fmt = '(59x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + group_total_error - - error_string = failure - CALL error_report_test(cleanup, error_total_error) - IF (error_total_error == 0) error_string = success - write(*, fmt = '(11a)', advance = 'no') ' Error test' - write(*, fmt = '(59x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + error_total_error - - error_string = failure - CALL vl_test_integer(cleanup, vl_total_error) - CALL vl_test_real(cleanup, vl_total_error) - CALL vl_test_string(cleanup, vl_total_error) - IF (vl_total_error == 0) error_string = success - write(*, fmt = '(11a)', advance = 'no') ' VL test' - write(*, fmt = '(62x,a)', advance = 'no') ' ' - write(*, fmt = e_format) error_string - total_error = total_error + vl_total_error - - write(*,*) - - write(*,*) ' ============================================ ' - write(*, fmt = '(19x, 27a)', advance='NO') ' FORTRAN tests completed with ' - write(*, fmt = '(i4)', advance='NO') total_error - write(*, fmt = '(12a)' ) ' error(s) ! ' - write(*,*) ' ============================================ ' - - CALL h5close_f(error) - - ! if errors detected, exit with non-zero code. - IF (total_error .ne. 0) CALL h5_exit_f (1) - - END PROGRAM fortranlibtest + ret_total_error = 0 + CALL group_test(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Group test', total_error) + + ret_total_error = 0 + CALL error_report_test(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' Error test', total_error) + + ret_total_error = 0 + CALL vl_test_integer(cleanup, ret_total_error) + CALL vl_test_real(cleanup, ret_total_error) + CALL vl_test_string(cleanup, ret_total_error) + CALL write_test_status(ret_total_error, ' VL test', total_error) + + WRITE(*,*) + + WRITE(*,*) ' ============================================ ' + WRITE(*, fmt = '(19x, 27a)', advance='NO') ' FORTRAN tests completed with ' + WRITE(*, fmt = '(i4)', advance='NO') total_error + WRITE(*, fmt = '(12a)' ) ' error(s) ! ' + WRITE(*,*) ' ============================================ ' + + CALL h5close_f(error) + + ! if errors detected, exit with non-zero code. + IF (total_error .NE. 0) CALL h5_exit_f (1) + +END PROGRAM fortranlibtest diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90 index ac87272..4ff3e0f 100644 --- a/fortran/test/fortranlib_test_1_8.f90 +++ b/fortran/test/fortranlib_test_1_8.f90 @@ -26,10 +26,6 @@ PROGRAM fortranlibtest INTEGER :: error INTEGER :: ret_total_error INTEGER :: majnum, minnum, relnum - CHARACTER(LEN=8) error_string - CHARACTER(LEN=8) :: success = ' PASSED ' - CHARACTER(LEN=8) :: failure = '*FAILED*' - CHARACTER(LEN=4) :: e_format ='(8a)' LOGICAL :: cleanup = .TRUE. ! LOGICAL :: cleanup = .FALSE. @@ -51,69 +47,46 @@ PROGRAM fortranlibtest WRITE(*,*) ret_total_error = 0 - error_string = failure CALL file_space(cleanup, ret_total_error) - IF (ret_total_error == 0) error_string = success - WRITE(*, fmt = '(21a)', advance = 'no') ' Testing file free space' - WRITE(*, fmt = '(52x,a)', advance = 'no') ' ' - WRITE(*, fmt = e_format) error_string - total_error = total_error + ret_total_error - ! write(*,*) - ! write(*,*) '=========================================' - ! write(*,*) 'Testing ATTRIBUTE interface ' - ! write(*,*) '=========================================' + CALL write_test_status(ret_total_error, & + ' Testing file free space', & + total_error) ret_total_error = 0 - error_string = failure CALL attribute_test_1_8(cleanup, ret_total_error) - WRITE(*, fmt = '(15a)', advance = 'no') ' Testing attributes' - WRITE(*, fmt = '(57x,a)', advance = 'no') ' ' - IF (ret_total_error == 0) error_string = success - WRITE(*, fmt = e_format) error_string - total_error = total_error + ret_total_error + CALL write_test_status(ret_total_error, & + ' Testing attributes', & + total_error) ret_total_error = 0 - error_string = failure CALL group_test(cleanup, ret_total_error) - WRITE(*, fmt = '(15a)', advance = 'no') ' Testing groups' - WRITE(*, fmt = '(61x,a)', advance = 'no') ' ' - IF (ret_total_error == 0) error_string = success - WRITE(*, fmt = e_format) error_string - total_error = total_error + ret_total_error + CALL write_test_status(ret_total_error, & + ' Testing groups', & + total_error) ret_total_error = 0 - error_string = failure CALL test_h5o(cleanup, ret_total_error) - WRITE(*, fmt = '(15a)', advance = 'no') ' Testing object interface' - WRITE(*, fmt = '(51x,a)', advance = 'no') ' ' - IF (ret_total_error == 0) error_string = success - WRITE(*, fmt = e_format) error_string - total_error = total_error + ret_total_error + CALL write_test_status(ret_total_error, & + ' Testing object interface', & + total_error) ret_total_error = 0 - error_string = failure CALL dtransform(cleanup, ret_total_error) - WRITE(*, fmt = '(15a)', advance = 'no') ' Testing data transform' - WRITE(*, fmt = '(53x,a)', advance = 'no') ' ' - IF (ret_total_error == 0) error_string = success - WRITE(*, fmt = e_format) error_string - total_error = total_error + ret_total_error + CALL write_test_status(ret_total_error, & + ' Testing data transform', & + total_error) ret_total_error = 0 - error_string = failure CALL test_genprop_basic_class(cleanup, ret_total_error) - WRITE(*, fmt = '(30a)', advance = 'no') ' Testing basic generic properties' - WRITE(*, fmt = '(43x,a)', advance = 'no') ' ' - IF (ret_total_error == 0) error_string = success - WRITE(*, fmt = e_format) error_string - total_error = total_error + ret_total_error + CALL write_test_status(ret_total_error, & + ' Testing basic generic properties', & + total_error) + ret_total_error = 0 CALL test_h5s_encode(cleanup, ret_total_error) - WRITE(*, fmt = '(15a)', advance = 'no') ' Testing dataspace encoding and decoding' - WRITE(*, fmt = '(36x,a)', advance = 'no') ' ' - IF (ret_total_error == 0) error_string = success - WRITE(*, fmt = e_format) error_string - total_error = total_error + ret_total_error + CALL write_test_status(ret_total_error, & + ' Testing dataspace encoding and decoding', & + total_error) ! CALL test_hard_query(group_total_error) @@ -139,8 +112,8 @@ SUBROUTINE dtransform(cleanup, total_error) LOGICAL, INTENT(IN) :: cleanup INTEGER, INTENT(INOUT) :: total_error - INTEGER(HID_T) :: dxpl_id_c_to_f, dxpl_id_c_to_f_copy - INTEGER(HID_T) :: dxpl_id_simple, dxpl_id_polynomial, dxpl_id_polynomial_copy, dxpl_id_utrans_inv, file_id + INTEGER(HID_T) :: dxpl_id_c_to_f + INTEGER(HID_T) :: file_id CHARACTER(LEN=15), PARAMETER :: c_to_f = "(9/5.0)*x + 123" INTEGER :: error @@ -206,7 +179,6 @@ SUBROUTINE test_genprop_basic_class(cleanup, total_error) INTEGER(HID_T) :: cid1 !/* Generic Property class ID */ INTEGER(HID_T) :: cid2 !/* Generic Property class ID */ - INTEGER(HID_T) :: cid3 !/* Generic Property class ID */ CHARACTER(LEN=7) :: CLASS1_NAME = "Class 1" CHARACTER(LEN=7) :: name ! /* Name of class */ @@ -294,10 +266,10 @@ SUBROUTINE test_h5s_encode(cleanup, total_error) LOGICAL, INTENT(IN) :: cleanup INTEGER, INTENT(INOUT) :: total_error - INTEGER(hid_t) :: sid1, sid2, sid3! /* Dataspace ID */ - INTEGER(hid_t) :: decoded_sid1, decoded_sid2, decoded_sid3 + INTEGER(hid_t) :: sid1, sid3! /* Dataspace ID */ + INTEGER(hid_t) :: decoded_sid1, decoded_sid3 INTEGER :: rank !/* LOGICAL rank of dataspace */ - INTEGER(size_t) :: sbuf_size=0, null_size=0, scalar_size=0 + INTEGER(size_t) :: sbuf_size=0, scalar_size=0 ! Make sure the size is large, need variable length in fortran 2003 CHARACTER(LEN=288) :: sbuf diff --git a/fortran/test/tH5A_1_8.f90 b/fortran/test/tH5A_1_8.f90 index cbd1840..a74b63f 100644 --- a/fortran/test/tH5A_1_8.f90 +++ b/fortran/test/tH5A_1_8.f90 @@ -22,7 +22,7 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error) ! USE HDF5 ! This module contains all necessary modules - + IMPLICIT NONE LOGICAL, INTENT(IN) :: cleanup INTEGER, INTENT(OUT) :: total_error @@ -56,6 +56,7 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error) LOGICAL, DIMENSION(1:2) :: new_format = (/.TRUE.,.FALSE./) LOGICAL, DIMENSION(1:2) :: use_shared = (/.TRUE.,.FALSE./) + INTEGER :: ret_total_error ! ******************** ! test_attr equivelent @@ -81,14 +82,20 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error) CALL check(" H5Pset_shared_mesg_index_f",error, total_error) DO i = 1, 2 + IF (new_format(i)) THEN -! WRITE(*,*) " - Testing with new file format" + WRITE(*,'(1X,A)') "Testing with new file format:" my_fapl = fapl2 ELSE -! WRITE(*,*) " - Testing with old file format" + WRITE(*,'(1X,A)') "Testing with old file format:" my_fapl = fapl END IF - CALL test_attr_basic_write(my_fapl, total_error) + ret_total_error = 0 + CALL test_attr_basic_write(my_fapl, ret_total_error) + CALL write_test_status(ret_total_error, & + ' - Tests INT attributes on both datasets and groups', & + total_error) + !!$ CALL test_attr_basic_read(my_fapl) !!$ CALL test_attr_flush(my_fapl) !!$ CALL test_attr_plist(my_fapl) ! this is next @@ -104,39 +111,89 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error) IF(new_format(i)) THEN DO j = 1, 2 IF (use_shared(j)) THEN -! WRITE(*,*) " - Testing with shared attributes" + WRITE(*,*) " - Testing with shared attributes:" my_fcpl = fcpl2 ELSE -! WRITE(*,*) " - Testing without shared attributes" + WRITE(*,*) " - Testing without shared attributes:" my_fcpl = fcpl END IF !!$ CALL test_attr_dense_create(my_fcpl, my_fapl) - CALL test_attr_dense_open(my_fcpl, my_fapl, total_error) + + ret_total_error = 0 + CALL test_attr_dense_open(my_fcpl, my_fapl, ret_total_error) + CALL write_test_status(ret_total_error, & + ' - Testing INT attributes on both datasets and groups', & + total_error) + !!$ CALL test_attr_dense_delete(my_fcpl, my_fapl) !!$ CALL test_attr_dense_rename(my_fcpl, my_fapl) !!$ CALL test_attr_dense_unlink(my_fcpl, my_fapl) !!$ CALL test_attr_dense_limits(my_fcpl, my_fapl) !!$ CALL test_attr_big(my_fcpl, my_fapl) - CALL test_attr_null_space(my_fcpl, my_fapl, total_error) + ret_total_error = 0 + CALL test_attr_null_space(my_fcpl, my_fapl, ret_total_error) + CALL write_test_status(ret_total_error, & + ' - Testing storing attribute with "null" dataspace', & + total_error) !!$ CALL test_attr_deprec(fcpl, my_fapl) - CALL test_attr_many(new_format(i), my_fcpl, my_fapl, total_error) - CALL test_attr_corder_create_basic(my_fcpl, my_fapl, total_error) - CALL test_attr_corder_create_compact(my_fcpl, my_fapl, total_error) + ret_total_error = 0 + CALL test_attr_many(new_format(i), my_fcpl, my_fapl, ret_total_error) + CALL write_test_status(ret_total_error, & + ' - Testing storing lots of attributes', & + total_error) + + ret_total_error = 0 + CALL test_attr_corder_create_basic(my_fcpl, my_fapl, ret_total_error) + CALL write_test_status(ret_total_error, & + ' - Testing creating objects with attribute creation order', & + total_error) + + ret_total_error = 0 + CALL test_attr_corder_create_compact(my_fcpl, my_fapl, ret_total_error) + CALL write_test_status(ret_total_error, & + ' - Testing compact storage on objects with attribute creation order', & + total_error) !!$ CALL test_attr_corder_create_dense(my_fcpl, my_fapl) !!$ CALL test_attr_corder_create_reopen(my_fcpl, my_fapl) !!$ CALL test_attr_corder_transition(my_fcpl, my_fapl) !!$ CALL test_attr_corder_delete(my_fcpl, my_fapl) - CALL test_attr_info_by_idx(new_format, my_fcpl, my_fapl, total_error) - CALL test_attr_delete_by_idx(new_format, my_fcpl, my_fapl, total_error) + ret_total_error = 0 + CALL test_attr_info_by_idx(new_format, my_fcpl, my_fapl, ret_total_error) + CALL write_test_status(ret_total_error, & + ' - Testing querying attribute info by index', & + total_error) + + ret_total_error = 0 + CALL test_attr_delete_by_idx(new_format, my_fcpl, my_fapl, ret_total_error) + CALL write_test_status(ret_total_error, & + ' - Testing deleting attribute by index', & + total_error) + !!$ CALL test_attr_iterate2(new_format, my_fcpl, my_fapl) !!$ CALL test_attr_open_by_idx(new_format, my_fcpl, my_fapl) !!$ CALL test_attr_open_by_name(new_format, my_fcpl, my_fapl) - CALL test_attr_create_by_name(new_format(i), my_fcpl, my_fapl, total_error) + ret_total_error = 0 + CALL test_attr_create_by_name(new_format(i), my_fcpl, my_fapl, ret_total_error) + CALL write_test_status(ret_total_error, & + ' - Testing creating attributes by name', & + total_error) + ! /* More complex tests with both "new format" and "shared" attributes */ IF( use_shared(j) ) THEN !!$ CALL test_attr_shared_write(my_fcpl, my_fapl) - CALL test_attr_shared_rename(my_fcpl, my_fapl, total_error) - CALL test_attr_shared_delete(my_fcpl, my_fapl, total_error) + ret_total_error = 0 + CALL test_attr_shared_rename(my_fcpl, my_fapl, ret_total_error) + CALL write_test_status(ret_total_error,& + ' - Testing renaming shared attributes in "compact" & "dense" storage', & + total_error) + + ret_total_error = 0 + CALL test_attr_shared_delete(my_fcpl, my_fapl, ret_total_error) + CALL write_test_status(ret_total_error,& + ' - Testing deleting shared attributes in "compact" & "dense" storage', & + total_error) + + !!$ CALL test_attr_shared_unlink(my_fcpl, my_fapl) END IF !!$ CALL test_attr_bug1(my_fcpl, my_fapl) @@ -155,7 +212,7 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error) !!$ CALL test_attr_bug1(fcpl, my_fapl) END IF - END DO + ENDDO CALL H5Pclose_f(fcpl, error) CALL CHECK("H5Pclose", error,total_error) @@ -171,6 +228,13 @@ END SUBROUTINE attribute_test_1_8 SUBROUTINE test_attr_corder_create_compact(fcpl,fapl, total_error) +!/**************************************************************** +!** +!** test_attr_corder_create_compact(): Test basic H5A (attribute) code. +!** Tests compact attribute storage on objects with attribute creation order info +!** +!****************************************************************/ + ! Needed for get_info_by_name USE HDF5 ! This module contains all necessary modules @@ -510,6 +574,13 @@ END SUBROUTINE test_attr_null_space SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error) +!/**************************************************************** +!** +!** test_attr_create_by_name(): Test basic H5A (attribute) code. +!** Tests creating attributes by name +!** +!****************************************************************/ + USE HDF5 IMPLICIT NONE @@ -762,6 +833,13 @@ END SUBROUTINE test_attr_create_by_name SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error) +!/**************************************************************** +!** +!** test_attr_info_by_idx(): Test basic H5A (attribute) code. +!** Tests querying attribute info by index +!** +!****************************************************************/ + USE HDF5 IMPLICIT NONE @@ -1610,6 +1688,13 @@ END SUBROUTINE test_attr_shared_rename SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error) +!/**************************************************************** +!** +!** test_attr_delete_by_idx(): Test basic H5A (attribute) code. +!** Tests deleting attribute by index +!** +!****************************************************************/ + USE HDF5 IMPLICIT NONE @@ -2873,7 +2958,6 @@ SUBROUTINE test_attr_basic_write(fapl, total_error) INTEGER(HID_T) :: attr,attr2 !String Attribute identifier INTEGER(HID_T) :: group - INTEGER(HSIZE_T), DIMENSION(7) :: data_dims CHARACTER(LEN=25) :: check_name CHARACTER(LEN=18) :: chr_exact_size diff --git a/fortran/test/tH5G_1_8.f90 b/fortran/test/tH5G_1_8.f90 index 4639731..aea5248 100644 --- a/fortran/test/tH5G_1_8.f90 +++ b/fortran/test/tH5G_1_8.f90 @@ -22,7 +22,7 @@ SUBROUTINE group_test(cleanup, total_error) INTEGER(HID_T) :: fapl, fapl2, my_fapl ! /* File access property lists */ - INTEGER :: error + INTEGER :: error, ret_total_error ! WRITE(*,*) "TESTING GROUPS" CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl, error) @@ -40,19 +40,60 @@ SUBROUTINE group_test(cleanup, total_error) my_fapl = fapl2 - CALL mklinks(fapl2, total_error) - CALL cklinks(fapl2, total_error) + ret_total_error = 0 + CALL mklinks(fapl2, ret_total_error) + CALL write_test_status(ret_total_error, & + ' Testing building a file with assorted links', & + total_error) + + ret_total_error = 0 + CALL cklinks(fapl2, ret_total_error) + CALL write_test_status(ret_total_error, & + ' Testing links are correct and building assorted links', & + total_error) + + ret_total_error = 0 + CALL group_info(cleanup, fapl2, ret_total_error) + CALL write_test_status(ret_total_error, & + ' Testing create group with creation order indices, test querying group info', & + total_error) - CALL group_info(cleanup, fapl2,total_error) ! CALL ud_hard_links(fapl2,total_error) - CALL timestamps(cleanup, fapl2, total_error) - CALL test_move_preserves(fapl2, total_error) - CALL delete_by_idx(cleanup,fapl2, total_error) - CALL test_lcpl(cleanup, fapl, total_error) - - CALL objcopy(fapl, total_error) - - CALL lifecycle(cleanup, fapl2, total_error) + ret_total_error = 0 + CALL timestamps(cleanup, fapl2, ret_total_error) + CALL write_test_status(ret_total_error, & + ' Testing disabling tracking timestamps for an object', & + total_error) + + ret_total_error = 0 + CALL test_move_preserves(fapl2, ret_total_error) + CALL write_test_status(ret_total_error, & + ' Testing moving and renaming links preserves their properties', & + total_error) + + ret_total_error = 0 + CALL delete_by_idx(cleanup,fapl2,ret_total_error) + CALL write_test_status(ret_total_error, & + ' Testing deleting links by index', & + total_error) + + ret_total_error = 0 + CALL test_lcpl(cleanup, fapl, ret_total_error) + CALL write_test_status(ret_total_error, & + ' Testing link creation property lists', & + total_error) + + ret_total_error = 0 + CALL objcopy(fapl, ret_total_error) + CALL write_test_status(ret_total_error, & + ' Testing object copy', & + total_error) + + ret_total_error = 0 + CALL lifecycle(cleanup, fapl2, ret_total_error) + CALL write_test_status(ret_total_error, & + ' Testing adding links to a group follow proper "lifecycle"', & + total_error) IF(cleanup) CALL h5_cleanup_f("TestLinks", H5P_DEFAULT_F, error) CALL check("h5_cleanup_f", error, total_error) @@ -668,7 +709,6 @@ SUBROUTINE group_info(cleanup, fapl, total_error) INTEGER(HID_T):: group_id INTEGER(HID_T):: fcpl_id ! /* Group creation property list ID */ INTEGER(HID_T):: lcpl_id - INTEGER(HID_T):: lcpl2_id !H5O_info_t oinfo; !H5L_info_t linfo; INTEGER :: old_cset @@ -877,18 +917,13 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error) INTEGER(HID_T) :: fid !/* File ID */ INTEGER(HID_T) :: gid !/* Group ID */ - INTEGER(HID_T) :: gid2 !/* Datatype ID */ INTEGER(HID_T) :: gcpl !/* Group creation property list ID */ INTEGER(size_t) :: lheap_size_hint !/* Local heap size hint */ INTEGER :: max_compact !/* Maximum # of links to store in group compactly */ INTEGER :: min_dense !/* Minimum # of links to store in group "densely" */ INTEGER :: est_num_entries !/* Estimated # of entries in group */ INTEGER :: est_name_len !/* Estimated length of entry name */ - INTEGER :: nmsgs !/* Number of messages in group's header */ - CHARACTER(LEN=NAME_BUF_SIZE) :: objname ! /* Object name */ CHARACTER(LEN=NAME_BUF_SIZE) :: filename = 'fixx.h5' - INTEGER :: empty_size ! /* Size of an empty file */ - INTEGER :: u ! /* Local index variable */ INTEGER(SIZE_T) :: LIFECYCLE_LOCAL_HEAP_SIZE_HINT = 256 INTEGER :: LIFECYCLE_MAX_COMPACT = 4 INTEGER :: LIFECYCLE_MIN_DENSE = 3 @@ -1030,7 +1065,6 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error) ! H5L_info_t linfo2; CHARACTER(LEN=12), PARAMETER :: filename ='TestLinks.h5' - CHARACTER(LEN=12) :: linkval ! TYPE(C_PTR) :: linkval @@ -1106,7 +1140,6 @@ SUBROUTINE delete_by_idx(cleanup, fapl, total_error) CHARACTER(LEN=7) :: objname ! /* Object name */ CHARACTER(LEN=8) :: filename = 'file0.h5' ! /* File name */ - CHARACTER(LEN=7) :: tmpname ! /* Temporary link name */ CHARACTER(LEN=12), PARAMETER :: CORDER_GROUP_NAME = "corder_group" LOGICAL :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute @@ -1124,11 +1157,8 @@ SUBROUTINE delete_by_idx(cleanup, fapl, total_error) ! ! ! - CHARACTER(LEN=6) :: filename1 - CHARACTER(LEN=6) :: filename2 CHARACTER(LEN=80) :: fix_filename1 CHARACTER(LEN=80) :: fix_filename2 - INTEGER(SIZE_T) :: size_tmp INTEGER(HSIZE_T) :: htmp LOGICAL :: cleanup @@ -1332,7 +1362,6 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, & CHARACTER(LEN=10) :: tmpname_big !/* to big temporary link name */ CHARACTER(LEN=7) :: valname !/* Link value name */ - CHARACTER(LEN=7) :: tmpval !/* Temporary link value */ CHARACTER(LEN=2) :: chr2 INTEGER(SIZE_T) :: size_tmp INTEGER :: error @@ -1439,7 +1468,6 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, & ! H5L_LINK_ERROR _F - Error INTEGER :: address ! If the link is a hard link, address specifies the file address that the link points to INTEGER(HSIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value - INTEGER(HSIZE_T) :: data_size ! Indicates the size, in the number of characters, of the attribute CHARACTER(LEN=1024) :: filename = 'tempfile.h5' INTEGER, PARAMETER :: TEST6_DIM1 = 8, TEST6_DIM2 = 7 @@ -1795,14 +1823,13 @@ SUBROUTINE lapl_nlinks( fapl, total_error) INTEGER(HID_T) :: fid = (-1) !/* File ID */ INTEGER(HID_T) :: gid = (-1), gid2 = (-1) !/* Group IDs */ INTEGER(HID_T) :: plist = (-1) ! /* lapl ID */ - INTEGER(HID_T) :: tid = (-1), sid = (-1), did = (-1) ! /* Other IDs */ + INTEGER(HID_T) :: tid = (-1) ! /* Other IDs */ INTEGER(HID_T) :: gapl = (-1), dapl = (-1), tapl = (-1) ! /* Other property lists */ CHARACTER(LEN=7) :: objname ! /* Object name */ INTEGER(size_t) :: name_len ! /* Length of object name */ CHARACTER(LEN=12) :: filename = 'TestLinks.h5' INTEGER(size_t) :: nlinks ! /* nlinks for H5Pset_nlinks */ - INTEGER(hsize_t), DIMENSION(2) :: dims INTEGER(size_t) :: buf_size = 7 ! WRITE(*,*) "adjusting nlinks with LAPL (w/new group format)" diff --git a/fortran/test/tH5O.f90 b/fortran/test/tH5O.f90 index 7e73104..0aa4abd 100644 --- a/fortran/test/tH5O.f90 +++ b/fortran/test/tH5O.f90 @@ -19,6 +19,7 @@ SUBROUTINE test_h5o(cleanup, total_error) IMPLICIT NONE LOGICAL, INTENT(IN) :: cleanup INTEGER, INTENT(OUT) :: total_error + INTEGER :: error ! /* Output message about test being performed */ ! WRITE(*,*) "Testing Objects" @@ -30,6 +31,11 @@ SUBROUTINE test_h5o(cleanup, total_error) CALL test_h5o_plist(total_error) ! /* Test object creation properties */ CALL test_h5o_link(total_error) ! /* Test object link routine */ + IF(cleanup) CALL h5_cleanup_f("TestFile", H5P_DEFAULT_F, error) + CALL check("h5_cleanup_f", error, total_error) + IF(cleanup) CALL h5_cleanup_f("test", H5P_DEFAULT_F, error) + CALL check("h5_cleanup_f", error, total_error) + END SUBROUTINE test_h5o !/**************************************************************** @@ -53,7 +59,7 @@ SUBROUTINE test_h5o_link(total_error) INTEGER(HID_T) :: fapl_id INTEGER(HID_T) :: lcpl_id INTEGER(HID_T) :: mem_space_id, file_space_id, xfer_prp - CHARACTER(LEN=8), PARAMETER :: TEST_FILENAME = 'TestFile' + CHARACTER(LEN=11), PARAMETER :: TEST_FILENAME = 'TestFile.h5' INTEGER, PARAMETER :: TEST6_DIM1 = 2, TEST6_DIM2 = 5 !EP INTEGER(HSIZE_T), DIMENSION(1:2), PARAMETER :: dims = (/TEST6_DIM1,TEST6_DIM2/) INTEGER(HSIZE_T), DIMENSION(1:2) :: dims = (/TEST6_DIM1,TEST6_DIM2/) diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90 index 1cbac24..d48ede1 100644 --- a/fortran/test/tf.f90 +++ b/fortran/test/tf.f90 @@ -18,11 +18,51 @@ ! This file contains subroutines which are used in ! all the hdf5 fortran tests ! + + !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) -!DEC$attributes dllexport :: check +!DEC$attributes dllexport :: write_test_status !DEC$endif + SUBROUTINE write_test_status( test_result, test_title, total_error) + +! Writes the results of the tests + + IMPLICIT NONE + + INTEGER, INTENT(IN) :: test_result ! negative, --skip -- + ! 0 , passed + ! positive, failed + + CHARACTER(LEN=*), INTENT(IN) :: test_title ! Short description of test + INTEGER, INTENT(INOUT) :: total_error ! Accumulated error + +! Controls the output style for reporting test results + + CHARACTER(LEN=8) :: error_string + CHARACTER(LEN=8), PARAMETER :: success = ' PASSED ' + CHARACTER(LEN=8), PARAMETER :: failure = '*FAILED*' + CHARACTER(LEN=8), PARAMETER :: skip = '--SKIP--' + + error_string = failure + IF (test_result == 0) THEN + error_string = success + ELSE IF (test_result == -1) THEN + error_string = skip + ENDIF + + WRITE(*, fmt = '(A, T72, A)') test_title, error_string + + IF(test_result.GT.0) total_error = total_error + test_result + + END SUBROUTINE write_test_status + + +!This definition is needed for Windows DLLs +!DEC$if defined(BUILD_HDF5_DLL) +!DEC$attributes dllexport :: check +!DEC$endif SUBROUTINE check(string,error,total_error) CHARACTER(LEN=*) :: string INTEGER :: error, total_error diff --git a/fortran/testpar/hyper.f90 b/fortran/testpar/hyper.f90 index fc0d1ff..a6d72dd 100644 --- a/fortran/testpar/hyper.f90 +++ b/fortran/testpar/hyper.f90 @@ -18,286 +18,283 @@ ! writes/reads dataset by hyperslabs !////////////////////////////////////////////////////////// -subroutine hyper(lenght,do_collective,do_chunk,nerrors) -use hdf5 -implicit none -include 'mpif.h' - -integer, intent(in) :: lenght ! array lenght -logical, intent(in) :: do_collective ! use collective I/O -logical, intent(in) :: do_chunk ! use chunking -integer, intent(inout) :: nerrors ! number of errors -integer :: mpierror ! MPI hdferror flag -integer :: hdferror ! HDF hdferror flag -integer :: mpi_size ! number of processes in the group of communicator -integer :: mpi_rank ! rank of the calling process in the communicator -integer(hsize_t), dimension(1) :: dims ! dataset dimensions -integer(hsize_t), dimension(1) :: cdims ! chunk dimensions -integer, allocatable :: wbuf(:) ! write buffer -integer, allocatable :: rbuf(:) ! read buffer -integer(hsize_t), dimension(1) :: counti ! hyperslab selection -integer(hsize_t), dimension(1) :: start ! hyperslab selection -integer(hid_t) :: fapl_id ! file access identifier -integer(hid_t) :: dxpl_id ! dataset transfer property list -integer(hid_t) :: dcpl_id ! dataset creation property list -integer(hid_t) :: file_id ! file identifier -integer(hid_t) :: dset_id ! dataset identifier -integer(hid_t) :: fspace_id ! file space identifier -integer(hid_t) :: mspace_id ! memory space identifier -integer(hid_t) :: driver_id ! low-level file driver identifier -integer :: istart ! start position in array -integer :: iend ! end position in array -integer :: icount ! number of elements in array -character(len=80) :: filename ! filename -integer :: i - -call mpi_comm_rank( MPI_COMM_WORLD, mpi_rank, mpierror ) -call mpi_comm_size( MPI_COMM_WORLD, mpi_size, mpierror ) +SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors) + USE hdf5 + IMPLICIT NONE + INCLUDE 'mpif.h' + + INTEGER, INTENT(in) :: length ! array length + LOGICAL, INTENT(in) :: do_collective ! use collective I/O + LOGICAL, INTENT(in) :: do_chunk ! use chunking + INTEGER, INTENT(in) :: mpi_size ! number of processes in the group of communicator + INTEGER, INTENT(in) :: mpi_rank ! rank of the calling process in the communicator + INTEGER, INTENT(inout) :: nerrors ! number of errors + INTEGER :: mpierror ! MPI hdferror flag + INTEGER :: hdferror ! HDF hdferror flag + INTEGER(hsize_t), DIMENSION(1) :: dims ! dataset dimensions + INTEGER(hsize_t), DIMENSION(1) :: cdims ! chunk dimensions + INTEGER, ALLOCATABLE :: wbuf(:) ! write buffer + INTEGER, ALLOCATABLE :: rbuf(:) ! read buffer + INTEGER(hsize_t), DIMENSION(1) :: counti ! hyperslab selection + INTEGER(hsize_t), DIMENSION(1) :: start ! hyperslab selection + INTEGER(hid_t) :: fapl_id ! file access identifier + INTEGER(hid_t) :: dxpl_id ! dataset transfer property list + INTEGER(hid_t) :: dcpl_id ! dataset creation property list + INTEGER(hid_t) :: file_id ! file identifier + INTEGER(hid_t) :: dset_id ! dataset identifier + INTEGER(hid_t) :: fspace_id ! file space identifier + INTEGER(hid_t) :: mspace_id ! memory space identifier + INTEGER(hid_t) :: driver_id ! low-level file driver identifier + INTEGER :: istart ! start position in array + INTEGER :: iend ! end position in array + INTEGER :: icount ! number of elements in array + CHARACTER(len=80) :: filename ! filename + INTEGER :: i + + !////////////////////////////////////////////////////////// + ! initialize the array data between the processes (3) + ! for the 12 size array we get + ! p0 = 1,2,3,4 + ! p1 = 5,6,7,8 + ! p2 = 9,10,11,12 + !////////////////////////////////////////////////////////// + + ALLOCATE(wbuf(0:length-1),stat=hdferror) + IF (hdferror /= 0) THEN + WRITE(*,*) 'allocate error' + RETURN + ENDIF + + ALLOCATE(rbuf(0:length-1),stat=hdferror) + IF (hdferror /= 0) THEN + WRITE(*,*) 'allocate error' + RETURN + ENDIF + + icount = length/mpi_size ! divide the array by the number of processes + istart = mpi_rank*icount ! start position + iend = istart + icount ! end position + + DO i = istart, iend-1 + wbuf(i) = i + ENDDO + + !////////////////////////////////////////////////////////// + ! HDF5 I/O + !////////////////////////////////////////////////////////// + + dims(1) = length + cdims(1) = length/mpi_size ! define chunks as the number of processes + + !////////////////////////////////////////////////////////// + ! setup file access property list with parallel I/O access + !////////////////////////////////////////////////////////// + + CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) + + CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror) + CALL check("h5pset_fapl_mpio_f", hdferror, nerrors) + + CALL h5pget_driver_f(fapl_id, driver_id, hdferror) + CALL check("h5pget_driver_f", hdferror, nerrors) + + IF( driver_id /= H5FD_MPIO_F) THEN + WRITE(*,*) "Wrong driver information returned" + nerrors = nerrors + 1 + ENDIF + + !////////////////////////////////////////////////////////// + ! create the file collectively + !////////////////////////////////////////////////////////// + + CALL h5_fixname_f("parf1", filename, fapl_id, hdferror) + + CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, hdferror, access_prp = fapl_id) + CALL check("h5fcreate_f", hdferror, nerrors) + + CALL h5screate_simple_f(1, dims, fspace_id, hdferror) + CALL check("h5screate_simple_f", hdferror, nerrors) + + CALL h5screate_simple_f(1, dims, mspace_id, hdferror) + CALL check("h5screate_simple_f", hdferror, nerrors) + + !////////////////////////////////////////////////////////// + ! modify dataset creation properties to enable chunking + !////////////////////////////////////////////////////////// -!////////////////////////////////////////////////////////// -! initialize the array data between the processes (3) -! for the 12 size array we get -! p0 = 1,2,3,4 -! p1 = 5,6,7,8 -! p2 = 9,10,11,12 -!////////////////////////////////////////////////////////// + CALL h5pcreate_f(H5P_DATASET_CREATE_F, dcpl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -allocate(wbuf(0:lenght-1),stat=hdferror) -if (hdferror /= 0) then - write(*,*) 'allocate error' - return -endif + IF (do_chunk) THEN + CALL h5pset_chunk_f(dcpl_id, 1, cdims, hdferror) + CALL check("h5pset_chunk_f", hdferror, nerrors) + ENDIF -allocate(rbuf(0:lenght-1),stat=hdferror) -if (hdferror /= 0) then - write(*,*) 'allocate error' - return -endif + !////////////////////////////////////////////////////////// + ! create the dataset + !////////////////////////////////////////////////////////// -icount = lenght/mpi_size ! divide the array by the number of processes -istart = mpi_rank*icount ! start position -iend = istart + icount ! end position + CALL h5dcreate_f(file_id, "dset", H5T_NATIVE_INTEGER, fspace_id, dset_id, hdferror, dcpl_id) + CALL check("h5dcreate_f", hdferror, nerrors) -do i = istart, iend-1 - wbuf(i) = i -enddo + !////////////////////////////////////////////////////////// + ! define hyperslab + !////////////////////////////////////////////////////////// -!////////////////////////////////////////////////////////// -! HDF5 I/O -!////////////////////////////////////////////////////////// + counti(1) = icount + start(1) = istart -dims(1) = lenght -cdims(1) = lenght/mpi_size ! define chunks as the number of processes + !////////////////////////////////////////////////////////// + ! select hyperslab in memory + !////////////////////////////////////////////////////////// -!////////////////////////////////////////////////////////// -! setup file access property list with parallel I/O access -!////////////////////////////////////////////////////////// + CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror) + CALL check("h5sselect_hyperslab_f", hdferror, nerrors) -call h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + !////////////////////////////////////////////////////////// + ! select hyperslab in the file + !////////////////////////////////////////////////////////// -call h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror) -call check("h5pset_fapl_mpio_f", hdferror, nerrors) + CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror) + CALL check("h5sselect_hyperslab_f", hdferror, nerrors) -call h5pget_driver_f(fapl_id, driver_id, hdferror) -call check("h5pget_driver_f", hdferror, nerrors) - -if( driver_id /= H5FD_MPIO_F) then - write(*,*) "Wrong driver information returned" - nerrors = nerrors + 1 -endif -!////////////////////////////////////////////////////////// -! create the file collectively -!////////////////////////////////////////////////////////// + !////////////////////////////////////////////////////////// + ! create a property list for collective dataset write + !////////////////////////////////////////////////////////// -call h5_fixname_f("parf1", filename, fapl_id, hdferror) + CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, hdferror, access_prp = fapl_id) -call check("h5fcreate_f", hdferror, nerrors) + IF (do_collective) THEN + CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror) + CALL check("h5pset_dxpl_mpio_f", hdferror, nerrors) + ENDIF -call h5screate_simple_f(1, dims, fspace_id, hdferror) -call check("h5screate_simple_f", hdferror, nerrors) + !////////////////////////////////////////////////////////// + ! write dataset + !////////////////////////////////////////////////////////// -call h5screate_simple_f(1, dims, mspace_id, hdferror) -call check("h5screate_simple_f", hdferror, nerrors) + CALL h5dwrite_f(dset_id,H5T_NATIVE_INTEGER,wbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id) + CALL check("h5dwrite_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! modify dataset creation properties to enable chunking -!////////////////////////////////////////////////////////// -call h5pcreate_f(H5P_DATASET_CREATE_F, dcpl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + !////////////////////////////////////////////////////////// + ! close HDF5 I/O + !////////////////////////////////////////////////////////// -if (do_chunk) then - call h5pset_chunk_f(dcpl_id, 1, cdims, hdferror) - call check("h5pset_chunk_f", hdferror, nerrors) -endif + CALL h5pclose_f(fapl_id, hdferror) + CALL check("h5pclose_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! create the dataset -!////////////////////////////////////////////////////////// + CALL h5pclose_f(dcpl_id, hdferror) + CALL check("h5pclose_f", hdferror, nerrors) -call h5dcreate_f(file_id, "dset", H5T_NATIVE_INTEGER, fspace_id, dset_id, hdferror, dcpl_id) -call check("h5dcreate_f", hdferror, nerrors) + CALL h5pclose_f(dxpl_id, hdferror) + CALL check("h5pclose_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! define hyperslab -!////////////////////////////////////////////////////////// + CALL h5sclose_f(mspace_id, hdferror) + CALL check("h5sclose_f", hdferror, nerrors) -counti(1) = icount -start(1) = istart + CALL h5sclose_f(fspace_id, hdferror) + CALL check("h5sclose_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! select hyperslab in memory -!////////////////////////////////////////////////////////// + CALL h5dclose_f(dset_id, hdferror) + CALL check("h5dclose_f", hdferror, nerrors) -call h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror) -call check("h5sselect_hyperslab_f", hdferror, nerrors) + CALL h5fclose_f(file_id, hdferror) + CALL check("h5fclose_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! select hyperslab in the file -!////////////////////////////////////////////////////////// + !////////////////////////////////////////////////////////// + ! reopen file with read access + !////////////////////////////////////////////////////////// -call h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror) -call check("h5sselect_hyperslab_f", hdferror, nerrors) + CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) + CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! create a property list for collective dataset write -!////////////////////////////////////////////////////////// + CALL h5fopen_f(filename, H5F_ACC_RDWR_F, file_id, hdferror, access_prp = fapl_id) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -if (do_collective) then - call h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror) - call check("h5pset_dxpl_mpio_f", hdferror, nerrors) -endif + CALL h5screate_simple_f(1, dims, fspace_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! write dataset -!////////////////////////////////////////////////////////// + CALL h5screate_simple_f(1, dims, mspace_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5dwrite_f(dset_id,H5T_NATIVE_INTEGER,wbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id) -call check("h5dwrite_f", hdferror, nerrors) + CALL h5dopen_f(file_id, "dset", dset_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) + !////////////////////////////////////////////////////////// + ! select hyperslab in memory + !////////////////////////////////////////////////////////// -!////////////////////////////////////////////////////////// -! close HDF5 I/O -!////////////////////////////////////////////////////////// + CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5pclose_f(fapl_id, hdferror) -call check("h5pclose_f", hdferror, nerrors) + !////////////////////////////////////////////////////////// + ! select hyperslab in the file + !////////////////////////////////////////////////////////// -call h5pclose_f(dcpl_id, hdferror) -call check("h5pclose_f", hdferror, nerrors) + CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5pclose_f(dxpl_id, hdferror) -call check("h5pclose_f", hdferror, nerrors) + !////////////////////////////////////////////////////////// + ! create a property list for collective dataset read + !////////////////////////////////////////////////////////// -call h5sclose_f(mspace_id, hdferror) -call check("h5sclose_f", hdferror, nerrors) + CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5sclose_f(fspace_id, hdferror) -call check("h5sclose_f", hdferror, nerrors) + IF (do_collective) THEN + CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) + ENDIF -call h5dclose_f(dset_id, hdferror) -call check("h5dclose_f", hdferror, nerrors) + !////////////////////////////////////////////////////////// + ! read dataset + !////////////////////////////////////////////////////////// -call h5fclose_f(file_id, hdferror) -call check("h5fclose_f", hdferror, nerrors) + CALL h5dread_f(dset_id,H5T_NATIVE_INTEGER,rbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id) + CALL check("h5pcreate_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! reopen file with read access -!////////////////////////////////////////////////////////// + !////////////////////////////////////////////////////////// + ! close HDF5 I/O + !////////////////////////////////////////////////////////// -call h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + CALL h5pclose_f(fapl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + CALL h5pclose_f(dxpl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5fopen_f(filename, H5F_ACC_RDWR_F, file_id, hdferror, access_prp = fapl_id) -call check("h5pcreate_f", hdferror, nerrors) + CALL h5sclose_f(fspace_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5screate_simple_f(1, dims, fspace_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + CALL h5sclose_f(mspace_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5screate_simple_f(1, dims, mspace_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + CALL h5dclose_f(dset_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5dopen_f(file_id, "dset", dset_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + CALL h5fclose_f(file_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! select hyperslab in memory -!////////////////////////////////////////////////////////// - -call h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -!////////////////////////////////////////////////////////// -! select hyperslab in the file -!////////////////////////////////////////////////////////// - -call h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -!////////////////////////////////////////////////////////// -! create a property list for collective dataset read -!////////////////////////////////////////////////////////// - -call h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -if (do_collective) then - call h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror) - call check("h5pcreate_f", hdferror, nerrors) -endif - -!////////////////////////////////////////////////////////// -! read dataset -!////////////////////////////////////////////////////////// - -call h5dread_f(dset_id,H5T_NATIVE_INTEGER,rbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id) -call check("h5pcreate_f", hdferror, nerrors) - -!////////////////////////////////////////////////////////// -! close HDF5 I/O -!////////////////////////////////////////////////////////// - -call h5pclose_f(fapl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -call h5pclose_f(dxpl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -call h5sclose_f(fspace_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -call h5sclose_f(mspace_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -call h5dclose_f(dset_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -call h5fclose_f(file_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -!////////////////////////////////////////////////////////// -! compare read and write data. each process compares a subset of the array -!////////////////////////////////////////////////////////// + !////////////////////////////////////////////////////////// + ! compare read and write data. each process compares a subset of the array + !////////////////////////////////////////////////////////// -do i = istart, iend-1 - if( wbuf(i) /= rbuf(i)) then - write(*,*) 'buffers differs at ', i, rbuf(i), wbuf(i) - nerrors = nerrors + 1 - endif -enddo + DO i = istart, iend-1 + IF( wbuf(i) /= rbuf(i)) THEN + WRITE(*,*) 'buffers differs at ', i, rbuf(i), wbuf(i) + nerrors = nerrors + 1 + ENDIF + ENDDO -deallocate(wbuf) -deallocate(rbuf) + DEALLOCATE(wbuf) + DEALLOCATE(rbuf) -end subroutine hyper +END SUBROUTINE hyper diff --git a/fortran/testpar/mdset.f90 b/fortran/testpar/mdset.f90 index 0281934..dcc7210 100644 --- a/fortran/testpar/mdset.f90 +++ b/fortran/testpar/mdset.f90 @@ -18,304 +18,301 @@ ! writes/reads dataset by hyperslabs !////////////////////////////////////////////////////////// -subroutine multiple_dset_write(lenght,do_collective,do_chunk,nerrors) -use hdf5 -implicit none -include 'mpif.h' - -integer, intent(in) :: lenght ! array lenght -logical, intent(in) :: do_collective ! use collective I/O -logical, intent(in) :: do_chunk ! use chunking -integer, intent(inout) :: nerrors ! number of errors -integer :: mpierror ! MPI hdferror flag -integer :: hdferror ! HDF hdferror flag -integer :: mpi_size ! number of processes in the group of communicator -integer :: mpi_rank ! rank of the calling process in the communicator -integer(hsize_t), dimension(1) :: dims ! dataset dimensions -integer(hsize_t), dimension(1) :: cdims ! chunk dimensions -integer, allocatable :: wbuf(:) ! write buffer -integer, allocatable :: rbuf(:) ! read buffer -integer(hsize_t), dimension(1) :: counti ! hyperslab selection -integer(hsize_t), dimension(1) :: start ! hyperslab selection -integer(hid_t) :: fapl_id ! file access identifier -integer(hid_t) :: dxpl_id ! dataset transfer property list -integer(hid_t) :: dcpl_id ! dataset creation property list -integer(hid_t) :: file_id ! file identifier -integer(hid_t) :: dset_id ! dataset identifier -integer(hid_t) :: fspace_id ! file space identifier -integer(hid_t) :: mspace_id ! memory space identifier -integer(hid_t) :: driver_id ! low-level file driver identifier -integer :: istart ! start position in array -integer :: iend ! end position in array -integer :: icount ! number of elements in array -character(len=80) :: filename ! filename -character(len=80) :: dsetname ! dataset name -integer :: n, i - -call mpi_comm_rank( MPI_COMM_WORLD, mpi_rank, mpierror ) -call mpi_comm_size( MPI_COMM_WORLD, mpi_size, mpierror ) +SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors) + USE hdf5 + IMPLICIT NONE + INCLUDE 'mpif.h' + + INTEGER, INTENT(in) :: length ! array length + LOGICAL, INTENT(in) :: do_collective ! use collective I/O + LOGICAL, INTENT(in) :: do_chunk ! use chunking + INTEGER, INTENT(in) :: mpi_size ! number of processes in the group of communicator + INTEGER, INTENT(in) :: mpi_rank ! rank of the calling process in the communicator + INTEGER, INTENT(inout) :: nerrors ! number of errors + INTEGER :: mpierror ! MPI hdferror flag + INTEGER :: hdferror ! HDF hdferror flag + INTEGER(hsize_t), DIMENSION(1) :: dims ! dataset dimensions + INTEGER(hsize_t), DIMENSION(1) :: cdims ! chunk dimensions + INTEGER, ALLOCATABLE :: wbuf(:) ! write buffer + INTEGER, ALLOCATABLE :: rbuf(:) ! read buffer + INTEGER(hsize_t), DIMENSION(1) :: counti ! hyperslab selection + INTEGER(hsize_t), DIMENSION(1) :: start ! hyperslab selection + INTEGER(hid_t) :: fapl_id ! file access identifier + INTEGER(hid_t) :: dxpl_id ! dataset transfer property list + INTEGER(hid_t) :: dcpl_id ! dataset creation property list + INTEGER(hid_t) :: file_id ! file identifier + INTEGER(hid_t) :: dset_id ! dataset identifier + INTEGER(hid_t) :: fspace_id ! file space identifier + INTEGER(hid_t) :: mspace_id ! memory space identifier + INTEGER(hid_t) :: driver_id ! low-level file driver identifier + INTEGER :: istart ! start position in array + INTEGER :: iend ! end position in array + INTEGER :: icount ! number of elements in array + CHARACTER(len=80) :: filename ! filename + CHARACTER(len=80) :: dsetname ! dataset name + INTEGER :: n, i + + !////////////////////////////////////////////////////////// + ! initialize the array data between the processes (3) + ! for the 12 size array we get + ! p0 = 1,2,3,4 + ! p1 = 5,6,7,8 + ! p2 = 9,10,11,12 + !////////////////////////////////////////////////////////// + + ALLOCATE(wbuf(0:length-1),stat=hdferror) + IF (hdferror /= 0) THEN + WRITE(*,*) 'allocate error' + RETURN + ENDIF + + ALLOCATE(rbuf(0:length-1),stat=hdferror) + IF (hdferror /= 0) THEN + WRITE(*,*) 'allocate error' + RETURN + ENDIF + + icount = length/mpi_size ! divide the array by the number of processes + istart = mpi_rank*icount ! start position + iend = istart + icount ! end position + + !////////////////////////////////////////////////////////// + ! HDF5 I/O + !////////////////////////////////////////////////////////// + + dims(1) = length + cdims(1) = length/mpi_size ! define chunks as the number of processes + + !////////////////////////////////////////////////////////// + ! setup file access property list with parallel I/O access + !////////////////////////////////////////////////////////// + + CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) + + CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror) + CALL check("h5pset_fapl_mpio_f", hdferror, nerrors) + + CALL h5pget_driver_f(fapl_id, driver_id, hdferror) + CALL check("h5pget_driver_f", hdferror, nerrors) + + IF( driver_id /= H5FD_MPIO_F) THEN + WRITE(*,*) "Wrong driver information returned" + nerrors = nerrors + 1 + ENDIF + + !////////////////////////////////////////////////////////// + ! create the file collectively + !////////////////////////////////////////////////////////// + + CALL h5_fixname_f("parf2", filename, fapl_id, hdferror) + + CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, hdferror, access_prp = fapl_id) + CALL check("h5fcreate_f", hdferror, nerrors) + + CALL h5screate_simple_f(1, dims, fspace_id, hdferror) + CALL check("h5screate_simple_f", hdferror, nerrors) + + CALL h5screate_simple_f(1, dims, mspace_id, hdferror) + CALL check("h5screate_simple_f", hdferror, nerrors) + + !////////////////////////////////////////////////////////// + ! modify dataset creation properties to enable chunking + !////////////////////////////////////////////////////////// + + CALL h5pcreate_f(H5P_DATASET_CREATE_F, dcpl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) + + IF (do_chunk) THEN + CALL h5pset_chunk_f(dcpl_id, 1, cdims, hdferror) + CALL check("h5pset_chunk_f", hdferror, nerrors) + ENDIF + + !////////////////////////////////////////////////////////// + ! create a property list for collective dataset write + !////////////////////////////////////////////////////////// -!////////////////////////////////////////////////////////// -! initialize the array data between the processes (3) -! for the 12 size array we get -! p0 = 1,2,3,4 -! p1 = 5,6,7,8 -! p2 = 9,10,11,12 -!////////////////////////////////////////////////////////// + CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -allocate(wbuf(0:lenght-1),stat=hdferror) -if (hdferror /= 0) then - write(*,*) 'allocate error' - return -endif + IF (do_collective) THEN + CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror) + CALL check("h5pset_dxpl_mpio_f", hdferror, nerrors) + ENDIF -allocate(rbuf(0:lenght-1),stat=hdferror) -if (hdferror /= 0) then - write(*,*) 'allocate error' - return -endif + !////////////////////////////////////////////////////////// + ! define hyperslab + !////////////////////////////////////////////////////////// -icount = lenght/mpi_size ! divide the array by the number of processes -istart = mpi_rank*icount ! start position -iend = istart + icount ! end position + counti(1) = icount + start(1) = istart -!////////////////////////////////////////////////////////// -! HDF5 I/O -!////////////////////////////////////////////////////////// + !////////////////////////////////////////////////////////// + ! select hyperslab in memory + !////////////////////////////////////////////////////////// -dims(1) = lenght -cdims(1) = lenght/mpi_size ! define chunks as the number of processes + CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror) + CALL check("h5sselect_hyperslab_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! setup file access property list with parallel I/O access -!////////////////////////////////////////////////////////// + !////////////////////////////////////////////////////////// + ! select hyperslab in the file + !////////////////////////////////////////////////////////// -call h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror) + CALL check("h5sselect_hyperslab_f", hdferror, nerrors) -call h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror) -call check("h5pset_fapl_mpio_f", hdferror, nerrors) + !////////////////////////////////////////////////////////// + ! create and write the datasets + !////////////////////////////////////////////////////////// -call h5pget_driver_f(fapl_id, driver_id, hdferror) -call check("h5pget_driver_f", hdferror, nerrors) - -if( driver_id /= H5FD_MPIO_F) then - write(*,*) "Wrong driver information returned" - nerrors = nerrors + 1 -endif + DO n = 1, 300 -!////////////////////////////////////////////////////////// -! create the file collectively -!////////////////////////////////////////////////////////// - -call h5_fixname_f("parf2", filename, fapl_id, hdferror) + ! direct the output of the write statement to unit "dsetname" + WRITE(dsetname,*) 'dataset', n -call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, hdferror, access_prp = fapl_id) -call check("h5fcreate_f", hdferror, nerrors) + ! create this dataset + CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, fspace_id, dset_id, hdferror, dcpl_id) + CALL check("h5dcreate_f", hdferror, nerrors) -call h5screate_simple_f(1, dims, fspace_id, hdferror) -call check("h5screate_simple_f", hdferror, nerrors) + DO i = istart, iend-1 + wbuf(i) = n + mpi_rank + ENDDO -call h5screate_simple_f(1, dims, mspace_id, hdferror) -call check("h5screate_simple_f", hdferror, nerrors) + ! write this dataset + CALL h5dwrite_f(dset_id,H5T_NATIVE_INTEGER,wbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id) + CALL check("h5dwrite_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! modify dataset creation properties to enable chunking -!////////////////////////////////////////////////////////// + ! close this dataset + CALL h5dclose_f(dset_id, hdferror) + CALL check("h5dclose_f", hdferror, nerrors) -call h5pcreate_f(H5P_DATASET_CREATE_F, dcpl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + ENDDO -if (do_chunk) then - call h5pset_chunk_f(dcpl_id, 1, cdims, hdferror) - call check("h5pset_chunk_f", hdferror, nerrors) -endif + !////////////////////////////////////////////////////////// + ! close HDF5 I/O + !////////////////////////////////////////////////////////// -!////////////////////////////////////////////////////////// -! create a property list for collective dataset write -!////////////////////////////////////////////////////////// + CALL h5pclose_f(fapl_id, hdferror) + CALL check("h5pclose_f", hdferror, nerrors) -call h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -if (do_collective) then - call h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror) - call check("h5pset_dxpl_mpio_f", hdferror, nerrors) -endif + CALL h5pclose_f(dcpl_id, hdferror) + CALL check("h5pclose_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! define hyperslab -!////////////////////////////////////////////////////////// + CALL h5pclose_f(dxpl_id, hdferror) + CALL check("h5pclose_f", hdferror, nerrors) -counti(1) = icount -start(1) = istart + CALL h5sclose_f(mspace_id, hdferror) + CALL check("h5sclose_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! select hyperslab in memory -!////////////////////////////////////////////////////////// + CALL h5sclose_f(fspace_id, hdferror) + CALL check("h5sclose_f", hdferror, nerrors) -call h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror) -call check("h5sselect_hyperslab_f", hdferror, nerrors) + CALL h5fclose_f(file_id, hdferror) + CALL check("h5fclose_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! select hyperslab in the file -!////////////////////////////////////////////////////////// + !////////////////////////////////////////////////////////// + ! reopen file with read access + !////////////////////////////////////////////////////////// -call h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror) -call check("h5sselect_hyperslab_f", hdferror, nerrors) + CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! create and write the datasets -!////////////////////////////////////////////////////////// + CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -do n = 1, 300 + CALL h5fopen_f(filename, H5F_ACC_RDWR_F, file_id, hdferror, access_prp = fapl_id) + CALL check("h5pcreate_f", hdferror, nerrors) -! direct the output of the write statement to unit "dsetname" - write(dsetname,*) 'dataset', n + CALL h5screate_simple_f(1, dims, fspace_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -! create this dataset - call h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, fspace_id, dset_id, hdferror, dcpl_id) - call check("h5dcreate_f", hdferror, nerrors) + CALL h5screate_simple_f(1, dims, mspace_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) - do i = istart, iend-1 - wbuf(i) = n + mpi_rank - enddo + !////////////////////////////////////////////////////////// + ! select hyperslab in memory + !////////////////////////////////////////////////////////// -! write this dataset - call h5dwrite_f(dset_id,H5T_NATIVE_INTEGER,wbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id) - call check("h5dwrite_f", hdferror, nerrors) + CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -! close this dataset - call h5dclose_f(dset_id, hdferror) - call check("h5dclose_f", hdferror, nerrors) + !////////////////////////////////////////////////////////// + ! select hyperslab in the file + !////////////////////////////////////////////////////////// -enddo + CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! close HDF5 I/O -!////////////////////////////////////////////////////////// + !////////////////////////////////////////////////////////// + ! create a property list for collective dataset read + !////////////////////////////////////////////////////////// -call h5pclose_f(fapl_id, hdferror) -call check("h5pclose_f", hdferror, nerrors) + CALL h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5pclose_f(dcpl_id, hdferror) -call check("h5pclose_f", hdferror, nerrors) + IF (do_collective) THEN + CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) + ENDIF -call h5pclose_f(dxpl_id, hdferror) -call check("h5pclose_f", hdferror, nerrors) + !////////////////////////////////////////////////////////// + ! read dataset + !////////////////////////////////////////////////////////// -call h5sclose_f(mspace_id, hdferror) -call check("h5sclose_f", hdferror, nerrors) + DO n = 1, 300 -call h5sclose_f(fspace_id, hdferror) -call check("h5sclose_f", hdferror, nerrors) + ! direct the output of the write statement to unit "dsetname" + WRITE(dsetname,*) 'dataset', n -call h5fclose_f(file_id, hdferror) -call check("h5fclose_f", hdferror, nerrors) + ! create this dataset + CALL h5dopen_f(file_id, dsetname, dset_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! reopen file with read access -!////////////////////////////////////////////////////////// + ! read this dataset + CALL h5dread_f(dset_id,H5T_NATIVE_INTEGER,rbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5pcreate_f(H5P_FILE_ACCESS_F, fapl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + ! close this dataset + CALL h5dclose_f(dset_id, hdferror) + CALL check("h5dclose_f", hdferror, nerrors) -call h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + DO i = istart, iend-1 + wbuf(i) = n + mpi_rank + ENDDO -call h5fopen_f(filename, H5F_ACC_RDWR_F, file_id, hdferror, access_prp = fapl_id) -call check("h5pcreate_f", hdferror, nerrors) + ! compare read and write data. each process compares a subset of the array + DO i = istart, iend-1 + IF( wbuf(i) /= rbuf(i)) THEN + WRITE(*,*) 'buffers differs at ', i, rbuf(i), wbuf(i) + nerrors = nerrors + 1 + ENDIF + ENDDO -call h5screate_simple_f(1, dims, fspace_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + ENDDO -call h5screate_simple_f(1, dims, mspace_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) -!////////////////////////////////////////////////////////// -! select hyperslab in memory -!////////////////////////////////////////////////////////// - -call h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -!////////////////////////////////////////////////////////// -! select hyperslab in the file -!////////////////////////////////////////////////////////// - -call h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -!////////////////////////////////////////////////////////// -! create a property list for collective dataset read -!////////////////////////////////////////////////////////// - -call h5pcreate_f(H5P_DATASET_XFER_F, dxpl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) - -if (do_collective) then - call h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror) - call check("h5pcreate_f", hdferror, nerrors) -endif - -!////////////////////////////////////////////////////////// -! read dataset -!////////////////////////////////////////////////////////// - -do n = 1, 300 - -! direct the output of the write statement to unit "dsetname" - write(dsetname,*) 'dataset', n - -! create this dataset - call h5dopen_f(file_id, dsetname, dset_id, hdferror) - call check("h5pcreate_f", hdferror, nerrors) - -! read this dataset - call h5dread_f(dset_id,H5T_NATIVE_INTEGER,rbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id) - call check("h5pcreate_f", hdferror, nerrors) - -! close this dataset - call h5dclose_f(dset_id, hdferror) - call check("h5dclose_f", hdferror, nerrors) - - do i = istart, iend-1 - wbuf(i) = n + mpi_rank - enddo - -! compare read and write data. each process compares a subset of the array - do i = istart, iend-1 - if( wbuf(i) /= rbuf(i)) then - write(*,*) 'buffers differs at ', i, rbuf(i), wbuf(i) - nerrors = nerrors + 1 - endif - enddo - -enddo - - -!////////////////////////////////////////////////////////// -! close HDF5 I/O -!////////////////////////////////////////////////////////// + !////////////////////////////////////////////////////////// + ! close HDF5 I/O + !////////////////////////////////////////////////////////// -call h5pclose_f(fapl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + CALL h5pclose_f(fapl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5pclose_f(dxpl_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + CALL h5pclose_f(dxpl_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5sclose_f(fspace_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + CALL h5sclose_f(fspace_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5sclose_f(mspace_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + CALL h5sclose_f(mspace_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -call h5fclose_f(file_id, hdferror) -call check("h5pcreate_f", hdferror, nerrors) + CALL h5fclose_f(file_id, hdferror) + CALL check("h5pcreate_f", hdferror, nerrors) -deallocate(wbuf) -deallocate(rbuf) + DEALLOCATE(wbuf) + DEALLOCATE(rbuf) -end subroutine multiple_dset_write +END SUBROUTINE multiple_dset_write diff --git a/fortran/testpar/ptest.f90 b/fortran/testpar/ptest.f90 index 80f4091..6f6fb2e 100644 --- a/fortran/testpar/ptest.f90 +++ b/fortran/testpar/ptest.f90 @@ -17,103 +17,119 @@ ! main program for parallel HDF5 Fortran tests !////////////////////////////////////////////////////////// -program parallel_test -use hdf5 -implicit none -include 'mpif.h' - -integer :: mpierror ! MPI hdferror flag -integer :: hdferror ! HDF hdferror flag -logical :: do_collective ! use collective MPI I/O -logical :: do_chunk ! use chunking -integer :: nerrors = 0 ! number of errors -integer :: mpi_rank ! rank of the calling process in the communicator -integer :: lenght = 12000 ! lenght of array +PROGRAM parallel_test + USE hdf5 + IMPLICIT NONE + INCLUDE 'mpif.h' + + INTEGER :: mpierror ! MPI hdferror flag + INTEGER :: hdferror ! HDF hdferror flag + LOGICAL :: do_collective ! use collective MPI I/O + LOGICAL :: do_chunk ! use chunking + INTEGER :: nerrors = 0 ! number of errors + INTEGER :: mpi_size ! number of processes in the group of communicator + INTEGER :: mpi_rank ! rank of the calling process in the communicator + INTEGER :: length = 12000 ! length of array + + !////////////////////////////////////////////////////////// + ! initialize MPI + !////////////////////////////////////////////////////////// + + CALL mpi_init(mpierror) + IF (mpierror .NE. MPI_SUCCESS) THEN + WRITE(*,*) "MPI_INIT *FAILED*" + ENDIF + CALL mpi_comm_rank( MPI_COMM_WORLD, mpi_rank, mpierror ) + IF (mpierror .NE. MPI_SUCCESS) THEN + WRITE(*,*) "MPI_COMM_RANK *FAILED* Process = ", mpi_rank + ENDIF + CALL mpi_comm_size( MPI_COMM_WORLD, mpi_size, mpierror ) + IF (mpierror .NE. MPI_SUCCESS) THEN + WRITE(*,*) "MPI_COMM_SIZE *FAILED* Process = ", mpi_rank + ENDIF + !////////////////////////////////////////////////////////// + ! initialize the HDF5 fortran interface + !////////////////////////////////////////////////////////// + + CALL h5open_f(hdferror) + + !////////////////////////////////////////////////////////// + ! test write/read dataset by hyperslabs with independent MPI I/O + !////////////////////////////////////////////////////////// + + IF (mpi_rank == 0) WRITE(*,*) 'Writing/reading dataset by hyperslabs (contiguous layout, independent MPI I/O)' + + do_collective = .FALSE. + do_chunk = .FALSE. + CALL hyper(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors) + + !////////////////////////////////////////////////////////// + ! test write/read dataset by hyperslabs with collective MPI I/O + !////////////////////////////////////////////////////////// + + IF (mpi_rank == 0) WRITE(*,*) 'Writing/reading dataset by hyperslabs (contiguous layout, collective MPI I/O)' + + do_collective = .TRUE. + do_chunk = .FALSE. + CALL hyper(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors) + + !////////////////////////////////////////////////////////// + ! test write/read dataset by hyperslabs with independent MPI I/O + !////////////////////////////////////////////////////////// + + IF (mpi_rank == 0) WRITE(*,*) 'Writing/reading dataset by hyperslabs (chunk layout, independent MPI I/O)' + + do_collective = .FALSE. + do_chunk = .TRUE. + CALL hyper(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors) + + !////////////////////////////////////////////////////////// + ! test write/read dataset by hyperslabs with collective MPI I/O + !////////////////////////////////////////////////////////// + + IF (mpi_rank == 0) WRITE(*,*) 'Writing/reading dataset by hyperslabs (chunk layout, collective MPI I/O)' + + do_collective = .TRUE. + do_chunk = .TRUE. + CALL hyper(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors) + + !////////////////////////////////////////////////////////// + ! test write/read several datasets (independent MPI I/O) + !////////////////////////////////////////////////////////// + + IF (mpi_rank == 0) WRITE(*,*) 'Writing/reading several datasets (contiguous layout, independent MPI I/O)' + + do_collective = .FALSE. + do_chunk = .FALSE. + CALL multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors) + + + !////////////////////////////////////////////////////////// + ! close HDF5 interface + !////////////////////////////////////////////////////////// + + CALL h5close_f(hdferror) + + !////////////////////////////////////////////////////////// + ! close MPI + !////////////////////////////////////////////////////////// + + IF (nerrors == 0) THEN + CALL mpi_finalize(mpierror) + IF (mpierror .NE. MPI_SUCCESS) THEN + WRITE(*,*) "MPI_FINALIZE *FAILED* Process = ", mpi_rank + ENDIF + ELSE + WRITE(*,*) 'Errors detected in process ', mpi_rank + CALL mpi_abort(MPI_COMM_WORLD, 1, mpierror) + IF (mpierror .NE. MPI_SUCCESS) THEN + WRITE(*,*) "MPI_ABORT *FAILED* Process = ", mpi_rank + ENDIF + ENDIF + + !////////////////////////////////////////////////////////// + ! end main program + !////////////////////////////////////////////////////////// -!////////////////////////////////////////////////////////// -! initialize MPI -!////////////////////////////////////////////////////////// - -call mpi_init(mpierror) -call mpi_comm_rank( MPI_COMM_WORLD, mpi_rank, mpierror ) - -!////////////////////////////////////////////////////////// -! initialize the HDF5 fortran interface -!////////////////////////////////////////////////////////// - -call h5open_f(hdferror) - -!////////////////////////////////////////////////////////// -! test write/read dataset by hyperslabs with independent MPI I/O -!////////////////////////////////////////////////////////// - -if (mpi_rank == 0) write(*,*) 'Writing/reading dataset by hyperslabs (contiguous layout, independent MPI I/O)' - -do_collective = .false. -do_chunk = .false. -call hyper(lenght,do_collective,do_chunk,nerrors) - -!////////////////////////////////////////////////////////// -! test write/read dataset by hyperslabs with collective MPI I/O -!////////////////////////////////////////////////////////// - -if (mpi_rank == 0) write(*,*) 'Writing/reading dataset by hyperslabs (contiguous layout, collective MPI I/O)' - -do_collective = .true. -do_chunk = .false. -call hyper(lenght,do_collective,do_chunk,nerrors) - -!////////////////////////////////////////////////////////// -! test write/read dataset by hyperslabs with independent MPI I/O -!////////////////////////////////////////////////////////// - -if (mpi_rank == 0) write(*,*) 'Writing/reading dataset by hyperslabs (chunk layout, independent MPI I/O)' - -do_collective = .false. -do_chunk = .true. -call hyper(lenght,do_collective,do_chunk,nerrors) - -!////////////////////////////////////////////////////////// -! test write/read dataset by hyperslabs with collective MPI I/O -!////////////////////////////////////////////////////////// - -if (mpi_rank == 0) write(*,*) 'Writing/reading dataset by hyperslabs (chunk layout, collective MPI I/O)' - -do_collective = .true. -do_chunk = .true. -call hyper(lenght,do_collective,do_chunk,nerrors) - -!////////////////////////////////////////////////////////// -! test write/read several datasets (independent MPI I/O) -!////////////////////////////////////////////////////////// - -if (mpi_rank == 0) write(*,*) 'Writing/reading several datasets (contiguous layout, independent MPI I/O)' - -do_collective = .false. -do_chunk = .false. -call multiple_dset_write(lenght,do_collective,do_chunk,nerrors) - - -!////////////////////////////////////////////////////////// -! close HDF5 interface -!////////////////////////////////////////////////////////// - -call h5close_f(hdferror) - -!////////////////////////////////////////////////////////// -! close MPI -!////////////////////////////////////////////////////////// - -if (nerrors == 0) then - call mpi_finalize(mpierror) -else - write(*,*) 'Errors detected in process ', mpi_rank - call mpi_abort(MPI_COMM_WORLD, 1, mpierror) -endif - -!////////////////////////////////////////////////////////// -! end main program -!////////////////////////////////////////////////////////// - -end program parallel_test +END PROGRAM parallel_test diff --git a/perform/Makefile.am b/perform/Makefile.am index f0f35e1..1a88172 100644 --- a/perform/Makefile.am +++ b/perform/Makefile.am @@ -62,6 +62,4 @@ iopipe_LDADD=$(LIBH5TEST) $(LIBHDF5) zip_perf_LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5) perf_meta_LDADD=$(LIBH5TEST) $(LIBHDF5) -check-perform: check - include $(top_srcdir)/config/conclude.am diff --git a/perform/Makefile.in b/perform/Makefile.in index 2e22dd1..71e901c 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -766,8 +766,6 @@ uninstall-am: uninstall-binPROGRAMS help: @$(top_srcdir)/bin/makehelp -check-perform: check - # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) diff --git a/perform/perf.c b/perform/perf.c index 33f7433..d0c49f6 100644 --- a/perform/perf.c +++ b/perform/perf.c @@ -77,8 +77,8 @@ int opt_iter = 1; int opt_stripe = -1; int opt_correct = 0; int amode = O_RDWR | O_CREAT; -char opt_file[256] = "/tmp/test.out\0"; -char opt_pvfstab[256] = "notset\0"; +char opt_file[256] = "perftest.out"; +char opt_pvfstab[256] = "notset"; int opt_pvfstab_set = 0; /* function prototypes */ @@ -372,6 +372,8 @@ die_jar_jar_die: free(tmp); if (opt_correct) free(tmp2); + /* Close down the HDF5 library before MPI_Finalize. */ + H5close(); MPI_Finalize(); return(0); } diff --git a/perform/sio_engine.c b/perform/sio_engine.c index 92d6f1c..c74d866 100644 --- a/perform/sio_engine.c +++ b/perform/sio_engine.c @@ -1,4 +1,5 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * * Copyright by the Board of Trustees of the University of Illinois. * * All rights reserved. * * * @@ -8,8 +9,8 @@ * 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. * + * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * + * access to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* diff --git a/perform/sio_perf.c b/perform/sio_perf.c index 52f1fda..dd58dcb 100644 --- a/perform/sio_perf.c +++ b/perform/sio_perf.c @@ -1,4 +1,5 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * * Copyright by the Board of Trustees of the University of Illinois. * * All rights reserved. * * * @@ -8,8 +9,8 @@ * 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. * + * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * + * access to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index ff8e0c3..1b2d2cf 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -43,10 +43,6 @@ New Features - Configuration suite now uses Autoconf 2.61, Automake 1.10.1, and Libtool 2.2.2 (MAM - 2008/05/05) - - There is a new build command, 'make check-perform', which will - run the tests in the perform directory. This is an optional step - afer 'make check' in the build process. (MAM - 2008/05/12) - - The new configure option "--disable-sharedlib-rpath" disables embedding the '-Wl,-rpath' information into executables when shared libraries are produced, and instead solely relies on the diff --git a/src/H5Eint.c b/src/H5Eint.c index 66fba91..34290a4 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -276,7 +276,9 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data) } /* end block */ #elif defined(H5_HAVE_THREADSAFE) #ifdef _WIN32 - fprintf(stream, "some thread: no way to know the thread number from pthread on windows"); + /* use GetCurrentThreadId because pthread_self return cannot be cast */ + /* as an unsigned long on Windows */ + fprintf(stream, "thread %lu", (unsigned long)GetCurrentThreadId()); #else fprintf(stream, "thread %lu", (unsigned long)pthread_self()); #endif @@ -396,7 +398,9 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data) } /* end block */ #elif defined(H5_HAVE_THREADSAFE) #ifdef _WIN32 - fprintf(stream, "some thread: no way to know the thread number from pthread on windows"); + /* use GetCurrentThreadId because pthread_self return cannot be cast */ + /* as an unsigned long on Windows */ + fprintf(stream, "thread %lu", (unsigned long)GetCurrentThreadId()); #else fprintf(stream, "thread %lu", (unsigned long)pthread_self()); #endif diff --git a/src/H5detect.c b/src/H5detect.c index 1f79869..11a4d47 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -1090,15 +1090,9 @@ bit.\n"; * The FQDM of this host or the empty string. */ #ifdef H5_HAVE_GETHOSTNAME -#ifdef _WIN32 -/* windows DLL cannot recognize gethostname, so turn off on windows for the time being! - KY, 2003-1-14 */ - host_name[0] = '\0'; -#else if (gethostname(host_name, sizeof(host_name)) < 0) { host_name[0] = '\0'; } -#endif #else host_name[0] = '\0'; #endif diff --git a/test/h5test.c b/test/h5test.c index 6445ce6..e364d32 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -668,7 +668,9 @@ h5_show_hostname(void) } #elif defined(H5_HAVE_THREADSAFE) #ifdef _WIN32 - printf("some thread: no way to know the thread number from pthread on windows."); + /* use GetCurrentThreadId because pthread_self return cannot be cast */ + /* as an int on Windows */ + fprintf("thread %d.", (int)GetCurrentThreadId()); #else printf("thread %d.", (int)pthread_self()); #endif diff --git a/tools/h52jpeg/h52jpeg.c b/tools/h52jpeg/h52jpeg.c new file mode 100644 index 0000000..35cf43c --- /dev/null +++ b/tools/h52jpeg/h52jpeg.c @@ -0,0 +1,132 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * 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://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +#include +#include "h5tools_utils.h" + + +const char *progname = "h52jpeg"; +static void usage(const char *prog); + +/* + * command-line options: The user can specify short or long-named parameters + */ +static const char *s_opts = "hVvi:t:"; +static struct long_options l_opts[] = { + { "help", no_arg, 'h' }, + { "version", no_arg, 'V' }, + { "verbose", no_arg, 'v' }, + { "image", require_arg, 'i' }, + { "type", require_arg, 't' }, + { NULL, 0, '\0' } +}; + + + + +/*------------------------------------------------------------------------- + * Function: main + * + * Purpose: h52jpeg main program + * + * Programmer: Pedro Vicente, pvn@hdfgroup.org + * + * Date: May 30, 2008 + * + *------------------------------------------------------------------------- + */ +int main(int argc, char **argv) +{ + int opt; + char *image_name = NULL; + char *image_type = NULL; + char *file_name = NULL; + char *template_name = NULL; + int verbose = 0; + + /* parse command line options */ + while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) + { + switch ((char)opt) + { + case 'h': + usage(progname); + exit(EXIT_SUCCESS); + case 'V': + print_version(progname); + exit(EXIT_SUCCESS); + case 'v': + verbose = 1; + break; + case 'i': + image_name = argv[ opt_ind ]; + break; + case 't': + image_type = argv[ opt_ind ]; + break; + + } /* switch */ + + + } /* while */ + + /* check for file names to be processed */ + if ( argv[ opt_ind ] != NULL && argv[ opt_ind + 1 ] != NULL ) + { + file_name = argv[ opt_ind ]; + template_name = argv[ opt_ind + 1 ]; + } + + else + { + usage(progname); + exit(EXIT_FAILURE); + } + + + return 0; +} + + + +/*------------------------------------------------------------------------- + * Function: usage + * + * Purpose: print usage + * + * Return: void + * + *------------------------------------------------------------------------- + */ +static void usage(const char *prog) +{ + printf("usage: %s [OPTIONS] file template\n", prog); + printf(" file HDF5 file name\n"); + printf(" template Name template for jpeg images\n"); + printf(" OPTIONS\n"); + printf(" -h, --help Print a usage message and exit\n"); + printf(" -v, --verbose Verbose mode, print object information\n"); + printf(" -V, --version Print version number and exit\n"); + printf(" -i, --image Image name (full path in HDF5 file)\n"); + printf(" -t T, --type=T Type of image (8bit or 24bit)\n"); + + printf("\n"); + + printf(" T - is a string, either <8bit> or <24bit>\n"); + + +} + + diff --git a/tools/h52jpeg/h52jpegtst.c b/tools/h52jpeg/h52jpegtst.c new file mode 100644 index 0000000..fd40910 --- /dev/null +++ b/tools/h52jpeg/h52jpegtst.c @@ -0,0 +1,4 @@ + + + + diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c index 2fd6fa6..e1a554e 100644 --- a/tools/h5diff/h5diffgentest.c +++ b/tools/h5diff/h5diffgentest.c @@ -40,6 +40,7 @@ #define FILE8 "h5diff_dset2.h5" #define FILE9 "h5diff_hyper1.h5" #define FILE10 "h5diff_hyper2.h5" +#define FILE11 "h5diff_empty.h5" #define UIMAX 4294967295u /*Maximum value for a variable of type unsigned int */ #define STR_SIZE 3 #define GBLL ((unsigned long_long) 1024 * 1024 *1024 ) @@ -71,7 +72,7 @@ const H5L_class_t UD_link_class[1] = {{ */ /* tests called in main() */ -static int test_basic(const char *fname1,const char *fname2); +static int test_basic(const char *fname1, const char *fname2, const char *fname3); static int test_types(const char *fname); static int test_datatypes(const char *fname); static int test_attributes(const char *fname,int make_diffs); @@ -96,7 +97,7 @@ static int write_dset(hid_t loc_id,int rank,hsize_t *dims,const char *name,hid_t int main(void) { - if ( test_basic (FILE1,FILE2) < 0 ) + if (test_basic(FILE1, FILE2, FILE11) < 0 ) goto out; test_types (FILE3); @@ -122,20 +123,30 @@ out: /*------------------------------------------------------------------------- * Function: test_basic * - * Purpose: basic tests + * Purpose: Create basic test files, first two contains different data, the + * third one is just an empty file. * *------------------------------------------------------------------------- */ static -int test_basic(const char *fname1, - const char *fname2) +int test_basic(const char *fname1, const char *fname2, const char *fname3) { hid_t fid1, fid2; hid_t gid1, gid2, gid3; hsize_t dims1[1] = { 6 }; hsize_t dims2[2] = { 3,2 }; + /* create the empty file */ + if ((fid1=H5Fcreate(fname3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0){ + fprintf(stderr, "empty file (%s) creation failed.\n", fname3); + goto out; + } + if (H5Fclose(fid1) < 0){ + fprintf(stderr, "empty file (%s) close failed.\n", fname3); + goto out; + } + /*------------------------------------------------------------------------- * create two files *------------------------------------------------------------------------- diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in index 2e411b0..77be575 100755 --- a/tools/h5repack/h5repack.sh.in +++ b/tools/h5repack/h5repack.sh.in @@ -137,6 +137,34 @@ TOOLTEST() rm -f $outfile } +TOOLTEST0() +{ + # Run test. + # Tflops interprets "$@" as "" when no parameter is given (e.g., the + # case of missing file name). Changed it to use $@ till Tflops fixes it. + TESTING $H5REPACK $@ + + infile=$srcdir/../testfiles/$1 + path=`pwd` + outfile=$path/out.$1 + shift + if [ "`uname -s`" = "TFLOPS O/S" ]; then + $RUNSERIAL $H5REPACK_BIN -i $infile -o $outfile $@ + else + $RUNSERIAL $H5REPACK_BIN -i $infile -o $outfile "$@" + fi + + RET=$? + if [ $RET != 0 ] ; then + echo "*FAILED*" + nerrors="`expr $nerrors + 1`" + else + echo " PASSED" + DIFFTEST $infile $outfile + fi + rm -f $outfile +} + # # The tests # We use the files generated by h5repacktst @@ -428,8 +456,7 @@ TOOLTEST $FILE4 -l dset_chunk:CHUNK=18x13 TOOLTEST $FILE1 -n -# long swtiches. use FILE4=h5repack_layout.h5 (no filters) - +# latest file format with long switches. use FILE4=h5repack_layout.h5 (no filters) arg="$FILE4 --layout CHUNK=20x10 --filter GZIP=1 --threshold=10 --native --latest --compact=8 --indexed=6 --ssize=8[:dtype]" if test $USE_FILTER_DEFLATE != "yes" ; then SKIP $arg @@ -437,6 +464,14 @@ else TOOLTEST $arg fi +# latest file format with short switches. use FILE4=h5repack_layout.h5 (no filters) +arg="$FILE4 -l CHUNK=20x10 -f GZIP=1 -m 10 -n -L -c 8 -d 6 -s 8[:dtype]" +if test $USE_FILTER_DEFLATE != "yes" ; then + SKIP $arg +else + TOOLTEST $arg +fi + # several global filters arg="$FILE4 --filter GZIP=1 --filter SHUF" @@ -446,6 +481,15 @@ else TOOLTEST $arg fi +# syntax of -i infile -o outfile +# latest file format with short switches. use FILE4=h5repack_layout.h5 (no filters) +arg="$FILE4 -l CHUNK=20x10 -f GZIP=1 -m 10 -n -L -c 8 -d 6 -s 8[:dtype]" +if test $USE_FILTER_DEFLATE != "yes" ; then + SKIP $arg +else + TOOLTEST0 $arg +fi + if test $nerrors -eq 0 ; then echo "All $H5REPACK tests passed." diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c index 17056c4..73b6361 100644 --- a/tools/h5repack/h5repack_main.c +++ b/tools/h5repack/h5repack_main.c @@ -30,12 +30,14 @@ static void read_info(const char *filename,pack_opt_t *options); /* module-scoped variables */ const char *progname = "h5repack"; int d_status = EXIT_SUCCESS; +static int has_i_o = 0; + /* * Command-line options: The user can specify short or long-named * parameters. */ -static const char *s_opts = "hVvf:l:m:e:nLc:i:s:"; +static const char *s_opts = "hVvf:l:m:e:nLc:d:s:"; static struct long_options l_opts[] = { { "help", no_arg, 'h' }, { "version", no_arg, 'V' }, @@ -47,7 +49,7 @@ static struct long_options l_opts[] = { { "native", no_arg, 'n' }, { "latest", no_arg, 'L' }, { "compact", require_arg, 'c' }, - { "indexed", require_arg, 'i' }, + { "indexed", require_arg, 'd' }, { "ssize", require_arg, 's' }, { NULL, 0, '\0' } }; @@ -80,7 +82,9 @@ static struct long_options l_opts[] = { * adopted the syntax h5repack [OPTIONS] file1 file2 * PVN, November 28, 2007 * added support for multiple global filters - *------------------------------------------------------------------------- + * PVN, May 16, 2008 + * added backward compatibility for -i infile -o outfile + *------------------------------------------------------------------------- */ int main(int argc, char **argv) { @@ -88,31 +92,196 @@ int main(int argc, char **argv) char *outfile = NULL; pack_opt_t options; /*the global options */ int ret; + int i; /* initialize options */ h5repack_init (&options,0); - parse_command_line(argc, argv, &options); - - if ( argv[ opt_ind ] != NULL && argv[ opt_ind + 1 ] != NULL ) + /* detect -i or -o for file names */ + for ( i = 1; i < argc; i++) { - infile = argv[ opt_ind ]; - outfile = argv[ opt_ind + 1 ]; + + if (strcmp(argv[i], "-i") == 0) + { + has_i_o = 1; + } + if (strcmp(argv[i], "-o") == 0) + { + has_i_o = 1; + } + } - if ( strcmp( infile, outfile ) == 0 ) + if (has_i_o) + { + + for ( i = 1; i < argc; i++) { - error_msg(progname, "file names cannot be the same\n"); - usage(progname); - exit(EXIT_FAILURE); + if (strcmp(argv[i], "-h") == 0) + { + usage(progname); + exit(0); + } + if (strcmp(argv[i], "-i") == 0) + { + infile = argv[++i]; + } + else if (strcmp(argv[i], "-o") == 0) + { + outfile = argv[++i]; + } + else if (strcmp(argv[i], "-v") == 0) + { + options.verbose = 1; + } + else if (strcmp(argv[i], "-f") == 0) + { + + /* add the -f filter option */ + if (h5repack_addfilter(argv[i+1],&options)<0) + { + error_msg(progname, "in parsing filter\n"); + exit(1); + } + + /* jump to next */ + ++i; + } + else if (strcmp(argv[i], "-l") == 0) + { + + /* parse the -l layout option */ + if (h5repack_addlayout(argv[i+1],&options)<0) + { + error_msg(progname, "in parsing layout\n"); + exit(1); + } + + /* jump to next */ + ++i; + } + else if (strcmp(argv[i], "-m") == 0) + { + options.threshold = parse_number(argv[i+1]); + if ((int)options.threshold==-1) + { + error_msg(progname, "invalid treshold size <%s>\n",argv[i+1]); + exit(1); + } + ++i; + } + + else if (strcmp(argv[i], "-e") == 0) + { + read_info(argv[++i],&options); + } + else if (strcmp(argv[i], "-n") == 0) + { + options.use_native = 1; + } + + else if (strcmp(argv[i], "-L") == 0) + { + options.latest = 1; + } + else if (strcmp(argv[i], "-c") == 0) + { + options.grp_compact = atoi( argv[++i] ); + if (options.grp_compact>0) + options.latest = 1; /* must use latest format */ + } + else if (strcmp(argv[i], "-d") == 0) + { + options.grp_indexed = atoi( argv[++i] ); + if (options.grp_indexed>0) + options.latest = 1; /* must use latest format */ + } + else if (strcmp(argv[i], "-s") == 0) + { + + char *s = argv[++i]; + int idx = 0; + int ssize = 0; + char *msgPtr = strchr( s, ':'); + options.latest = 1; /* must use latest format */ + if (msgPtr == NULL) + { + ssize = atoi( s ); + for (idx=0; idx<5; idx++) + options.msg_size[idx] = ssize; + } + else + { + char msgType[10]; + strcpy(msgType, msgPtr+1); + msgPtr[0] = '\0'; + ssize = atoi( s ); + if (strncmp(msgType, "dspace",6) == 0) { + options.msg_size[0] = ssize; + } + else if (strncmp(msgType, "dtype",5) == 0) { + options.msg_size[1] = ssize; + } + else if (strncmp(msgType, "fill",4) == 0) { + options.msg_size[2] = ssize; + } + else if (strncmp(msgType, "pline",5) == 0) { + options.msg_size[3] = ssize; + } + else if (strncmp(msgType, "attr",4) == 0) { + options.msg_size[4] = ssize; + } + } + + } + + + + else if (argv[i][0] == '-') { + error_msg(progname, " - is not a valid argument\n"); + usage(progname); + exit(1); + } + } + + if (infile == NULL || outfile == NULL) + { + error_msg(progname, "file names missing\n"); + usage(progname); + exit(1); } + } else + { - error_msg(progname, "file names missing\n"); - usage(progname); - exit(EXIT_FAILURE); + + parse_command_line(argc, argv, &options); + + + + if ( argv[ opt_ind ] != NULL && argv[ opt_ind + 1 ] != NULL ) + { + infile = argv[ opt_ind ]; + outfile = argv[ opt_ind + 1 ]; + + if ( strcmp( infile, outfile ) == 0 ) + { + error_msg(progname, "file names cannot be the same\n"); + usage(progname); + exit(EXIT_FAILURE); + + } + } + + else + { + error_msg(progname, "file names missing\n"); + usage(progname); + exit(EXIT_FAILURE); + } + } @@ -151,7 +320,7 @@ static void usage(const char *prog) printf(" -n, --native Use a native HDF5 type when repacking\n"); printf(" -L, --latest Use latest version of file format\n"); printf(" -c L1, --compact=L1 Maximum number of links in header messages\n"); - printf(" -i L2, --indexed=L2 Minimum number of links in the indexed format\n"); + printf(" -d L2, --indexed=L2 Minimum number of links in the indexed format\n"); printf(" -s S[:F], --ssize=S[:F] Shared object header message minimum size\n"); printf(" -m T, --threshold=T Do not apply the filter to datasets smaller than T\n"); printf(" -e M, --file=M Name of file M with the -f and -l options\n"); @@ -162,6 +331,7 @@ static void usage(const char *prog) printf(" T - is an integer greater than 1, size of dataset in bytes \n"); printf(" M - is a filename.\n"); + printf(" S - is an integer\n"); printf(" F - is the shared object header message type, any of . If F is not specified, S applies to all messages\n"); @@ -313,7 +483,7 @@ static void parse_command_line(int argc, const char* argv[], pack_opt_t* options break; - case 'i': + case 'd': options->grp_indexed = atoi( opt_arg ); if (options->grp_indexed>0) diff --git a/tools/testfiles/h5diff_empty.h5 b/tools/testfiles/h5diff_empty.h5 new file mode 100644 index 0000000..3f0d1df Binary files /dev/null and b/tools/testfiles/h5diff_empty.h5 differ diff --git a/windows/c++/examples/chunkstest/chunkstest.vcproj b/windows/c++/examples/chunkstest/chunkstest.vcproj index 1ea58cd..3e80865 100644 --- a/windows/c++/examples/chunkstest/chunkstest.vcproj +++ b/windows/c++/examples/chunkstest/chunkstest.vcproj @@ -79,7 +79,7 @@ LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release;..\..\..\..\proj\hdf5\release;..\..\..\..\hdf5lib\release\lib" - IgnoreDefaultLibraryNames="libcpp.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../../c++/examples/chunkstest/Release/chunkstest.pdb" SubSystem="1" TargetMachine="1" @@ -110,7 +110,7 @@ /> - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/compoundtest/compoundtest.vfproj b/windows/fortran/examples/compoundtest/compoundtest.vfproj index be0bf80..76b85bb 100644 --- a/windows/fortran/examples/compoundtest/compoundtest.vfproj +++ b/windows/fortran/examples/compoundtest/compoundtest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/dsetexampletest/dsetexampletest.vfproj b/windows/fortran/examples/dsetexampletest/dsetexampletest.vfproj index 1c0f48b..0836929 100644 --- a/windows/fortran/examples/dsetexampletest/dsetexampletest.vfproj +++ b/windows/fortran/examples/dsetexampletest/dsetexampletest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/fileexampletest/fileexampletest.vfproj b/windows/fortran/examples/fileexampletest/fileexampletest.vfproj index 6427bfb..b17edf9 100644 --- a/windows/fortran/examples/fileexampletest/fileexampletest.vfproj +++ b/windows/fortran/examples/fileexampletest/fileexampletest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/groupexampletest/groupexampletest.vfproj b/windows/fortran/examples/groupexampletest/groupexampletest.vfproj index 000a6ed..b44fa7d 100644 --- a/windows/fortran/examples/groupexampletest/groupexampletest.vfproj +++ b/windows/fortran/examples/groupexampletest/groupexampletest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/grpdsetexampletest/grpdsetexampletest.vfproj b/windows/fortran/examples/grpdsetexampletest/grpdsetexampletest.vfproj index c897e60..5a91ca0 100644 --- a/windows/fortran/examples/grpdsetexampletest/grpdsetexampletest.vfproj +++ b/windows/fortran/examples/grpdsetexampletest/grpdsetexampletest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/grpittest/grpittest.vfproj b/windows/fortran/examples/grpittest/grpittest.vfproj index 4df93ef..0ffe0c6 100644 --- a/windows/fortran/examples/grpittest/grpittest.vfproj +++ b/windows/fortran/examples/grpittest/grpittest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/grpsexampletest/grpsexampletest.vfproj b/windows/fortran/examples/grpsexampletest/grpsexampletest.vfproj index 6548a7a..517201a 100644 --- a/windows/fortran/examples/grpsexampletest/grpsexampletest.vfproj +++ b/windows/fortran/examples/grpsexampletest/grpsexampletest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/hyperslabtest/hyperslabtest.vfproj b/windows/fortran/examples/hyperslabtest/hyperslabtest.vfproj index 378e178..cb33779 100644 --- a/windows/fortran/examples/hyperslabtest/hyperslabtest.vfproj +++ b/windows/fortran/examples/hyperslabtest/hyperslabtest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/mountexampletest/mountexampletest.vfproj b/windows/fortran/examples/mountexampletest/mountexampletest.vfproj index ce6a9a0..f3b8133 100644 --- a/windows/fortran/examples/mountexampletest/mountexampletest.vfproj +++ b/windows/fortran/examples/mountexampletest/mountexampletest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/refobjexampletest/refobjexampletest.vfproj b/windows/fortran/examples/refobjexampletest/refobjexampletest.vfproj index 1d1ab1e..02cc63f 100644 --- a/windows/fortran/examples/refobjexampletest/refobjexampletest.vfproj +++ b/windows/fortran/examples/refobjexampletest/refobjexampletest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/refregexampletest/refregexampletest.vfproj b/windows/fortran/examples/refregexampletest/refregexampletest.vfproj index 17b7969..9251a9c 100644 --- a/windows/fortran/examples/refregexampletest/refregexampletest.vfproj +++ b/windows/fortran/examples/refregexampletest/refregexampletest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/rwdsetexampletest/rwdsetexampletest.vfproj b/windows/fortran/examples/rwdsetexampletest/rwdsetexampletest.vfproj index 40d2f8c..436f40d 100644 --- a/windows/fortran/examples/rwdsetexampletest/rwdsetexampletest.vfproj +++ b/windows/fortran/examples/rwdsetexampletest/rwdsetexampletest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/examples/selecteletest/selecteletest.vfproj b/windows/fortran/examples/selecteletest/selecteletest.vfproj index 40c690a..d1001e0 100644 --- a/windows/fortran/examples/selecteletest/selecteletest.vfproj +++ b/windows/fortran/examples/selecteletest/selecteletest.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/src/H5f90i_gen.h b/windows/fortran/src/H5f90i_gen.h deleted file mode 100755 index 761ae4e..0000000 --- a/windows/fortran/src/H5f90i_gen.h +++ /dev/null @@ -1,40 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * 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://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - - -#ifndef _H5f90i_gen_H -#define _H5f90i_gen_H - -/* This file is automatically generated by H5match_types.c at build time. */ - -#include "H5public.h" - -#define c_int_1 char -#define c_int_2 short -#define c_int_4 long -#define c_int_8 long_long -#define c_float_4 float -#define c_double_8 long double - -typedef c_int_8 haddr_t_f; -typedef c_int_8 hsize_t_f; -typedef c_int_8 hssize_t_f; -typedef c_int_4 size_t_f; -typedef c_int_4 int_f; -typedef c_int_4 hid_t_f; -typedef c_float_4 real_f; -typedef c_double_8 double_f; - -#endif /* _H5f90i_gen_H */ diff --git a/windows/fortran/src/H5fortran_types.f90 b/windows/fortran/src/H5fortran_types.f90 deleted file mode 100755 index 08352df..0000000 --- a/windows/fortran/src/H5fortran_types.f90 +++ /dev/null @@ -1,34 +0,0 @@ -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -! Copyright by The HDF Group. * -! 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://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * -! access to either file, you may request a copy from help@hdfgroup.org. * -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -! -! -! This file is automatically generated and contains HDF5 Fortran90 type definitions. -! - MODULE H5FORTRAN_TYPES - ! - ! HDF5 integers - ! - INTEGER, PARAMETER :: HADDR_T = 8 - INTEGER, PARAMETER :: HSIZE_T = 8 - INTEGER, PARAMETER :: HSSIZE_T = 8 - INTEGER, PARAMETER :: SIZE_T = 4 - INTEGER, PARAMETER :: Fortran_INTEGER = 4 - INTEGER, PARAMETER :: HID_T = 4 - INTEGER, PARAMETER :: Fortran_REAL = 4 - INTEGER, PARAMETER :: Fortran_DOUBLE = 8 - - INTEGER(SIZE_T), PARAMETER :: OBJECT_NAMELEN_DEFAULT_F = -1 - - END MODULE H5FORTRAN_TYPES diff --git a/windows/fortran/test/flush1_fortran/flush1_fortran.vfproj b/windows/fortran/test/flush1_fortran/flush1_fortran.vfproj index d869aa5..0505d4c 100644 --- a/windows/fortran/test/flush1_fortran/flush1_fortran.vfproj +++ b/windows/fortran/test/flush1_fortran/flush1_fortran.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/test/flush1_fortrandll/flush1_fortrandll.vfproj b/windows/fortran/test/flush1_fortrandll/flush1_fortrandll.vfproj index aa8d458..188fe9a 100644 --- a/windows/fortran/test/flush1_fortrandll/flush1_fortrandll.vfproj +++ b/windows/fortran/test/flush1_fortrandll/flush1_fortrandll.vfproj @@ -7,39 +7,39 @@ - + - - + + - + - - - + + + - + - - + + - + - - - + + + diff --git a/windows/fortran/test/flush2_fortran/flush2_fortran.vfproj b/windows/fortran/test/flush2_fortran/flush2_fortran.vfproj index 97c4e1e..9f0daff 100644 --- a/windows/fortran/test/flush2_fortran/flush2_fortran.vfproj +++ b/windows/fortran/test/flush2_fortran/flush2_fortran.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/test/flush2_fortrandll/flush2_fortrandll.vfproj b/windows/fortran/test/flush2_fortrandll/flush2_fortrandll.vfproj index 9e49132..da8211d 100644 --- a/windows/fortran/test/flush2_fortrandll/flush2_fortrandll.vfproj +++ b/windows/fortran/test/flush2_fortrandll/flush2_fortrandll.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - + + - + - - - + + + - + - - + + diff --git a/windows/fortran/test/libtest_cstubdll/libtest_cstubdll.vcproj b/windows/fortran/test/libtest_cstubdll/libtest_cstubdll.vcproj index 3fd617d..4faafe4 100644 --- a/windows/fortran/test/libtest_cstubdll/libtest_cstubdll.vcproj +++ b/windows/fortran/test/libtest_cstubdll/libtest_cstubdll.vcproj @@ -250,7 +250,7 @@ ProgramDataBaseFileName=".\../../../../fortran/test/libtest_cstubdll/Debug/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0" /> + - - - + + + - - - + + - + - - + + - + - - + + diff --git a/windows/fortran/test/testhdf5_fortran/testhdf5_fortran.vfproj b/windows/fortran/test/testhdf5_fortran/testhdf5_fortran.vfproj index 178cc19..dc23098 100644 --- a/windows/fortran/test/testhdf5_fortran/testhdf5_fortran.vfproj +++ b/windows/fortran/test/testhdf5_fortran/testhdf5_fortran.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + diff --git a/windows/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.vfproj b/windows/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.vfproj index 9daf267..b432134 100644 --- a/windows/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.vfproj +++ b/windows/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.vfproj @@ -7,39 +7,39 @@ - + - - + + - + - - - + + + - + - - + + - + - - - + + + diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT index 557f9bf..683b400 100755 --- a/windows/hdf5bt.BAT +++ b/windows/hdf5bt.BAT @@ -16,6 +16,8 @@ rem access to either file, you may request a copy from help@hdfgroup.org. rem File Name: hdf5bt.bat rem This batch file is used to build and test HDF5 Libraries and Tools. rem This batch file takes the following options: +rem . /vs7 Build HDF5 using Visual Studio .NET 2003 +rem . Note: Default is Visual Studio 2005 rem . /fort Build and test HDF5 with Fortran libraries rem . /useenv Build HDF5 using compiler settings defined rem . in the environment, rather than the IDE. @@ -25,7 +27,7 @@ rem . HDF5CHECK_LOG rem . /? Help information rem By Xuan Bai rem Created: Aug. 16, 2004 -rem Last Updated: Scott Wegner, 10/1/07 +rem Last Updated: Scott Wegner, 5/27/08 rem This batch file makes the following assumptions: rem - The appropriate version of Visual Studio is installed and setup @@ -57,6 +59,8 @@ rem Print a help message echo. echo Usage: %~nx0 [OPTION] echo. + echo. /vs7 Build HDF5 using Visual Studio .NET 2003 + echo. Note: Default is Visual Studio 2005 echo. /fort Build and test HDF5 with Fortran libraries echo. /useenv Build HDF5 using compiler settings defined echo. in the environment, rather than the IDE. @@ -69,7 +73,11 @@ rem Parse through the parameters sent to file, and set appropriate variables :parse_params for %%a in (%*) do ( - if "%%a"=="/fort" ( + if "%%a"=="/vs7" ( + rem Use Visual Studio .NET to build + set hdf5_vnet=true + + ) else if "%%a"=="/fort" ( rem Enable Fortran set hdf5_enablefortran=true @@ -105,6 +113,10 @@ rem Setup our environment set hdf5build_params= set hdf5check_params=enablecpp + if defined hdf5_vnet ( + set hdf5build_params=%hdf5build_params% /vs7 + ) + if defined hdf5_enablefortran ( set hdf5build_params=%hdf5build_params% /fort set hdf5check_params=enableall diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT index c620e80..9efddd6 100755 --- a/windows/hdf5build.BAT +++ b/windows/hdf5build.BAT @@ -16,6 +16,8 @@ rem access to either file, you may request a copy from helphdfgroup.org. rem File Name: hdf5build.bat rem This batch file is used to build HDF5 Libraries and Tools. rem This batch file takes the following options: +rem . /vs7 Build HDF5 using Visual Studio .NET 2003 +rem . Note: Default is Visual Studio 2005 rem . /fort Build HDF5 with Fortran libraries rem . /useenv Build HDF5 using compiler settings defined rem . in the environment, rather than the IDE. @@ -52,6 +54,8 @@ rem Print a help message echo. echo.Usage: %~nx0 [OPTION] echo. + echo. /vs7 Build HDF5 using Visual Studio .NET 2003 + echo. Note: Default is Visual Studio 2005 echo. /fort Build HDF5 with Fortran libraries echo. /useenv Build HDF5 using compiler settings defined echo. in the environment, rather than the IDE. @@ -64,7 +68,10 @@ rem Parse through the parameters sent to file, and set appropriate variables :parse_params for %%a in (%*) do ( - if "%%a"=="/fort" ( + if "%%a"=="/vs7" ( + rem Use Visual Studio .NET 2003 + set hdf5_vnet=true + ) else if "%%a"=="/fort" ( rem Enable Fortran set hdf5_enablefortran=true @@ -95,12 +102,30 @@ rem Setup our environment echo.Setting up environment - rem By default, use all.sln, unless hdf5_enablefortran is set - if defined hdf5_enablefortran ( - echo.Building Fortran projects enabled - set hdf5_sln="%CD%\windows\proj\all_fortran\all_fortran.sln" + rem Sanity check-- make sure VS.NET isn't specified with Fortran or x64 + if defined hdf5_vnet ( + if defined hdf5_enablefortran ( + echo.Error: Building Fortran libraries with Visual Studio .NET is unsupported + exit /b 1 + ) + if "%PROCESSOR_ARCHITECTURE%"=="AMD64" ( + echo.Error: Building HDF5 on x64 with Visual Studio .NET is unsupported + exit /b 1 + ) + ) + + rem Figure out which solution file to use based on configuration + if defined hdf5_vnet ( + echo.Using Visual Studio .NET 2003 + set hdf5_sln="%CD%\windows_vnet\proj\all\all.sln" ) else ( - set hdf5_sln="%CD%\windows\proj\all\all.sln" + echo.Using Visual Studio 2005 + if defined hdf5_enablefortran ( + echo.Building Fortran projects enabled + set hdf5_sln="%CD%\windows\proj\all_fortran\all_fortran.sln" + ) else ( + set hdf5_sln="%CD%\windows\proj\all\all.sln" + ) ) @@ -120,40 +145,49 @@ rem Setup our environment set ccflags= - rem Currently VS2005 is the only compiler supported. --SJW 9/26/07 - echo.Using Visual Studio 2005 - - if not defined hdf5_enablefortran ( - if defined vs80comntools ( - rem This sets the Visual Studio path and environment variables - if %hdf5_platform%==Win32 ( - call "%vs80comntools%\..\..\VC\vcvarsall.bat" x86 - ) else ( - call "%vs80comntools%\..\..\VC\vcvarsall.bat" x86_amd64 - ) - + if defined hdf5_vnet ( + if defined vs71comntools ( + rem This sets the Visual Studio .NET path and environment variables + call "%vs71comntools%\vsvars32.bat" ) else ( - echo.Error: Cannot setup Visual Studio 2005 environment. Please - echo.make sure VS80COMNTOOLS is defined in the environment. + echo.Error: Cannot setup Visual Studio .NET 2003 environment. Please + echo.make sure VS71COMNTOOLS is defined in the environment. exit /b 1 ) - ) else ( - echo.with Intel Visual Fortran 9.1 - - if defined ifort_compiler91 ( - rem This sets the Intel Fortran 9.1 environment, as well as - rem setting the appropriate Visual Studio environment - - if %hdf5_platform%==Win32 ( - call "%ifort_compiler91%\IA32\Bin\ifortvars.bat" + rem Assume Visual Studio 2005 + if not defined hdf5_enablefortran ( + if defined vs80comntools ( + rem This sets the Visual Studio 2005 path and environment variables + if %hdf5_platform%==Win32 ( + call "%vs80comntools%\..\..\VC\vcvarsall.bat" x86 + ) else ( + call "%vs80comntools%\..\..\VC\vcvarsall.bat" x86_amd64 + ) + ) else ( - call "%ifort_compiler91%\em64t\Bin\ifortvars.bat" + echo.Error: Cannot setup Visual Studio 2005 environment. Please + echo.make sure VS80COMNTOOLS is defined in the environment. + exit /b 1 ) + ) else ( - echo.Error: Cannot setup Intel Fortran 9.1 environment. Please - echo.make sure IFORT_COMPILER91 is defined in the environment. - exit /b 1 + echo.with Intel Visual Fortran 9.1 + + if defined ifort_compiler91 ( + rem This sets the Intel Fortran 9.1 environment, as well as + rem setting the appropriate Visual Studio environment + + if %hdf5_platform%==Win32 ( + call "%ifort_compiler91%\IA32\Bin\ifortvars.bat" + ) else ( + call "%ifort_compiler91%\em64t\Bin\ifortvars.bat" + ) + ) else ( + echo.Error: Cannot setup Intel Fortran 9.1 environment. Please + echo.make sure IFORT_COMPILER91 is defined in the environment. + exit /b 1 + ) ) ) @@ -180,7 +214,13 @@ rem Build the HDF5 libraries. By default, C and C++ libraries are built. rem Build both debug and release versions for %%a in (debug release) DO ( echo.Building %hdf5_platform% %%a libraries... - devenv %hdf5_sln% %ccflags% /rebuild "%%a|%hdf5_platform%" + rem Only add hdf5_platform if using Visual Studio 2005, because Visual Studio + rem .NET doesn't like the syntax + if defined hdf5_vnet ( + devenv %hdf5_sln% %ccflags% /rebuild %%a + ) else ( + devenv %hdf5_sln% %ccflags% /rebuild "%%a|%hdf5_platform%" + ) if !errorlevel! neq 0 exit /b ) diff --git a/windows/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj b/windows/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj index 5417f67..86981ed 100644 --- a/windows/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj +++ b/windows/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj @@ -58,7 +58,7 @@ ProgramDataBaseFileName=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0" /> - + - - - + + + - + - - + + - + - - - + + + - + - - + + diff --git a/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj b/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj index a8afebb..f5f38d8 100644 --- a/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj +++ b/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - + + - + - - - + + + - + - - + + diff --git a/windows/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.vfproj b/windows/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.vfproj index f52ed9d..c615f0c 100644 --- a/windows/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.vfproj +++ b/windows/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.vfproj @@ -7,39 +7,39 @@ - + - - + + - + - - - + + + - + - - + + - + - - - + + + diff --git a/windows/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.vfproj b/windows/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.vfproj index 9c83392..adeb772 100644 --- a/windows/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.vfproj +++ b/windows/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.vfproj @@ -7,39 +7,39 @@ - + - - - + + + - + - - + + - + - - - + + + - + - - + + diff --git a/windows/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.vfproj b/windows/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.vfproj index 60dc1cc..f53f14a 100644 --- a/windows/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.vfproj +++ b/windows/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.vfproj @@ -7,39 +7,39 @@ - + - - + + - + - - - + + + - + - - + + - + - - - + + + diff --git a/windows/hl/test/hl_test_ds/hl_test_ds.vcproj b/windows/hl/test/hl_test_ds/hl_test_ds.vcproj index 542ce4c..c9221a4 100644 --- a/windows/hl/test/hl_test_ds/hl_test_ds.vcproj +++ b/windows/hl/test/hl_test_ds/hl_test_ds.vcproj @@ -58,7 +58,7 @@ ProgramDataBaseFileName=".\../../../../hl/test/hl_test_ds/Debug/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0" /> - + + - - - - + + + + - - - - + + + - + - - - + + + - + - - + + diff --git a/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj b/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj index 5dbe52f..72f97f5 100644 --- a/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj +++ b/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj @@ -4,42 +4,42 @@ - + + - - - - + + + + - - - - + + + - + - - - + + + - + - - + + diff --git a/windows/misc/typegen/h5match_types/h5match_types.vcproj b/windows/misc/typegen/h5match_types/h5match_types.vcproj index fe38e9e..0b751ca 100644 --- a/windows/misc/typegen/h5match_types/h5match_types.vcproj +++ b/windows/misc/typegen/h5match_types/h5match_types.vcproj @@ -19,7 +19,7 @@ diff --git a/windows/misc/typegen/h5tinit/h5tinit.vcproj b/windows/misc/typegen/h5tinit/h5tinit.vcproj index 6921de5..0075e16 100644 --- a/windows/misc/typegen/h5tinit/h5tinit.vcproj +++ b/windows/misc/typegen/h5tinit/h5tinit.vcproj @@ -19,7 +19,7 @@ diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj index 3d27547..9f2c9ca 100644 --- a/windows/proj/hdf5/hdf5.vcproj +++ b/windows/proj/hdf5/hdf5.vcproj @@ -54,7 +54,7 @@ BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="1" + DebugInformationFormat="3" /> shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if ((H5T_NATIVE_SCHAR_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_SCHAR_ALIGN_g = 1; - H5T_NATIVE_SCHAR_COMP_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if ((H5T_NATIVE_UCHAR_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_UCHAR_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if ((H5T_NATIVE_SHORT_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_SHORT_ALIGN_g = 1; - H5T_NATIVE_SHORT_COMP_ALIGN_g = 2; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if ((H5T_NATIVE_USHORT_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_USHORT_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if ((H5T_NATIVE_INT_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_INT_ALIGN_g = 1; - H5T_NATIVE_INT_COMP_ALIGN_g = 4; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if ((H5T_NATIVE_UINT_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_UINT_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if ((H5T_NATIVE_LONG_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_LONG_ALIGN_g = 1; - H5T_NATIVE_LONG_COMP_ALIGN_g = 4; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if ((H5T_NATIVE_ULONG_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_ULONG_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if ((H5T_NATIVE_INT8_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_INT8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if ((H5T_NATIVE_UINT8_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_UINT8_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if ((H5T_NATIVE_INT16_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_INT16_ALIGN_g = 1; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if ((H5T_NATIVE_UINT16_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_UINT16_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if ((H5T_NATIVE_INT32_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_INT32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if ((H5T_NATIVE_UINT32_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_UINT32_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if ((H5T_NATIVE_INT64_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_INT64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if ((H5T_NATIVE_UINT64_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_UINT64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if ((H5T_NATIVE_LLONG_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_LLONG_ALIGN_g = 1; - H5T_NATIVE_LLONG_COMP_ALIGN_g = 8; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if ((H5T_NATIVE_ULLONG_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_ULLONG_ALIGN_g = 1; - - /* - * 3 2 1 0 - * SEEEEEEE EMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 31; - dt->shared->u.atomic.u.f.epos = 23; - dt->shared->u.atomic.u.f.esize = 8; - dt->shared->u.atomic.u.f.ebias = 0x0000007f; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 23; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if ((H5T_NATIVE_FLOAT_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_FLOAT_ALIGN_g = 1; - H5T_NATIVE_FLOAT_COMP_ALIGN_g = 4; - - /* - * 7 6 5 4 - * SEEEEEEE EEEEMMMM MMMMMMMM MMMMMMMM - * 3 2 1 0 - * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 63; - dt->shared->u.atomic.u.f.epos = 52; - dt->shared->u.atomic.u.f.esize = 11; - dt->shared->u.atomic.u.f.ebias = 0x000003ff; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 52; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if ((H5T_NATIVE_DOUBLE_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_DOUBLE_ALIGN_g = 1; - H5T_NATIVE_DOUBLE_COMP_ALIGN_g = 8; - - /* - * 7 6 5 4 - * SEEEEEEE EEEEMMMM MMMMMMMM MMMMMMMM - * 3 2 1 0 - * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T_alloc())) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 63; - dt->shared->u.atomic.u.f.epos = 52; - dt->shared->u.atomic.u.f.esize = 11; - dt->shared->u.atomic.u.f.ebias = 0x000003ff; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 52; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if ((H5T_NATIVE_LDOUBLE_g = H5I_register (H5I_DATATYPE, dt))<0) - HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure"); - H5T_NATIVE_LDOUBLE_ALIGN_g = 1; - H5T_NATIVE_LDOUBLE_COMP_ALIGN_g = 8; - - /* Set the native order for this machine */ - H5T_native_order_g = H5T_ORDER_LE; - - /* Structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */ - H5T_POINTER_COMP_ALIGN_g = 4; - H5T_HVL_COMP_ALIGN_g = 4; - H5T_HOBJREF_COMP_ALIGN_g = 8; - H5T_HDSETREGREF_COMP_ALIGN_g = 1; - -done: - if(ret_value<0) { - if(dt != NULL) { - if(dt->shared != NULL) - H5FL_FREE(H5T_shared_t, dt->shared); - H5FL_FREE(H5T_t, dt); - } /* end if */ - } - - FUNC_LEAVE_NOAPI(ret_value); -} diff --git a/windows/test/big/big.vcproj b/windows/test/big/big.vcproj index 033c226..ac6e79f 100644 --- a/windows/test/big/big.vcproj +++ b/windows/test/big/big.vcproj @@ -79,7 +79,7 @@ OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="0" SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/big/Release/big.pdb" SubSystem="1" TargetMachine="1" @@ -172,7 +172,7 @@ OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="0" SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/big/Release/big.pdb" SubSystem="1" TargetMachine="17" @@ -243,7 +243,7 @@ BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0" /> %expect_eol% + fc /w %expect_eol% %actual% > nul + if !errorlevel! equ 0 ( + call :testing PASSED %params% + ) else ( + call :testing *FAILED* %params% + echo. Expected results ^(*.ddl^) differs from actual results ^(*.out^) + set /a nerrors=!nerrors!+1 + if "yes"=="%verbose%" fc /w %expect% %actual% + ) ) ) rem Clean up output file - if not defined HDF5_NOCLEANUP del /f %actual% %actual_err% + if not defined HDF5_NOCLEANUP del /f %expect_eol% %actual% %actual_err% exit /b diff --git a/windows/tools/h5dumpdll/h5dumpdll.vcproj b/windows/tools/h5dumpdll/h5dumpdll.vcproj index 4fe63e9..4e31dca 100644 --- a/windows/tools/h5dumpdll/h5dumpdll.vcproj +++ b/windows/tools/h5dumpdll/h5dumpdll.vcproj @@ -239,7 +239,7 @@ ProgramDataBaseFileName=".\../../../tools/h5dumpdll/Debug/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0" /> + DebugInformationFormat="3"/> @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/chunkstest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -106,7 +106,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug,..\..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../c++/examples/chunkstest/Debug/chunkstest.pdb" SubSystem="1" diff --git a/windows_vnet/c++/examples/chunkstestdll/chunkstestdll.vcproj b/windows_vnet/c++/examples/chunkstestdll/chunkstestdll.vcproj index 8b651ce..0e1c08b 100644 --- a/windows_vnet/c++/examples/chunkstestdll/chunkstestdll.vcproj +++ b/windows_vnet/c++/examples/chunkstestdll/chunkstestdll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/chunkstestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/c++/examples/compoundtest/compoundtest.vcproj b/windows_vnet/c++/examples/compoundtest/compoundtest.vcproj index 5f46551..bc3eb76 100644 --- a/windows_vnet/c++/examples/compoundtest/compoundtest.vcproj +++ b/windows_vnet/c++/examples/compoundtest/compoundtest.vcproj @@ -44,7 +44,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release,..\..\..\..\hdf5lib\release\lib" - IgnoreDefaultLibraryNames="libcpp.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../../c++/examples/compoundtest/Release/compoundtest.pdb" SubSystem="1" TargetMachine="1"/> @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/compoundtest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -106,7 +106,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug,..\..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../c++/examples/compoundtest/Debug/compoundtest.pdb" SubSystem="1" diff --git a/windows_vnet/c++/examples/compoundtestdll/compoundtestdll.vcproj b/windows_vnet/c++/examples/compoundtestdll/compoundtestdll.vcproj index 2649c74..6ea3cb1 100644 --- a/windows_vnet/c++/examples/compoundtestdll/compoundtestdll.vcproj +++ b/windows_vnet/c++/examples/compoundtestdll/compoundtestdll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/compoundtestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/c++/examples/createtest/createtest.vcproj b/windows_vnet/c++/examples/createtest/createtest.vcproj index 8832d78..948a086 100644 --- a/windows_vnet/c++/examples/createtest/createtest.vcproj +++ b/windows_vnet/c++/examples/createtest/createtest.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/createtest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -43,7 +43,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug,..\..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../c++/examples/createtest/Debug/createtest.pdb" SubSystem="1" @@ -107,7 +107,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release,..\..\..\..\hdf5lib\release\lib" - IgnoreDefaultLibraryNames="libcpp.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../../c++/examples/createtest/Release/createtest.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/c++/examples/createtestdll/createtestdll.vcproj b/windows_vnet/c++/examples/createtestdll/createtestdll.vcproj index ea5af0f..de9362d 100644 --- a/windows_vnet/c++/examples/createtestdll/createtestdll.vcproj +++ b/windows_vnet/c++/examples/createtestdll/createtestdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/createtestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/c++/examples/extend_dstest/extend_dstest.vcproj b/windows_vnet/c++/examples/extend_dstest/extend_dstest.vcproj index ecf1879..226c15c 100644 --- a/windows_vnet/c++/examples/extend_dstest/extend_dstest.vcproj +++ b/windows_vnet/c++/examples/extend_dstest/extend_dstest.vcproj @@ -44,7 +44,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release,..\..\..\..\hdf5lib\release\lib" - IgnoreDefaultLibraryNames="libcpp.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../../c++/examples/extend_dstest/Release/extend_dstest.pdb" SubSystem="1" TargetMachine="1"/> @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/extend_dstest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -106,7 +106,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug,..\..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../c++/examples/extend_dstest/Debug/extend_dstest.pdb" SubSystem="1" diff --git a/windows_vnet/c++/examples/extend_dstestdll/extend_dstestdll.vcproj b/windows_vnet/c++/examples/extend_dstestdll/extend_dstestdll.vcproj index ab2f25d..ba65bcb 100644 --- a/windows_vnet/c++/examples/extend_dstestdll/extend_dstestdll.vcproj +++ b/windows_vnet/c++/examples/extend_dstestdll/extend_dstestdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/extend_dstestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/c++/examples/h5grouptest/h5grouptest.vcproj b/windows_vnet/c++/examples/h5grouptest/h5grouptest.vcproj index af56199..bdd8f1d 100644 --- a/windows_vnet/c++/examples/h5grouptest/h5grouptest.vcproj +++ b/windows_vnet/c++/examples/h5grouptest/h5grouptest.vcproj @@ -44,7 +44,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release,..\..\..\..\hdf5lib\release\lib" - IgnoreDefaultLibraryNames="libcpp.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../../c++/examples/h5grouptest/Release/h5grouptest.pdb" SubSystem="1" TargetMachine="1"/> @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/h5grouptest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -106,7 +106,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug,..\..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../c++/examples/h5grouptest/Debug/h5grouptest.pdb" SubSystem="1" diff --git a/windows_vnet/c++/examples/h5grouptestdll/h5grouptestdll.vcproj b/windows_vnet/c++/examples/h5grouptestdll/h5grouptestdll.vcproj index c57026c..b22581f 100644 --- a/windows_vnet/c++/examples/h5grouptestdll/h5grouptestdll.vcproj +++ b/windows_vnet/c++/examples/h5grouptestdll/h5grouptestdll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/h5grouptestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/c++/examples/readdatatest/readdatatest.vcproj b/windows_vnet/c++/examples/readdatatest/readdatatest.vcproj index ce636e1..2112e06 100644 --- a/windows_vnet/c++/examples/readdatatest/readdatatest.vcproj +++ b/windows_vnet/c++/examples/readdatatest/readdatatest.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/readdatatest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -43,7 +43,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug,..\..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../c++/examples/readdatatest/Debug/readdatatest.pdb" SubSystem="1" @@ -107,7 +107,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release,..\..\..\..\hdf5lib\release\lib" - IgnoreDefaultLibraryNames="libcpp.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../../c++/examples/readdatatest/Release/readdatatest.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/c++/examples/readdatatestdll/readdatatestdll.vcproj b/windows_vnet/c++/examples/readdatatestdll/readdatatestdll.vcproj index 748d13b..e09b851 100644 --- a/windows_vnet/c++/examples/readdatatestdll/readdatatestdll.vcproj +++ b/windows_vnet/c++/examples/readdatatestdll/readdatatestdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/readdatatestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/c++/examples/writedatatest/writedatatest.vcproj b/windows_vnet/c++/examples/writedatatest/writedatatest.vcproj index f541b9a..373a857 100644 --- a/windows_vnet/c++/examples/writedatatest/writedatatest.vcproj +++ b/windows_vnet/c++/examples/writedatatest/writedatatest.vcproj @@ -44,7 +44,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\release,..\..\..\..\hdf5lib\release\lib" - IgnoreDefaultLibraryNames="libcpp.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../../c++/examples/writedatatest/Release/writedatatest.pdb" SubSystem="1" TargetMachine="1"/> @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/writedatatest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -106,7 +106,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_cpp\debug,..\..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../c++/examples/writedatatest/Debug/writedatatest.pdb" SubSystem="1" diff --git a/windows_vnet/c++/examples/writedatatestdll/writedatatestdll.vcproj b/windows_vnet/c++/examples/writedatatestdll/writedatatestdll.vcproj index bbe0a66..e385285 100644 --- a/windows_vnet/c++/examples/writedatatestdll/writedatatestdll.vcproj +++ b/windows_vnet/c++/examples/writedatatestdll/writedatatestdll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../../c++/examples/writedatatestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/c++/test/dsets_cpp/dsets_cpp.vcproj b/windows_vnet/c++/test/dsets_cpp/dsets_cpp.vcproj index 588dbba..abf2471 100644 --- a/windows_vnet/c++/test/dsets_cpp/dsets_cpp.vcproj +++ b/windows_vnet/c++/test/dsets_cpp/dsets_cpp.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../test/dsets_cpp/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile="../../../../c++/test/dsets_cpp/Debug/dsets_cpp.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../test/dsets_cpp/Debug/dsets_cpp.pdb" @@ -106,7 +106,7 @@ OutputFile="../../../../c++/test/dsets_cpp/Release/dsets_cpp.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../../test/dsets_cpp/Release/dsets_cpp.pdb" SubSystem="1" diff --git a/windows_vnet/c++/test/dsets_cppdll/dsets_cppdll.vcproj b/windows_vnet/c++/test/dsets_cppdll/dsets_cppdll.vcproj index 58c57bc..d3779a9 100644 --- a/windows_vnet/c++/test/dsets_cppdll/dsets_cppdll.vcproj +++ b/windows_vnet/c++/test/dsets_cppdll/dsets_cppdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../test/dsets_cppdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj b/windows_vnet/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj index 0022809..0758395 100644 --- a/windows_vnet/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj +++ b/windows_vnet/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../../c++/test/testhdf5_cpp/Release/testhdf5_cpp.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cpp/Release/testhdf5_cpp.pdb" SubSystem="1" @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../../c++/test/testhdf5_cpp/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -105,7 +105,7 @@ OutputFile=".\../../../../c++/test/testhdf5_cpp/Debug/testhdf5_cpp.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../c++/test/testhdf5_cpp/Debug/testhdf5_cpp.pdb" diff --git a/windows_vnet/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj b/windows_vnet/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj index 8f2f74d..3facae4 100644 --- a/windows_vnet/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj +++ b/windows_vnet/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../c++/test/testhdf5_cppdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/examples/allexamples/allexamples.vcproj b/windows_vnet/examples/allexamples/allexamples.vcproj index ee96d68..b591637 100644 --- a/windows_vnet/examples/allexamples/allexamples.vcproj +++ b/windows_vnet/examples/allexamples/allexamples.vcproj @@ -88,7 +88,7 @@ ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4"/> + DebugInformationFormat="3"/> @@ -42,7 +42,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\proj\hdf5\debug,..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../examples/attributest/Debug/attributetest.pdb" SubSystem="1" diff --git a/windows_vnet/examples/attributetestdll/attributetestdll.vcproj b/windows_vnet/examples/attributetestdll/attributetestdll.vcproj index 474ece14..5ae1ae2 100644 --- a/windows_vnet/examples/attributetestdll/attributetestdll.vcproj +++ b/windows_vnet/examples/attributetestdll/attributetestdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../examples/attributetestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/examples/chunkread/chunkread.vcproj b/windows_vnet/examples/chunkread/chunkread.vcproj index 4222314..08aeb4e 100644 --- a/windows_vnet/examples/chunkread/chunkread.vcproj +++ b/windows_vnet/examples/chunkread/chunkread.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../examples/chunkread/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -104,7 +104,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\proj\hdf5\debug,..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../examples/chunkread/Debug/chunkread.pdb" SubSystem="1" diff --git a/windows_vnet/examples/chunkreaddll/chunkreaddll.vcproj b/windows_vnet/examples/chunkreaddll/chunkreaddll.vcproj index e89dbd2..0856f36 100644 --- a/windows_vnet/examples/chunkreaddll/chunkreaddll.vcproj +++ b/windows_vnet/examples/chunkreaddll/chunkreaddll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../examples/chunkreaddll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/examples/compoundtest/compoundtest.vcproj b/windows_vnet/examples/compoundtest/compoundtest.vcproj index 3f026b1..8dbd673 100644 --- a/windows_vnet/examples/compoundtest/compoundtest.vcproj +++ b/windows_vnet/examples/compoundtest/compoundtest.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../examples/compoundtest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -104,7 +104,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\proj\hdf5\debug,..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../examples/compoundtest/Debug/compoundtest.pdb" SubSystem="1" diff --git a/windows_vnet/examples/compoundtestdll/compoundtestdll.vcproj b/windows_vnet/examples/compoundtestdll/compoundtestdll.vcproj index 54d80db..cdd9b11 100644 --- a/windows_vnet/examples/compoundtestdll/compoundtestdll.vcproj +++ b/windows_vnet/examples/compoundtestdll/compoundtestdll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../examples/compoundtestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/examples/extendwritetest/extendwritetest.vcproj b/windows_vnet/examples/extendwritetest/extendwritetest.vcproj index 631b112..7c603ac 100644 --- a/windows_vnet/examples/extendwritetest/extendwritetest.vcproj +++ b/windows_vnet/examples/extendwritetest/extendwritetest.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../examples/extendwritetest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\proj\hdf5\debug,..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../examples/extendwritetest/Debug/extendwritetest.pdb" SubSystem="1" diff --git a/windows_vnet/examples/extendwritetestdll/extendwritetestdll.vcproj b/windows_vnet/examples/extendwritetestdll/extendwritetestdll.vcproj index f67962b..2bdd6be 100644 --- a/windows_vnet/examples/extendwritetestdll/extendwritetestdll.vcproj +++ b/windows_vnet/examples/extendwritetestdll/extendwritetestdll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../examples/extendwritetestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/examples/grouptest/grouptest.vcproj b/windows_vnet/examples/grouptest/grouptest.vcproj index 5354d8b..14cd738 100644 --- a/windows_vnet/examples/grouptest/grouptest.vcproj +++ b/windows_vnet/examples/grouptest/grouptest.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../examples/grouptest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\proj\hdf5\debug,..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../examples/grouptest/Debug/grouptest.pdb" SubSystem="1" diff --git a/windows_vnet/examples/grouptestdll/grouptestdll.vcproj b/windows_vnet/examples/grouptestdll/grouptestdll.vcproj index 880d066..d4889ce 100644 --- a/windows_vnet/examples/grouptestdll/grouptestdll.vcproj +++ b/windows_vnet/examples/grouptestdll/grouptestdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../examples/grouptestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/examples/intermgrouptest/intermgrouptest.vcproj b/windows_vnet/examples/intermgrouptest/intermgrouptest.vcproj index d1585d9..99dc061 100644 --- a/windows_vnet/examples/intermgrouptest/intermgrouptest.vcproj +++ b/windows_vnet/examples/intermgrouptest/intermgrouptest.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../examples/intermgrouptest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -43,7 +43,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\proj\hdf5\debug,..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../examples/intermgrouptest/Debug/intermgrouptest.pdb" SubSystem="1" diff --git a/windows_vnet/examples/intermgrouptestdll/intermgrouptestdll.vcproj b/windows_vnet/examples/intermgrouptestdll/intermgrouptestdll.vcproj index e533fce..f5a0cbb 100644 --- a/windows_vnet/examples/intermgrouptestdll/intermgrouptestdll.vcproj +++ b/windows_vnet/examples/intermgrouptestdll/intermgrouptestdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../examples/intermgrouptestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/examples/readtest/readtest.vcproj b/windows_vnet/examples/readtest/readtest.vcproj index 3416b50..05796bd 100644 --- a/windows_vnet/examples/readtest/readtest.vcproj +++ b/windows_vnet/examples/readtest/readtest.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../examples/readtest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\proj\hdf5\debug,..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../examples/readtest/Debug/readtest.pdb" SubSystem="1" diff --git a/windows_vnet/examples/readtestdll/readtestdll.vcproj b/windows_vnet/examples/readtestdll/readtestdll.vcproj index 70c13d8..44b7aa0 100644 --- a/windows_vnet/examples/readtestdll/readtestdll.vcproj +++ b/windows_vnet/examples/readtestdll/readtestdll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../examples/readtestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/examples/selectest/selectest.vcproj b/windows_vnet/examples/selectest/selectest.vcproj index da87dfb..8130944 100644 --- a/windows_vnet/examples/selectest/selectest.vcproj +++ b/windows_vnet/examples/selectest/selectest.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../examples/selectest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\proj\hdf5\debug,..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../examples/selectest/Debug/selectest.pdb" SubSystem="1" diff --git a/windows_vnet/examples/selectestdll/selectestdll.vcproj b/windows_vnet/examples/selectestdll/selectestdll.vcproj index bdffdf6..217fa52 100644 --- a/windows_vnet/examples/selectestdll/selectestdll.vcproj +++ b/windows_vnet/examples/selectestdll/selectestdll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../examples/selectestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/examples/writetest/writetest.vcproj b/windows_vnet/examples/writetest/writetest.vcproj index b1eda06..b258b38 100644 --- a/windows_vnet/examples/writetest/writetest.vcproj +++ b/windows_vnet/examples/writetest/writetest.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../examples/writetest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -104,7 +104,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\proj\hdf5\debug,..\..\..\hdf5lib\debug\lib" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../examples/writetest/Debug/writetest.pdb" SubSystem="1" diff --git a/windows_vnet/examples/writetestdll/writetestdll.vcproj b/windows_vnet/examples/writetestdll/writetestdll.vcproj index 6400177..0887621 100644 --- a/windows_vnet/examples/writetestdll/writetestdll.vcproj +++ b/windows_vnet/examples/writetestdll/writetestdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../examples/writetestdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj b/windows_vnet/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj index 83fc731..13c8fd2 100644 --- a/windows_vnet/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj +++ b/windows_vnet/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../../hl/c++/test/hl_test_table_cpp/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj b/windows_vnet/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj index 6ee6633..e6ba10e 100644 --- a/windows_vnet/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj +++ b/windows_vnet/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../../../hl/c++/test/hl_test_table_cppdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/examples/ex_ds1/ex_ds1.vcproj b/windows_vnet/hl/examples/ex_ds1/ex_ds1.vcproj index fbde3c3..6c0bc47 100644 --- a/windows_vnet/hl/examples/ex_ds1/ex_ds1.vcproj +++ b/windows_vnet/hl/examples/ex_ds1/ex_ds1.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/examples/ex_ds1dll/ex_ds1dll.vcproj b/windows_vnet/hl/examples/ex_ds1dll/ex_ds1dll.vcproj index 178e755..ec515c6 100644 --- a/windows_vnet/hl/examples/ex_ds1dll/ex_ds1dll.vcproj +++ b/windows_vnet/hl/examples/ex_ds1dll/ex_ds1dll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_ds1dll\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/examples/ex_image1/ex_image1.vcproj b/windows_vnet/hl/examples/ex_image1/ex_image1.vcproj index 5a0ab6f..15c74e0 100644 --- a/windows_vnet/hl/examples/ex_image1/ex_image1.vcproj +++ b/windows_vnet/hl/examples/ex_image1/ex_image1.vcproj @@ -33,7 +33,7 @@ ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/examples/ex_image1dll/ex_image1dll.vcproj b/windows_vnet/hl/examples/ex_image1dll/ex_image1dll.vcproj index 45db539..639567f 100644 --- a/windows_vnet/hl/examples/ex_image1dll/ex_image1dll.vcproj +++ b/windows_vnet/hl/examples/ex_image1dll/ex_image1dll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_image1dll\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/examples/ex_image2/ex_image2.vcproj b/windows_vnet/hl/examples/ex_image2/ex_image2.vcproj index b339a74..5a81340 100644 --- a/windows_vnet/hl/examples/ex_image2/ex_image2.vcproj +++ b/windows_vnet/hl/examples/ex_image2/ex_image2.vcproj @@ -27,7 +27,7 @@ UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> diff --git a/windows_vnet/hl/examples/ex_lite1dll/ex_lite1dll.vcproj b/windows_vnet/hl/examples/ex_lite1dll/ex_lite1dll.vcproj index 5a7d2d1..f50c3bb 100644 --- a/windows_vnet/hl/examples/ex_lite1dll/ex_lite1dll.vcproj +++ b/windows_vnet/hl/examples/ex_lite1dll/ex_lite1dll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_lite1dll\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/examples/ex_lite2/ex_lite2.vcproj b/windows_vnet/hl/examples/ex_lite2/ex_lite2.vcproj index a4fdfd9..810e553 100644 --- a/windows_vnet/hl/examples/ex_lite2/ex_lite2.vcproj +++ b/windows_vnet/hl/examples/ex_lite2/ex_lite2.vcproj @@ -27,7 +27,7 @@ UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> diff --git a/windows_vnet/hl/examples/ex_table01dll/ex_table01dll.vcproj b/windows_vnet/hl/examples/ex_table01dll/ex_table01dll.vcproj index e494729..d975bc1 100644 --- a/windows_vnet/hl/examples/ex_table01dll/ex_table01dll.vcproj +++ b/windows_vnet/hl/examples/ex_table01dll/ex_table01dll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ex_table01dll\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/examples/ex_table02/ex_table02.vcproj b/windows_vnet/hl/examples/ex_table02/ex_table02.vcproj index b263fcf..9071b17 100644 --- a/windows_vnet/hl/examples/ex_table02/ex_table02.vcproj +++ b/windows_vnet/hl/examples/ex_table02/ex_table02.vcproj @@ -27,7 +27,7 @@ UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> diff --git a/windows_vnet/hl/examples/ptExampleFLdll/ptExampleFLdll.vcproj b/windows_vnet/hl/examples/ptExampleFLdll/ptExampleFLdll.vcproj index 73c2e39..74e5eef 100644 --- a/windows_vnet/hl/examples/ptExampleFLdll/ptExampleFLdll.vcproj +++ b/windows_vnet/hl/examples/ptExampleFLdll/ptExampleFLdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\..\..\..\..\hl\examples\ptExampleFLdll\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/examples/ptExampleVL/ptExampleVL.vcproj b/windows_vnet/hl/examples/ptExampleVL/ptExampleVL.vcproj index 1df1a70..5a7b6f1 100644 --- a/windows_vnet/hl/examples/ptExampleVL/ptExampleVL.vcproj +++ b/windows_vnet/hl/examples/ptExampleVL/ptExampleVL.vcproj @@ -28,7 +28,7 @@ UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../../hl/test/hl_test_ds/Debug/hl_test_ds.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../hl/test/hl_test_ds/Debug/hl_test_ds.pdb" SubSystem="1" diff --git a/windows_vnet/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj b/windows_vnet/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj index c253a2f..e6856f3 100644 --- a/windows_vnet/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj +++ b/windows_vnet/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../../hl/test/hl_test_dsdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/test/hl_test_image/hl_test_image.vcproj b/windows_vnet/hl/test/hl_test_image/hl_test_image.vcproj index 2c5992d..34d6955 100644 --- a/windows_vnet/hl/test/hl_test_image/hl_test_image.vcproj +++ b/windows_vnet/hl/test/hl_test_image/hl_test_image.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../hl/test/hl_test_image/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../../hl/test/hl_test_image/Debug/hl_test_image.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../hl/test/hl_test_image/Debug/hl_test_image.pdb" SubSystem="1" diff --git a/windows_vnet/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj b/windows_vnet/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj index 16f0cf0..fe3b71c 100644 --- a/windows_vnet/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj +++ b/windows_vnet/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../hl/test/hl_test_imagedll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/test/hl_test_lite/hl_test_lite.vcproj b/windows_vnet/hl/test/hl_test_lite/hl_test_lite.vcproj index bf61de9..0440b62 100644 --- a/windows_vnet/hl/test/hl_test_lite/hl_test_lite.vcproj +++ b/windows_vnet/hl/test/hl_test_lite/hl_test_lite.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../../hl/test/hl_test_lite/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -103,7 +103,7 @@ OutputFile=".\../../../../hl/test/hl_test_lite/Debug/hl_test_lite.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../hl/test/hl_test_lite/Debug/hl_test_lite.pdb" SubSystem="1" diff --git a/windows_vnet/hl/test/hl_test_litedll/hl_test_litedll.vcproj b/windows_vnet/hl/test/hl_test_litedll/hl_test_litedll.vcproj index ccd3c2e..3987bd9 100644 --- a/windows_vnet/hl/test/hl_test_litedll/hl_test_litedll.vcproj +++ b/windows_vnet/hl/test/hl_test_litedll/hl_test_litedll.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../../hl/test/hl_test_litedll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/test/hl_test_packet/hl_test_packet.vcproj b/windows_vnet/hl/test/hl_test_packet/hl_test_packet.vcproj index a1bdfe5..f49c599 100644 --- a/windows_vnet/hl/test/hl_test_packet/hl_test_packet.vcproj +++ b/windows_vnet/hl/test/hl_test_packet/hl_test_packet.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../../hl/test/hl_test_packet/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -104,7 +104,7 @@ OutputFile=".\../../../../hl/test/hl_test_packet/Debug/hl_test_packet.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../hl/test/hl_test_packet/Debug/hl_test_packet.pdb" diff --git a/windows_vnet/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj b/windows_vnet/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj index 9a4897d..49abeb3 100644 --- a/windows_vnet/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj +++ b/windows_vnet/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../../hl/test/hl_test_packetdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/test/hl_test_table/hl_test_table.vcproj b/windows_vnet/hl/test/hl_test_table/hl_test_table.vcproj index 309d7c9..c52304f 100644 --- a/windows_vnet/hl/test/hl_test_table/hl_test_table.vcproj +++ b/windows_vnet/hl/test/hl_test_table/hl_test_table.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../../hl/test/hl_test_table/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -103,7 +103,7 @@ OutputFile=".\../../../../hl/test/hl_test_table/Debug/hl_test_table.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../hl/test/hl_test_table/Debug/hl_test_table.pdb" SubSystem="1" diff --git a/windows_vnet/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj b/windows_vnet/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj index cb4b68e..eefaff7 100644 --- a/windows_vnet/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj +++ b/windows_vnet/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../hl/test/hl_test_tabledll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/tools/gifconv/gif2h5.vcproj b/windows_vnet/hl/tools/gifconv/gif2h5.vcproj index f3d510d..5ec5750 100644 --- a/windows_vnet/hl/tools/gifconv/gif2h5.vcproj +++ b/windows_vnet/hl/tools/gifconv/gif2h5.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/gif2h5.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Debug/gif2h5.pdb" SubSystem="1" @@ -105,7 +105,7 @@ OutputFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/gif2h5.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\gif2h5\Release/gif2h5.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/hl/tools/gifconv/h52gif.vcproj b/windows_vnet/hl/tools/gifconv/h52gif.vcproj index 96be977..ea1eb4e 100644 --- a/windows_vnet/hl/tools/gifconv/h52gif.vcproj +++ b/windows_vnet/hl/tools/gifconv/h52gif.vcproj @@ -43,7 +43,7 @@ OutputFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/h52gif.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Release/h52gif.pdb" SubSystem="1" TargetMachine="1"/> @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconv\h52gif\debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -104,7 +104,7 @@ OutputFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Debug/h52gif.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\..\..\..\..\hl\tools\gifconv\h52gif\Debug/h52gif.pdb" SubSystem="1" diff --git a/windows_vnet/hl/tools/gifconvdll/gif2h5dll.vcproj b/windows_vnet/hl/tools/gifconvdll/gif2h5dll.vcproj index 425f7e4..f02be74 100644 --- a/windows_vnet/hl/tools/gifconvdll/gif2h5dll.vcproj +++ b/windows_vnet/hl/tools/gifconvdll/gif2h5dll.vcproj @@ -92,7 +92,7 @@ ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/hl/tools/gifconvdll/h52gifdll.vcproj b/windows_vnet/hl/tools/gifconvdll/h52gifdll.vcproj index 5f9a402..25cafbc 100644 --- a/windows_vnet/hl/tools/gifconvdll/h52gifdll.vcproj +++ b/windows_vnet/hl/tools/gifconvdll/h52gifdll.vcproj @@ -92,7 +92,7 @@ ProgramDataBaseFileName=".\..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj b/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj index fbc7b52..81d75d6 100644 --- a/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj +++ b/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj @@ -12,8 +12,8 @@ + CommandLine=".\..\..\..\..\src\h5tinit\Release\h5tinit.exe > ..\..\..\..\src\H5tinit.c"/> + DebugInformationFormat="3"/> + CommandLine=".\..\..\..\..\src\h5tinit\Debug\h5tinit.exe > ..\..\..\..\src\H5tinit.c"/> + DebugInformationFormat="3"/> diff --git a/windows_vnet/proj/hdf5_cpp/hdf5_cpp.vcproj b/windows_vnet/proj/hdf5_cpp/hdf5_cpp.vcproj index bbb2fb4..1d7ad41 100644 --- a/windows_vnet/proj/hdf5_cpp/hdf5_cpp.vcproj +++ b/windows_vnet/proj/hdf5_cpp/hdf5_cpp.vcproj @@ -84,7 +84,7 @@ ProgramDataBaseFileName=".\..\..\..\proj\hdf5_cpp\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/proj/hdf5_cppdll/hdf5_cppdll.vcproj b/windows_vnet/proj/hdf5_cppdll/hdf5_cppdll.vcproj index 56a8017..4979c00 100644 --- a/windows_vnet/proj/hdf5_cppdll/hdf5_cppdll.vcproj +++ b/windows_vnet/proj/hdf5_cppdll/hdf5_cppdll.vcproj @@ -96,7 +96,7 @@ ProgramDataBaseFileName=".\../../../proj/hdf5_cppdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/proj/hdf5_hl/hdf5_hl.vcproj b/windows_vnet/proj/hdf5_hl/hdf5_hl.vcproj index d56b9aa..08f77a4 100644 --- a/windows_vnet/proj/hdf5_hl/hdf5_hl.vcproj +++ b/windows_vnet/proj/hdf5_hl/hdf5_hl.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\..\..\..\proj\hdf5_hl\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj b/windows_vnet/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj index 605cc94..d0ecff3 100644 --- a/windows_vnet/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj +++ b/windows_vnet/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj @@ -84,7 +84,7 @@ ProgramDataBaseFileName=".\..\..\..\proj\hdf5_hl_cpp\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj b/windows_vnet/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj index fa9925a..e723eda 100644 --- a/windows_vnet/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj +++ b/windows_vnet/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj @@ -97,7 +97,7 @@ ProgramDataBaseFileName=".\..\..\..\proj\hdf5_hl_cppdll\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/proj/hdf5_hldll/hdf5_hldll.vcproj b/windows_vnet/proj/hdf5_hldll/hdf5_hldll.vcproj index 6445d92..e6e7bf2 100644 --- a/windows_vnet/proj/hdf5_hldll/hdf5_hldll.vcproj +++ b/windows_vnet/proj/hdf5_hldll/hdf5_hldll.vcproj @@ -97,7 +97,7 @@ ProgramDataBaseFileName=".\..\..\..\proj\hdf5_hldll\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/proj/hdf5dll/hdf5dll.vcproj b/windows_vnet/proj/hdf5dll/hdf5dll.vcproj index 23debef..16ca5a6 100644 --- a/windows_vnet/proj/hdf5dll/hdf5dll.vcproj +++ b/windows_vnet/proj/hdf5dll/hdf5dll.vcproj @@ -29,7 +29,7 @@ ProgramDataBaseFileName=".\../../../proj/hdf5dll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4"/> + DebugInformationFormat="3"/> @@ -105,7 +105,7 @@ OutputFile=".\../../../test/big/Debug/big.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/big/Debug/big.pdb" diff --git a/windows_vnet/test/bigdll/bigdll.vcproj b/windows_vnet/test/bigdll/bigdll.vcproj index 04ff08b..1ad67a9 100644 --- a/windows_vnet/test/bigdll/bigdll.vcproj +++ b/windows_vnet/test/bigdll/bigdll.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../test/bigdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/bittests/bittests.vcproj b/windows_vnet/test/bittests/bittests.vcproj index a526a9e..7312d56 100644 --- a/windows_vnet/test/bittests/bittests.vcproj +++ b/windows_vnet/test/bittests/bittests.vcproj @@ -148,7 +148,7 @@ ProgramDataBaseFileName=".\../../../test/bittests/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -158,7 +158,7 @@ OutputFile=".\../../../test/bittests/Debug/bittests.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/bittests/Debug/bittests.pdb" SubSystem="1" @@ -221,7 +221,7 @@ OutputFile=".\../../../test/bittests/Release/bittests.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/bittests/Release/bittests.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/test/bittestsdll/bittestsdll.vcproj b/windows_vnet/test/bittestsdll/bittestsdll.vcproj index 3329eaf..228086c 100644 --- a/windows_vnet/test/bittestsdll/bittestsdll.vcproj +++ b/windows_vnet/test/bittestsdll/bittestsdll.vcproj @@ -148,7 +148,7 @@ ProgramDataBaseFileName=".\../../../test/bittestsdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/btree2/btree2.vcproj b/windows_vnet/test/btree2/btree2.vcproj index 953f739..368f3b7 100644 --- a/windows_vnet/test/btree2/btree2.vcproj +++ b/windows_vnet/test/btree2/btree2.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/btree2/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../test/btree2/Debug/btree2.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/btree2/Debug/btree2.pdb" @@ -106,7 +106,7 @@ OutputFile=".\../../../test/btree2/Release/btree2.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/btree2/Release/btree2.pdb" SubSystem="1" diff --git a/windows_vnet/test/btree2dll/btree2dll.vcproj b/windows_vnet/test/btree2dll/btree2dll.vcproj index 78c296a..701f9d5 100644 --- a/windows_vnet/test/btree2dll/btree2dll.vcproj +++ b/windows_vnet/test/btree2dll/btree2dll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/btree2dll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/cache/cache.vcproj b/windows_vnet/test/cache/cache.vcproj index c46ff24..a938deb 100644 --- a/windows_vnet/test/cache/cache.vcproj +++ b/windows_vnet/test/cache/cache.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/cache/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../test/cache/Debug/cache.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/cache/Debug/cache.pdb" SubSystem="1" @@ -105,7 +105,7 @@ OutputFile=".\../../../test/cache/Release/cache.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/cache/Release/cache.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/test/cache_api/cache_api.vcproj b/windows_vnet/test/cache_api/cache_api.vcproj index 568c009..658a8c0 100644 --- a/windows_vnet/test/cache_api/cache_api.vcproj +++ b/windows_vnet/test/cache_api/cache_api.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/cache_api/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../test/cache_api/Debug/cache_api.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/cache_api/Debug/cache_api.pdb" SubSystem="1" @@ -105,7 +105,7 @@ OutputFile=".\../../../test/cache_api/Release/cache_api.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/cache_api/Release/cache_api.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/test/cache_apidll/cache_apidll.vcproj b/windows_vnet/test/cache_apidll/cache_apidll.vcproj index 3add955..7478169 100644 --- a/windows_vnet/test/cache_apidll/cache_apidll.vcproj +++ b/windows_vnet/test/cache_apidll/cache_apidll.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../test/cache_apidll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/cachedll/cachedll.vcproj b/windows_vnet/test/cachedll/cachedll.vcproj index b4e206f..7d6cbc5 100644 --- a/windows_vnet/test/cachedll/cachedll.vcproj +++ b/windows_vnet/test/cachedll/cachedll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/cachedll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/chunk/chunk.vcproj b/windows_vnet/test/chunk/chunk.vcproj index b67f7ee..b476716 100644 --- a/windows_vnet/test/chunk/chunk.vcproj +++ b/windows_vnet/test/chunk/chunk.vcproj @@ -91,7 +91,7 @@ BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -101,7 +101,7 @@ OutputFile=".\../../../test/chunk/Debug/chunk.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/chunk/Debug/chunk.pdb" SubSystem="1" @@ -164,7 +164,7 @@ OutputFile=".\../../../test/chunk/Release/chunk.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/chunk/Release/chunk.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/test/chunk_info/chunk_info.vcproj b/windows_vnet/test/chunk_info/chunk_info.vcproj index c58cf4c..fa4db93 100644 --- a/windows_vnet/test/chunk_info/chunk_info.vcproj +++ b/windows_vnet/test/chunk_info/chunk_info.vcproj @@ -27,7 +27,7 @@ UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> + DebugInformationFormat="3"/> + DebugInformationFormat="3"/> diff --git a/windows_vnet/test/cmpd_dset/cmpd_dset.vcproj b/windows_vnet/test/cmpd_dset/cmpd_dset.vcproj index f006e59..54f7727 100644 --- a/windows_vnet/test/cmpd_dset/cmpd_dset.vcproj +++ b/windows_vnet/test/cmpd_dset/cmpd_dset.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/cmpd_dset/Release/cmpd_dset.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/cmpd_dset/Release/cmpd_dset.pdb" SubSystem="1" @@ -211,7 +211,7 @@ ProgramDataBaseFileName=".\../../../test/cmpd_dset/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -221,7 +221,7 @@ OutputFile=".\../../../test/cmpd_dset/Debug/cmpd_dset.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/cmpd_dset/Debug/cmpd_dset.pdb" diff --git a/windows_vnet/test/cmpd_dsetdll/cmpd_dsetdll.vcproj b/windows_vnet/test/cmpd_dsetdll/cmpd_dsetdll.vcproj index a9fc91c..51a6ef1 100644 --- a/windows_vnet/test/cmpd_dsetdll/cmpd_dsetdll.vcproj +++ b/windows_vnet/test/cmpd_dsetdll/cmpd_dsetdll.vcproj @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../test/cmpd_dsetdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/cross_read/cross_read.vcproj b/windows_vnet/test/cross_read/cross_read.vcproj index e46fb5f..c79f9f4 100644 --- a/windows_vnet/test/cross_read/cross_read.vcproj +++ b/windows_vnet/test/cross_read/cross_read.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/cross_read/Release/cross_read.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/cross_read/Release/cross_read.pdb" SubSystem="1" @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../test/cross_read/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -105,7 +105,7 @@ OutputFile=".\../../../test/cross_read/Debug/cross_read.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/cross_read/Debug/cross_read.pdb" diff --git a/windows_vnet/test/cross_readdll/cross_readdll.vcproj b/windows_vnet/test/cross_readdll/cross_readdll.vcproj index 62208cc..34b15de 100644 --- a/windows_vnet/test/cross_readdll/cross_readdll.vcproj +++ b/windows_vnet/test/cross_readdll/cross_readdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/cross_readdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/dangle/dangle.vcproj b/windows_vnet/test/dangle/dangle.vcproj index a963d9f..3140fe8 100644 --- a/windows_vnet/test/dangle/dangle.vcproj +++ b/windows_vnet/test/dangle/dangle.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/dangle/Release/dangle.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/dangle/Release/dangle.pdb" SubSystem="1" TargetMachine="1"/> @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../test/dangle/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -104,7 +104,7 @@ OutputFile=".\../../../test/dangle/Debug/dangle.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/dangle/Debug/dangle.pdb" SubSystem="1" diff --git a/windows_vnet/test/dangledll/dangledll.vcproj b/windows_vnet/test/dangledll/dangledll.vcproj index 050a65b..a5590e9 100644 --- a/windows_vnet/test/dangledll/dangledll.vcproj +++ b/windows_vnet/test/dangledll/dangledll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/dangledll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/dsets/dsets.vcproj b/windows_vnet/test/dsets/dsets.vcproj index a21173b..ae2aaf4 100644 --- a/windows_vnet/test/dsets/dsets.vcproj +++ b/windows_vnet/test/dsets/dsets.vcproj @@ -160,7 +160,7 @@ OutputFile=".\../../../test/dsets/Release/dsets.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/dsets/Release/dsets.pdb" SubSystem="1" @@ -211,7 +211,7 @@ ProgramDataBaseFileName=".\../../../test/dsets/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -221,7 +221,7 @@ OutputFile=".\../../../test/dsets/Debug/dsets.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/dsets/Debug/dsets.pdb" diff --git a/windows_vnet/test/dsetsdll/dsetsdll.vcproj b/windows_vnet/test/dsetsdll/dsetsdll.vcproj index 87e283d..1637f16 100644 --- a/windows_vnet/test/dsetsdll/dsetsdll.vcproj +++ b/windows_vnet/test/dsetsdll/dsetsdll.vcproj @@ -148,7 +148,7 @@ ProgramDataBaseFileName=".\../../../test/dsetsdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/dt_arith/dt_arith.vcproj b/windows_vnet/test/dt_arith/dt_arith.vcproj index 676afe5..dca25f4 100644 --- a/windows_vnet/test/dt_arith/dt_arith.vcproj +++ b/windows_vnet/test/dt_arith/dt_arith.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/dt_arith/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../test/dt_arith/Debug/dt_arith.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/dt_arith/Debug/dt_arith.pdb" @@ -106,7 +106,7 @@ OutputFile=".\../../../test/dt_arith/Release/dt_arith.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/dt_arith/Release/dt_arith.pdb" SubSystem="1" diff --git a/windows_vnet/test/dt_arithdll/dt_arithdll.vcproj b/windows_vnet/test/dt_arithdll/dt_arithdll.vcproj index 4c3da12..04a5a44 100644 --- a/windows_vnet/test/dt_arithdll/dt_arithdll.vcproj +++ b/windows_vnet/test/dt_arithdll/dt_arithdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/dt_arithdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/dtransform/dtransform.vcproj b/windows_vnet/test/dtransform/dtransform.vcproj index 7db8d33..7e4fd28 100644 --- a/windows_vnet/test/dtransform/dtransform.vcproj +++ b/windows_vnet/test/dtransform/dtransform.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/dtransform/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../test/dtransform/Debug/dtransform.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/dtransform/Debug/dtransform.pdb" SubSystem="1" @@ -105,7 +105,7 @@ OutputFile=".\../../../test/dtransform/Release/dtransform.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/dtransform/Release/dtransform.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/test/dtransformdll/dtransformdll.vcproj b/windows_vnet/test/dtransformdll/dtransformdll.vcproj index 6e46ca8..ac34479 100644 --- a/windows_vnet/test/dtransformdll/dtransformdll.vcproj +++ b/windows_vnet/test/dtransformdll/dtransformdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/dtransformdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/dtypes/dtypes.vcproj b/windows_vnet/test/dtypes/dtypes.vcproj index 9e2cfc8..0ff46fb 100644 --- a/windows_vnet/test/dtypes/dtypes.vcproj +++ b/windows_vnet/test/dtypes/dtypes.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../test/dtypes/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -41,7 +41,7 @@ OutputFile=".\../../../test/dtypes/Debug/dtypes.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/dtypes/Debug/dtypes.pdb" @@ -222,7 +222,7 @@ OutputFile=".\../../../test/dtypes/Release/dtypes.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/dtypes/Release/dtypes.pdb" SubSystem="1" diff --git a/windows_vnet/test/dtypesdll/dtypesdll.vcproj b/windows_vnet/test/dtypesdll/dtypesdll.vcproj index 8cdd3a9..33ac885 100644 --- a/windows_vnet/test/dtypesdll/dtypesdll.vcproj +++ b/windows_vnet/test/dtypesdll/dtypesdll.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../test/dtypesdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/enum/enum.vcproj b/windows_vnet/test/enum/enum.vcproj index dff35ff..92294f0 100644 --- a/windows_vnet/test/enum/enum.vcproj +++ b/windows_vnet/test/enum/enum.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/enum/Release/enum.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/enum/Release/enum.pdb" SubSystem="1" @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../test/enum/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -104,7 +104,7 @@ OutputFile=".\../../../test/enum/Debug/enum.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/enum/Debug/enum.pdb" diff --git a/windows_vnet/test/enumdll/enumdll.vcproj b/windows_vnet/test/enumdll/enumdll.vcproj index fb64385..c69a5fb 100644 --- a/windows_vnet/test/enumdll/enumdll.vcproj +++ b/windows_vnet/test/enumdll/enumdll.vcproj @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../test/enumdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/err_compat/err_compat.vcproj b/windows_vnet/test/err_compat/err_compat.vcproj index 4b0b6f4..c01b887 100644 --- a/windows_vnet/test/err_compat/err_compat.vcproj +++ b/windows_vnet/test/err_compat/err_compat.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/err_compat/Release/err_compat.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/err_compat/Release/err_compat.pdb" SubSystem="1" @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../test/err_compat/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -105,7 +105,7 @@ OutputFile=".\../../../test/err_compat/Debug/err_compat.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/err_compat/Debug/err_compat.pdb" diff --git a/windows_vnet/test/err_compatdll/err_compatdll.vcproj b/windows_vnet/test/err_compatdll/err_compatdll.vcproj index 8db7a4a..ebf8d2c 100644 --- a/windows_vnet/test/err_compatdll/err_compatdll.vcproj +++ b/windows_vnet/test/err_compatdll/err_compatdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/err_compatdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/error_test/error_test.vcproj b/windows_vnet/test/error_test/error_test.vcproj index a00c973..af6dd9a 100644 --- a/windows_vnet/test/error_test/error_test.vcproj +++ b/windows_vnet/test/error_test/error_test.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/error_test/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../test/error_test/Debug/error_test.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/error_test/Debug/error_test.pdb" @@ -106,7 +106,7 @@ OutputFile=".\../../../test/error_test/Release/error_test.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/error_test/Release/error_test.pdb" SubSystem="1" diff --git a/windows_vnet/test/error_testdll/error_testdll.vcproj b/windows_vnet/test/error_testdll/error_testdll.vcproj index 0b7c4db..952d02a 100644 --- a/windows_vnet/test/error_testdll/error_testdll.vcproj +++ b/windows_vnet/test/error_testdll/error_testdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/error_testdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/extend/extend.vcproj b/windows_vnet/test/extend/extend.vcproj index 1d0848f..c00c43c 100644 --- a/windows_vnet/test/extend/extend.vcproj +++ b/windows_vnet/test/extend/extend.vcproj @@ -101,7 +101,7 @@ OutputFile=".\../../../test/extend/Release/extend.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/extend/Release/extend.pdb" SubSystem="1" @@ -211,7 +211,7 @@ ProgramDataBaseFileName=".\../../../test/extend/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -221,7 +221,7 @@ OutputFile=".\../../../test/extend/Debug/extend.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/extend/Debug/extend.pdb" diff --git a/windows_vnet/test/extenddll/extenddll.vcproj b/windows_vnet/test/extenddll/extenddll.vcproj index 54a6b1e..edf84bd 100644 --- a/windows_vnet/test/extenddll/extenddll.vcproj +++ b/windows_vnet/test/extenddll/extenddll.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../test/extenddll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/external/external.vcproj b/windows_vnet/test/external/external.vcproj index f17da03..30699da 100644 --- a/windows_vnet/test/external/external.vcproj +++ b/windows_vnet/test/external/external.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../test/external/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -41,7 +41,7 @@ OutputFile=".\../../../test/external/Debug/external.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/external/Debug/external.pdb" @@ -105,7 +105,7 @@ OutputFile=".\../../../test/external/Release/external.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/external/Release/external.pdb" SubSystem="1" diff --git a/windows_vnet/test/externaldll/externaldll.vcproj b/windows_vnet/test/externaldll/externaldll.vcproj index 1250252..dd6e842 100644 --- a/windows_vnet/test/externaldll/externaldll.vcproj +++ b/windows_vnet/test/externaldll/externaldll.vcproj @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../test/externaldll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/fheap/fheap.vcproj b/windows_vnet/test/fheap/fheap.vcproj index 15f2259..76ec0fb 100644 --- a/windows_vnet/test/fheap/fheap.vcproj +++ b/windows_vnet/test/fheap/fheap.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/fheap/Release/fheap.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/fheap/Release/fheap.pdb" SubSystem="1" @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../test/fheap/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -105,7 +105,7 @@ OutputFile=".\../../../test/fheap/Debug/fheap.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/fheap/Debug/fheap.pdb" diff --git a/windows_vnet/test/fheapdll/fheapdll.vcproj b/windows_vnet/test/fheapdll/fheapdll.vcproj index 8bf831d..8137c5a 100644 --- a/windows_vnet/test/fheapdll/fheapdll.vcproj +++ b/windows_vnet/test/fheapdll/fheapdll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../test/fheapdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/fillval/fillval.vcproj b/windows_vnet/test/fillval/fillval.vcproj index 6b8e321..8b0dc1f 100644 --- a/windows_vnet/test/fillval/fillval.vcproj +++ b/windows_vnet/test/fillval/fillval.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../test/fillval/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -41,7 +41,7 @@ OutputFile=".\../../../test/fillval/Debug/fillval.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/fillval/Debug/fillval.pdb" @@ -105,7 +105,7 @@ OutputFile=".\../../../test/fillval/Release/fillval.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/fillval/Release/fillval.pdb" SubSystem="1" diff --git a/windows_vnet/test/fillvaldll/fillvaldll.vcproj b/windows_vnet/test/fillvaldll/fillvaldll.vcproj index 7a41d29..8f9632e 100644 --- a/windows_vnet/test/fillvaldll/fillvaldll.vcproj +++ b/windows_vnet/test/fillvaldll/fillvaldll.vcproj @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../test/fillvaldll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/flush1/flush1.vcproj b/windows_vnet/test/flush1/flush1.vcproj index 885526b..f0bb420 100644 --- a/windows_vnet/test/flush1/flush1.vcproj +++ b/windows_vnet/test/flush1/flush1.vcproj @@ -160,7 +160,7 @@ OutputFile=".\../../../test/flush1/Release/flush1.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/flush1/Release/flush1.pdb" SubSystem="1" @@ -211,7 +211,7 @@ ProgramDataBaseFileName=".\../../../test/flush1/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -221,7 +221,7 @@ OutputFile=".\../../../test/flush1/Debug/flush1.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/flush1/Debug/flush1.pdb" diff --git a/windows_vnet/test/flush1dll/flush1dll.vcproj b/windows_vnet/test/flush1dll/flush1dll.vcproj index 8eb34a9..a6a33b5 100644 --- a/windows_vnet/test/flush1dll/flush1dll.vcproj +++ b/windows_vnet/test/flush1dll/flush1dll.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../test/flush1dll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/flush2/flush2.vcproj b/windows_vnet/test/flush2/flush2.vcproj index c2370bb..60fc85e 100644 --- a/windows_vnet/test/flush2/flush2.vcproj +++ b/windows_vnet/test/flush2/flush2.vcproj @@ -148,7 +148,7 @@ ProgramDataBaseFileName=".\../../../test/flush2/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -158,7 +158,7 @@ OutputFile=".\../../../test/flush2/Debug/flush2.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/flush2/Debug/flush2.pdb" @@ -222,7 +222,7 @@ OutputFile=".\../../../test/flush2/Release/flush2.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/flush2/Release/flush2.pdb" SubSystem="1" diff --git a/windows_vnet/test/flush2dll/flush2dll.vcproj b/windows_vnet/test/flush2dll/flush2dll.vcproj index 36ca1a5..170a041 100644 --- a/windows_vnet/test/flush2dll/flush2dll.vcproj +++ b/windows_vnet/test/flush2dll/flush2dll.vcproj @@ -90,7 +90,7 @@ ProgramDataBaseFileName=".\../../../test/flush2dll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/getname/getname.vcproj b/windows_vnet/test/getname/getname.vcproj index 7027db9..d0a44bd 100644 --- a/windows_vnet/test/getname/getname.vcproj +++ b/windows_vnet/test/getname/getname.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/getname/Release/getname.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/getname/Release/getname.pdb" SubSystem="1" @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../test/getname/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -105,7 +105,7 @@ OutputFile=".\../../../test/getname/Debug/getname.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/getname/Debug/getname.pdb" diff --git a/windows_vnet/test/getnamedll/getnamedll.vcproj b/windows_vnet/test/getnamedll/getnamedll.vcproj index 1ce7406..04c2b47 100644 --- a/windows_vnet/test/getnamedll/getnamedll.vcproj +++ b/windows_vnet/test/getnamedll/getnamedll.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/getnamedll/Release/getnamedll.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/getnamedll/Release/getnamedll.pdb" SubSystem="1" @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../test/getnamedll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -105,7 +105,7 @@ OutputFile=".\../../../test/getnamedll/Debug/getnamedll.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/getnamedll/Debug/getnamedll.pdb" diff --git a/windows_vnet/test/getub/getub.vcproj b/windows_vnet/test/getub/getub.vcproj index a5d36ee..72afb78 100644 --- a/windows_vnet/test/getub/getub.vcproj +++ b/windows_vnet/test/getub/getub.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/getub/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../test/getub/Debug/getub.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/getub/Debug/getub.pdb" SubSystem="1" diff --git a/windows_vnet/test/gheap/gheap.vcproj b/windows_vnet/test/gheap/gheap.vcproj index b05c39e..ac382a1 100644 --- a/windows_vnet/test/gheap/gheap.vcproj +++ b/windows_vnet/test/gheap/gheap.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/gheap/Release/gheap.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/gheap/Release/gheap.pdb" SubSystem="1" @@ -211,7 +211,7 @@ ProgramDataBaseFileName=".\../../../test/gheap/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -221,7 +221,7 @@ OutputFile=".\../../../test/gheap/Debug/gheap.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/gheap/Debug/gheap.pdb" diff --git a/windows_vnet/test/gheapdll/gheapdll.vcproj b/windows_vnet/test/gheapdll/gheapdll.vcproj index 932dc38..4cc81d6 100644 --- a/windows_vnet/test/gheapdll/gheapdll.vcproj +++ b/windows_vnet/test/gheapdll/gheapdll.vcproj @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../test/gheapdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/hyperslab/hyperslab.vcproj b/windows_vnet/test/hyperslab/hyperslab.vcproj index 2d2ba00..521af73 100644 --- a/windows_vnet/test/hyperslab/hyperslab.vcproj +++ b/windows_vnet/test/hyperslab/hyperslab.vcproj @@ -148,7 +148,7 @@ ProgramDataBaseFileName=".\../../../test/hyperslab/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -158,7 +158,7 @@ OutputFile=".\../../../test/hyperslab/Debug/hyperslab.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/hyperslab/Debug/hyperslab.pdb" SubSystem="1" @@ -221,7 +221,7 @@ OutputFile=".\../../../test/hyperslab/Release/hyperslab.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/hyperslab/Release/hyperslab.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/test/hyperslabdll/hyperslabdll.vcproj b/windows_vnet/test/hyperslabdll/hyperslabdll.vcproj index 7555e28..7798f84 100644 --- a/windows_vnet/test/hyperslabdll/hyperslabdll.vcproj +++ b/windows_vnet/test/hyperslabdll/hyperslabdll.vcproj @@ -91,7 +91,7 @@ ProgramDataBaseFileName=".\../../../test/hyperslabdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/iopipe/iopipe.vcproj b/windows_vnet/test/iopipe/iopipe.vcproj index 2263925..393bed6 100644 --- a/windows_vnet/test/iopipe/iopipe.vcproj +++ b/windows_vnet/test/iopipe/iopipe.vcproj @@ -160,7 +160,7 @@ OutputFile=".\../../../test/iopipe/Release/iopipe.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/iopipe/Release/iopipe.pdb" SubSystem="1" TargetMachine="1"/> @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../test/iopipe/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -220,7 +220,7 @@ OutputFile=".\../../../test/iopipe/Debug/iopipe.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/iopipe/Debug/iopipe.pdb" SubSystem="1" diff --git a/windows_vnet/test/iopipedll/iopipedll.vcproj b/windows_vnet/test/iopipedll/iopipedll.vcproj index 97fe1bb..7e304ac 100644 --- a/windows_vnet/test/iopipedll/iopipedll.vcproj +++ b/windows_vnet/test/iopipedll/iopipedll.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../test/iopipedll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/istore/istore.vcproj b/windows_vnet/test/istore/istore.vcproj index d5a228b..3874af3 100644 --- a/windows_vnet/test/istore/istore.vcproj +++ b/windows_vnet/test/istore/istore.vcproj @@ -160,7 +160,7 @@ OutputFile=".\../../../test/istore/Release/istore.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/istore/Release/istore.pdb" SubSystem="1" @@ -211,7 +211,7 @@ ProgramDataBaseFileName=".\../../../test/istore/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -221,7 +221,7 @@ OutputFile=".\../../../test/istore/Debug/istore.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/istore/Debug/istore.pdb" diff --git a/windows_vnet/test/istoredll/istoredll.vcproj b/windows_vnet/test/istoredll/istoredll.vcproj index 811a374..79c0c88 100644 --- a/windows_vnet/test/istoredll/istoredll.vcproj +++ b/windows_vnet/test/istoredll/istoredll.vcproj @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../test/istoredll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/lheap/lheap.vcproj b/windows_vnet/test/lheap/lheap.vcproj index 06b3585..f528c23 100644 --- a/windows_vnet/test/lheap/lheap.vcproj +++ b/windows_vnet/test/lheap/lheap.vcproj @@ -148,7 +148,7 @@ ProgramDataBaseFileName=".\../../../test/lheap/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -158,7 +158,7 @@ OutputFile=".\../../../test/lheap/Debug/lheap.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/lheap/Debug/lheap.pdb" @@ -222,7 +222,7 @@ OutputFile=".\../../../test/lheap/Release/lheap.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/lheap/Release/lheap.pdb" SubSystem="1" diff --git a/windows_vnet/test/lheapdll/lheapdll.vcproj b/windows_vnet/test/lheapdll/lheapdll.vcproj index c295892..40fbfae 100644 --- a/windows_vnet/test/lheapdll/lheapdll.vcproj +++ b/windows_vnet/test/lheapdll/lheapdll.vcproj @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../test/lheapdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/libtest/libtest.vcproj b/windows_vnet/test/libtest/libtest.vcproj index 85041bb..c93b449 100644 --- a/windows_vnet/test/libtest/libtest.vcproj +++ b/windows_vnet/test/libtest/libtest.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\..\..\..\test\libtest\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/libtestD/libtestD.vcproj b/windows_vnet/test/libtestD/libtestD.vcproj index c8421da..57f9816 100644 --- a/windows_vnet/test/libtestD/libtestD.vcproj +++ b/windows_vnet/test/libtestD/libtestD.vcproj @@ -96,7 +96,7 @@ ProgramDataBaseFileName=".\../../../test/libtestD/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/links/links.vcproj b/windows_vnet/test/links/links.vcproj index 37bb9f2..9d1a3c8 100644 --- a/windows_vnet/test/links/links.vcproj +++ b/windows_vnet/test/links/links.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/links/Release/links.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/links/Release/links.pdb" SubSystem="1" @@ -211,7 +211,7 @@ ProgramDataBaseFileName=".\../../../test/links/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -221,7 +221,7 @@ OutputFile=".\../../../test/links/Debug/links.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/links/Debug/links.pdb" diff --git a/windows_vnet/test/linksdll/linksdll.vcproj b/windows_vnet/test/linksdll/linksdll.vcproj index 779c35a..86e85f1 100644 --- a/windows_vnet/test/linksdll/linksdll.vcproj +++ b/windows_vnet/test/linksdll/linksdll.vcproj @@ -89,7 +89,7 @@ ProgramDataBaseFileName=".\../../../test/linksdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/mount/mount.vcproj b/windows_vnet/test/mount/mount.vcproj index 2d6fb2a..2420a56 100644 --- a/windows_vnet/test/mount/mount.vcproj +++ b/windows_vnet/test/mount/mount.vcproj @@ -148,7 +148,7 @@ ProgramDataBaseFileName=".\../../../test/mount/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -158,7 +158,7 @@ OutputFile=".\../../../test/mount/Debug/mount.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/mount/Debug/mount.pdb" @@ -222,7 +222,7 @@ OutputFile=".\../../../test/mount/Release/mount.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/mount/Release/mount.pdb" SubSystem="1" diff --git a/windows_vnet/test/mountdll/mountdll.vcproj b/windows_vnet/test/mountdll/mountdll.vcproj index c095c1b..a89fe2f 100644 --- a/windows_vnet/test/mountdll/mountdll.vcproj +++ b/windows_vnet/test/mountdll/mountdll.vcproj @@ -148,7 +148,7 @@ ProgramDataBaseFileName=".\../../../test/mountdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/mtime/mtime.vcproj b/windows_vnet/test/mtime/mtime.vcproj index e758c2f..78c3621 100644 --- a/windows_vnet/test/mtime/mtime.vcproj +++ b/windows_vnet/test/mtime/mtime.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/mtime/Release/mtime.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/mtime/Release/mtime.pdb" SubSystem="1" @@ -211,7 +211,7 @@ ProgramDataBaseFileName=".\../../../test/mtime/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -221,7 +221,7 @@ OutputFile=".\../../../test/mtime/Debug/mtime.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/mtime/Debug/mtime.pdb" diff --git a/windows_vnet/test/mtimedll/mtimedll.vcproj b/windows_vnet/test/mtimedll/mtimedll.vcproj index 5f85975..a586aff 100644 --- a/windows_vnet/test/mtimedll/mtimedll.vcproj +++ b/windows_vnet/test/mtimedll/mtimedll.vcproj @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../test/mtimedll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/ntypes/ntypes.vcproj b/windows_vnet/test/ntypes/ntypes.vcproj index 93acb17..a8f94c0 100644 --- a/windows_vnet/test/ntypes/ntypes.vcproj +++ b/windows_vnet/test/ntypes/ntypes.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/ntypes/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../test/ntypes/Debug/ntypes.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/ntypes/Debug/ntypes.pdb" @@ -106,7 +106,7 @@ OutputFile=".\../../../test/ntypes/Release/ntypes.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/ntypes/Release/ntypes.pdb" SubSystem="1" diff --git a/windows_vnet/test/ntypesdll/ntypesdll.vcproj b/windows_vnet/test/ntypesdll/ntypesdll.vcproj index 3b1bbed..1167f7e 100644 --- a/windows_vnet/test/ntypesdll/ntypesdll.vcproj +++ b/windows_vnet/test/ntypesdll/ntypesdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/ntypesdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../test/ntypesdll/Debug/ntypesdll.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/ntypesdll/Debug/ntypesdll.pdb" @@ -106,7 +106,7 @@ OutputFile=".\../../../test/ntypesdll/Release/ntypesdll.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/ntypesdll/Release/ntypesdll.pdb" SubSystem="1" diff --git a/windows_vnet/test/objcopy/objcopy.vcproj b/windows_vnet/test/objcopy/objcopy.vcproj index e5dfcc1..74cdadf 100644 --- a/windows_vnet/test/objcopy/objcopy.vcproj +++ b/windows_vnet/test/objcopy/objcopy.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/objcopy/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -104,7 +104,7 @@ OutputFile=".\../../../test/objcopy/Release/objcopy.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/objcopy/Release/objcopy.pdb" SubSystem="1" diff --git a/windows_vnet/test/objcopydll/objcopydll.vcproj b/windows_vnet/test/objcopydll/objcopydll.vcproj index ed29e0f..df8d9fd 100644 --- a/windows_vnet/test/objcopydll/objcopydll.vcproj +++ b/windows_vnet/test/objcopydll/objcopydll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/objcopydll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/ohdr/ohdr.vcproj b/windows_vnet/test/ohdr/ohdr.vcproj index a241522..0e55f3e 100644 --- a/windows_vnet/test/ohdr/ohdr.vcproj +++ b/windows_vnet/test/ohdr/ohdr.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/ohdr/Release/ohdr.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/ohdr/Release/ohdr.pdb" SubSystem="1" @@ -211,7 +211,7 @@ ProgramDataBaseFileName=".\../../../test/ohdr/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -221,7 +221,7 @@ OutputFile=".\../../../test/ohdr/Debug/ohdr.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/ohdr/Debug/ohdr.pdb" diff --git a/windows_vnet/test/ohdrdll/ohdrdll.vcproj b/windows_vnet/test/ohdrdll/ohdrdll.vcproj index 6893bf6..a37e23d 100644 --- a/windows_vnet/test/ohdrdll/ohdrdll.vcproj +++ b/windows_vnet/test/ohdrdll/ohdrdll.vcproj @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../test/ohdrdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/overhead/overhead.vcproj b/windows_vnet/test/overhead/overhead.vcproj index d223a5b..541361a 100644 --- a/windows_vnet/test/overhead/overhead.vcproj +++ b/windows_vnet/test/overhead/overhead.vcproj @@ -160,7 +160,7 @@ OutputFile=".\../../../test/overhead/Release/overhead.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/overhead/Release/overhead.pdb" SubSystem="1" TargetMachine="1"/> @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../test/overhead/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -220,7 +220,7 @@ OutputFile=".\../../../test/overhead/Debug/overhead.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/overhead/Debug/overhead.pdb" SubSystem="1" diff --git a/windows_vnet/test/overheaddll/overheaddll.vcproj b/windows_vnet/test/overheaddll/overheaddll.vcproj index 58a95b6..8185028 100644 --- a/windows_vnet/test/overheaddll/overheaddll.vcproj +++ b/windows_vnet/test/overheaddll/overheaddll.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../test/overheaddll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/pool/pool.vcproj b/windows_vnet/test/pool/pool.vcproj index 301d16d..08105f2 100644 --- a/windows_vnet/test/pool/pool.vcproj +++ b/windows_vnet/test/pool/pool.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/pool/Release/pool.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/pool/Release/pool.pdb" SubSystem="1" @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../test/pool/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -105,7 +105,7 @@ OutputFile=".\../../../test/pool/Debug/pool.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/pool/Debug/pool.pdb" diff --git a/windows_vnet/test/pooldll/pooldll.vcproj b/windows_vnet/test/pooldll/pooldll.vcproj index 27118b9..240e432 100644 --- a/windows_vnet/test/pooldll/pooldll.vcproj +++ b/windows_vnet/test/pooldll/pooldll.vcproj @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../test/pooldll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/reserved/reserved.vcproj b/windows_vnet/test/reserved/reserved.vcproj index d2cd2e7..440ba33 100644 --- a/windows_vnet/test/reserved/reserved.vcproj +++ b/windows_vnet/test/reserved/reserved.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/reserved/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../test/reserved/Debug/reserved.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/reserved/Debug/reserved.pdb" SubSystem="1" @@ -105,7 +105,7 @@ OutputFile=".\../../../test/reserved/Release/reserved.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/reserved/Release/reserved.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/test/reserveddll/reserveddll.vcproj b/windows_vnet/test/reserveddll/reserveddll.vcproj index 79d4884..8d7c353 100644 --- a/windows_vnet/test/reserveddll/reserveddll.vcproj +++ b/windows_vnet/test/reserveddll/reserveddll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/reserveddll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/set_extent/set_extent.vcproj b/windows_vnet/test/set_extent/set_extent.vcproj index b78a75d..553ad3d 100644 --- a/windows_vnet/test/set_extent/set_extent.vcproj +++ b/windows_vnet/test/set_extent/set_extent.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/set_extent/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../test/set_extent/Debug/set_extent.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/set_extent/Debug/set_extent.pdb" SubSystem="1" @@ -105,7 +105,7 @@ OutputFile=".\../../../test/set_extent/Release/set_extent.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../test/set_extent/Release/set_extent.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/test/set_extentdll/set_extentdll.vcproj b/windows_vnet/test/set_extentdll/set_extentdll.vcproj index 0005821..df80993 100644 --- a/windows_vnet/test/set_extentdll/set_extentdll.vcproj +++ b/windows_vnet/test/set_extentdll/set_extentdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/set_extentdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/stab/stab.vcproj b/windows_vnet/test/stab/stab.vcproj index bc94d40..59d71f4 100644 --- a/windows_vnet/test/stab/stab.vcproj +++ b/windows_vnet/test/stab/stab.vcproj @@ -89,7 +89,7 @@ ProgramDataBaseFileName=".\../../../test/stab/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -99,7 +99,7 @@ OutputFile=".\../../../test/stab/Debug/stab.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/stab/Debug/stab.pdb" @@ -163,7 +163,7 @@ OutputFile=".\../../../test/stab/Release/stab.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/stab/Release/stab.pdb" SubSystem="1" diff --git a/windows_vnet/test/stabdll/stabdll.vcproj b/windows_vnet/test/stabdll/stabdll.vcproj index 9f8d905..5fec3a0 100644 --- a/windows_vnet/test/stabdll/stabdll.vcproj +++ b/windows_vnet/test/stabdll/stabdll.vcproj @@ -89,7 +89,7 @@ ProgramDataBaseFileName=".\../../../test/stabdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/tellub/tellub.vcproj b/windows_vnet/test/tellub/tellub.vcproj index f8369a4..e798d38 100644 --- a/windows_vnet/test/tellub/tellub.vcproj +++ b/windows_vnet/test/tellub/tellub.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../test/tellub/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -103,7 +103,7 @@ OutputFile=".\../../../test/tellub/Debug/tellub.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/tellub/Debug/tellub.pdb" SubSystem="1" diff --git a/windows_vnet/test/testhdf5/testhdf5.vcproj b/windows_vnet/test/testhdf5/testhdf5.vcproj index b9e521b..b5a94fd 100644 --- a/windows_vnet/test/testhdf5/testhdf5.vcproj +++ b/windows_vnet/test/testhdf5/testhdf5.vcproj @@ -148,7 +148,7 @@ ProgramDataBaseFileName=".\../../../test/testhdf5/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -158,7 +158,7 @@ OutputFile=".\../../../test/testhdf5/Debug/testhdf5.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/testhdf5/Debug/testhdf5.pdb" @@ -222,7 +222,7 @@ OutputFile=".\../../../test/testhdf5/Release/testhdf5.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/testhdf5/Release/testhdf5.pdb" SubSystem="1" diff --git a/windows_vnet/test/testhdf5dll/testhdf5dll.vcproj b/windows_vnet/test/testhdf5dll/testhdf5dll.vcproj index a15e773..febec4f 100644 --- a/windows_vnet/test/testhdf5dll/testhdf5dll.vcproj +++ b/windows_vnet/test/testhdf5dll/testhdf5dll.vcproj @@ -208,7 +208,7 @@ ProgramDataBaseFileName=".\../../../test/testhdf5dll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/ttsafedll/ttsafedll.vcproj b/windows_vnet/test/ttsafedll/ttsafedll.vcproj index d04378e..6c3f910 100644 --- a/windows_vnet/test/ttsafedll/ttsafedll.vcproj +++ b/windows_vnet/test/ttsafedll/ttsafedll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/ttsafedll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/unlink/unlink.vcproj b/windows_vnet/test/unlink/unlink.vcproj index 4459ae3..ab2d088 100644 --- a/windows_vnet/test/unlink/unlink.vcproj +++ b/windows_vnet/test/unlink/unlink.vcproj @@ -160,7 +160,7 @@ OutputFile=".\../../../test/unlink/Release/unlink.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/unlink/Release/unlink.pdb" SubSystem="1" @@ -211,7 +211,7 @@ ProgramDataBaseFileName=".\../../../test/unlink/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -221,7 +221,7 @@ OutputFile=".\../../../test/unlink/Debug/unlink.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/unlink/Debug/unlink.pdb" diff --git a/windows_vnet/test/unlinkdll/unlinkdll.vcproj b/windows_vnet/test/unlinkdll/unlinkdll.vcproj index b993529..7b5e8ec 100644 --- a/windows_vnet/test/unlinkdll/unlinkdll.vcproj +++ b/windows_vnet/test/unlinkdll/unlinkdll.vcproj @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../test/unlinkdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/test/vfd/vfd.vcproj b/windows_vnet/test/vfd/vfd.vcproj index 8ed82a8..0b12b66 100644 --- a/windows_vnet/test/vfd/vfd.vcproj +++ b/windows_vnet/test/vfd/vfd.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../test/vfd/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../test/vfd/Debug/vfd.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/vfd/Debug/vfd.pdb" @@ -106,7 +106,7 @@ OutputFile=".\../../../test/vfd/release/vfd.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/vfd/release/vfd.pdb" SubSystem="1" diff --git a/windows_vnet/test/vfddll/vfddll.vcproj b/windows_vnet/test/vfddll/vfddll.vcproj index 2ce9831..02fe337 100644 --- a/windows_vnet/test/vfddll/vfddll.vcproj +++ b/windows_vnet/test/vfddll/vfddll.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../test/vfddll/release/vfddll.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" ProgramDatabaseFile=".\../../../test/vfddll/release/vfddll.pdb" SubSystem="1" @@ -95,7 +95,7 @@ ProgramDataBaseFileName=".\../../../test/vfddll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -105,7 +105,7 @@ OutputFile=".\../../../test/vfddll/Debug/vfddll.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../test/vfddll/Debug/vfddll.pdb" diff --git a/windows_vnet/tools/h5copy/h5copy.vcproj b/windows_vnet/tools/h5copy/h5copy.vcproj index 1493f62..ef5f659 100644 --- a/windows_vnet/tools/h5copy/h5copy.vcproj +++ b/windows_vnet/tools/h5copy/h5copy.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../tools/h5copy/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../tools/h5copy/Debug/h5copy.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../tools/h5copy/Debug/h5copy.pdb" SubSystem="1" @@ -105,7 +105,7 @@ OutputFile=".\../../../tools/h5copy/Release/h5copy.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../tools/h5copy/Release/h5copy.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/tools/h5debug/h5debug.vcproj b/windows_vnet/tools/h5debug/h5debug.vcproj index 5f6d5a1..c42ddf8 100644 --- a/windows_vnet/tools/h5debug/h5debug.vcproj +++ b/windows_vnet/tools/h5debug/h5debug.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../tools/h5debug/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -41,7 +41,7 @@ OutputFile=".\../../../tools/h5debug/Debug/h5debug.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../tools/h5debug/Debug/h5debug.pdb" SubSystem="1" @@ -221,7 +221,7 @@ OutputFile=".\../../../tools/h5debug/Release/h5debug.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../tools/h5debug/Release/h5debug.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/tools/h5debugdll/h5debugdll.vcproj b/windows_vnet/tools/h5debugdll/h5debugdll.vcproj index faf5db7..d90b09f 100644 --- a/windows_vnet/tools/h5debugdll/h5debugdll.vcproj +++ b/windows_vnet/tools/h5debugdll/h5debugdll.vcproj @@ -208,7 +208,7 @@ ProgramDataBaseFileName=".\../../../tools/h5debugdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/h5diff/h5diff.vcproj b/windows_vnet/tools/h5diff/h5diff.vcproj index 47c04d0..0c882dc 100644 --- a/windows_vnet/tools/h5diff/h5diff.vcproj +++ b/windows_vnet/tools/h5diff/h5diff.vcproj @@ -33,7 +33,7 @@ BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -43,7 +43,7 @@ OutputFile=".\../../../tools/h5diff/Debug/h5diff.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../tools/h5diff/Debug/h5diff.pdb" SubSystem="1" @@ -106,7 +106,7 @@ OutputFile=".\../../../tools/h5diff/Release/h5diff.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../tools/h5diff/Release/h5diff.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/tools/h5diffdll/h5diffdll.vcproj b/windows_vnet/tools/h5diffdll/h5diffdll.vcproj index e314e9e..9f04a3d 100644 --- a/windows_vnet/tools/h5diffdll/h5diffdll.vcproj +++ b/windows_vnet/tools/h5diffdll/h5diffdll.vcproj @@ -92,7 +92,7 @@ ProgramDataBaseFileName=".\../../../tools/h5diffdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/h5dump/h5dump.vcproj b/windows_vnet/tools/h5dump/h5dump.vcproj index 4efdf07..374f51f 100644 --- a/windows_vnet/tools/h5dump/h5dump.vcproj +++ b/windows_vnet/tools/h5dump/h5dump.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../tools/h5dump/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -41,7 +41,7 @@ OutputFile=".\../../../tools/h5dump/Debug/h5dump.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../tools/h5dump/Debug/h5dump.pdb" SubSystem="1" @@ -104,7 +104,7 @@ OutputFile=".\../../../tools/h5dump/Release/h5dump.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../tools/h5dump/Release/h5dump.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/tools/h5dumpdll/h5dumpdll.vcproj b/windows_vnet/tools/h5dumpdll/h5dumpdll.vcproj index 337b1fe..a1d600d 100644 --- a/windows_vnet/tools/h5dumpdll/h5dumpdll.vcproj +++ b/windows_vnet/tools/h5dumpdll/h5dumpdll.vcproj @@ -210,7 +210,7 @@ ProgramDataBaseFileName=".\../../../tools/h5dumpdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/h5import/h5import.vcproj b/windows_vnet/tools/h5import/h5import.vcproj index 6e0bfbf..ef293b6 100644 --- a/windows_vnet/tools/h5import/h5import.vcproj +++ b/windows_vnet/tools/h5import/h5import.vcproj @@ -40,7 +40,7 @@ OutputFile=".\../../../tools/h5import/Release/h5import.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../tools/h5import/Release/h5import.pdb" SubSystem="1" TargetMachine="1"/> @@ -207,7 +207,7 @@ ProgramDataBaseFileName=".\../../../tools/h5import/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -217,7 +217,7 @@ OutputFile=".\../../../tools/h5import/Debug/h5import.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../tools/h5import/Debug/h5import.pdb" SubSystem="1" diff --git a/windows_vnet/tools/h5importdll/h5importdll.vcproj b/windows_vnet/tools/h5importdll/h5importdll.vcproj index 759c965..99bd4fc 100644 --- a/windows_vnet/tools/h5importdll/h5importdll.vcproj +++ b/windows_vnet/tools/h5importdll/h5importdll.vcproj @@ -205,7 +205,7 @@ ProgramDataBaseFileName=".\../../../tools/h5importdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/h5jam/h5jam.vcproj b/windows_vnet/tools/h5jam/h5jam.vcproj index c871c84..3295110 100644 --- a/windows_vnet/tools/h5jam/h5jam.vcproj +++ b/windows_vnet/tools/h5jam/h5jam.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../tools/h5jam/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -103,7 +103,7 @@ OutputFile=".\../../../tools/h5jam/Debug/h5jam.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../tools/h5jam/Debug/h5jam.pdb" SubSystem="1" diff --git a/windows_vnet/tools/h5ls/h5ls.vcproj b/windows_vnet/tools/h5ls/h5ls.vcproj index efae8be..846449d 100644 --- a/windows_vnet/tools/h5ls/h5ls.vcproj +++ b/windows_vnet/tools/h5ls/h5ls.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../tools/h5ls/Release/h5ls.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../tools/h5ls/Release/h5ls.pdb" SubSystem="1" TargetMachine="1"/> @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../tools/h5ls/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -103,7 +103,7 @@ OutputFile=".\../../../tools/h5ls/Debug/h5ls.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../tools/h5ls/Debug/h5ls.pdb" SubSystem="1" diff --git a/windows_vnet/tools/h5lsdll/h5lsdll.vcproj b/windows_vnet/tools/h5lsdll/h5lsdll.vcproj index 8763ab8..8939425 100644 --- a/windows_vnet/tools/h5lsdll/h5lsdll.vcproj +++ b/windows_vnet/tools/h5lsdll/h5lsdll.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../tools/h5lsdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/h5mkgrp/h5mkgrp.vcproj b/windows_vnet/tools/h5mkgrp/h5mkgrp.vcproj index de42ccc..f23e04b 100644 --- a/windows_vnet/tools/h5mkgrp/h5mkgrp.vcproj +++ b/windows_vnet/tools/h5mkgrp/h5mkgrp.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../tools/h5mkgrp/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/h5repack/h5repack.vcproj b/windows_vnet/tools/h5repack/h5repack.vcproj index 60568b1..8d18ee9 100644 --- a/windows_vnet/tools/h5repack/h5repack.vcproj +++ b/windows_vnet/tools/h5repack/h5repack.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../tools/h5repack/Release/h5repack.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../tools/h5repack/Release/h5repack.pdb" SubSystem="1" TargetMachine="1"/> @@ -95,7 +95,7 @@ BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -106,7 +106,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../tools/h5repack/Debug/h5repack.pdb" SubSystem="1" diff --git a/windows_vnet/tools/h5repackdll/h5repackdll.vcproj b/windows_vnet/tools/h5repackdll/h5repackdll.vcproj index ec71424..4ccc300 100644 --- a/windows_vnet/tools/h5repackdll/h5repackdll.vcproj +++ b/windows_vnet/tools/h5repackdll/h5repackdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../tools/h5repackdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/h5repart/h5repart.vcproj b/windows_vnet/tools/h5repart/h5repart.vcproj index c3782e5..53b3c7f 100644 --- a/windows_vnet/tools/h5repart/h5repart.vcproj +++ b/windows_vnet/tools/h5repart/h5repart.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../tools/h5repart/Release/h5repart.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../tools/h5repart/Release/h5repart.pdb" SubSystem="1" TargetMachine="1"/> @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../tools/h5repart/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -103,7 +103,7 @@ OutputFile=".\../../../tools/h5repart/Debug/h5repart.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../tools/h5repart/Debug/h5repart.pdb" SubSystem="1" diff --git a/windows_vnet/tools/h5repartdll/h5repartdll.vcproj b/windows_vnet/tools/h5repartdll/h5repartdll.vcproj index 61e63e5..524cf7b 100644 --- a/windows_vnet/tools/h5repartdll/h5repartdll.vcproj +++ b/windows_vnet/tools/h5repartdll/h5repartdll.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../tools/h5repartdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/h5stat/h5stat.vcproj b/windows_vnet/tools/h5stat/h5stat.vcproj index 5d7deb1..860e2bb 100644 --- a/windows_vnet/tools/h5stat/h5stat.vcproj +++ b/windows_vnet/tools/h5stat/h5stat.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../tools/h5stat/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/h5statdll/h5statdll.vcproj b/windows_vnet/tools/h5statdll/h5statdll.vcproj index 6150228..b819924 100644 --- a/windows_vnet/tools/h5statdll/h5statdll.vcproj +++ b/windows_vnet/tools/h5statdll/h5statdll.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../tools/h5statdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/h5unjam/h5unjam.vcproj b/windows_vnet/tools/h5unjam/h5unjam.vcproj index 9af9423..eb325d9 100644 --- a/windows_vnet/tools/h5unjam/h5unjam.vcproj +++ b/windows_vnet/tools/h5unjam/h5unjam.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../tools/h5unjam/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -103,7 +103,7 @@ OutputFile=".\../../../tools/h5unjam/Debug/h5unjam.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../tools/h5unjam/Debug/h5unjam.pdb" SubSystem="1" diff --git a/windows_vnet/tools/talign/talign.vcproj b/windows_vnet/tools/talign/talign.vcproj index 95c42b6..1c667cd 100644 --- a/windows_vnet/tools/talign/talign.vcproj +++ b/windows_vnet/tools/talign/talign.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../tools/talign/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../tools/talign/Debug/talign.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../tools/talign/Debug/talign.pdb" SubSystem="1" @@ -105,7 +105,7 @@ OutputFile=".\../../../tools/talign/Release/talign.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../tools/talign/Release/talign.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/tools/taligndll/taligndll.vcproj b/windows_vnet/tools/taligndll/taligndll.vcproj index cb54694..7a1eb10 100644 --- a/windows_vnet/tools/taligndll/taligndll.vcproj +++ b/windows_vnet/tools/taligndll/taligndll.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../tools/taligndll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/testfiles/binread/binread.vcproj b/windows_vnet/tools/testfiles/binread/binread.vcproj index 8ee31a0..f55c541 100644 --- a/windows_vnet/tools/testfiles/binread/binread.vcproj +++ b/windows_vnet/tools/testfiles/binread/binread.vcproj @@ -89,7 +89,7 @@ ProgramDataBaseFileName=".\../../../../tools/testfiles/binread/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4"/> + DebugInformationFormat="3"/> @@ -94,7 +94,7 @@ ProgramDataBaseFileName=".\../../../../tools/testfiles/h5difftst/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -104,7 +104,7 @@ OutputFile=".\../../../../tools/testfiles/h5difftst/Debug/h5difftst.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../tools/testfiles/h5difftst/Debug/h5difftst.pdb" SubSystem="1" diff --git a/windows_vnet/tools/testfiles/h5dumptst/h5dumptst.vcproj b/windows_vnet/tools/testfiles/h5dumptst/h5dumptst.vcproj index 7ea2947..76f95db 100644 --- a/windows_vnet/tools/testfiles/h5dumptst/h5dumptst.vcproj +++ b/windows_vnet/tools/testfiles/h5dumptst/h5dumptst.vcproj @@ -31,7 +31,7 @@ ProgramDataBaseFileName=".\../../../../tools/testfiles/h5dumptst/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -41,7 +41,7 @@ OutputFile=".\../../../../tools/testfiles/h5dumptst/Debug/h5dumptst.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../tools/testfiles/h5dumptst/Debug/h5dumptst.pdb" SubSystem="1" @@ -104,7 +104,7 @@ OutputFile=".\../../../../tools/testfiles/h5dumptst/Release/h5dumptst.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libcd.lib" + IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\../../../../tools/testfiles/h5dumptst/Release/h5dumptst.pdb" SubSystem="1" TargetMachine="1"/> diff --git a/windows_vnet/tools/testfiles/h5importtst/h5importtst.vcproj b/windows_vnet/tools/testfiles/h5importtst/h5importtst.vcproj index e476e57..fc85439 100644 --- a/windows_vnet/tools/testfiles/h5importtst/h5importtst.vcproj +++ b/windows_vnet/tools/testfiles/h5importtst/h5importtst.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../tools/testfiles/h5importtst/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/testfiles/h5jamtst/h5jamtst.vcproj b/windows_vnet/tools/testfiles/h5jamtst/h5jamtst.vcproj index bac1195..7773bda 100644 --- a/windows_vnet/tools/testfiles/h5jamtst/h5jamtst.vcproj +++ b/windows_vnet/tools/testfiles/h5jamtst/h5jamtst.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../tools/testfiles/h5jamtst/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -42,7 +42,7 @@ OutputFile=".\../../../../tools/testfiles/h5jamtst/Debug/h5jamtst.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../tools/testfiles/h5jamtst/Debug/h5jamtst.pdb" SubSystem="1" diff --git a/windows_vnet/tools/testfiles/h5repacktst/h5repacktst.vcproj b/windows_vnet/tools/testfiles/h5repacktst/h5repacktst.vcproj index c73cbfd..834b30c 100644 --- a/windows_vnet/tools/testfiles/h5repacktst/h5repacktst.vcproj +++ b/windows_vnet/tools/testfiles/h5repacktst/h5repacktst.vcproj @@ -33,7 +33,7 @@ BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -43,7 +43,7 @@ OutputFile=".\../../../../tools/testfiles/h5repacktst/Debug/h5repacktst.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" ForceSymbolReferences="_gethostname@8" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../tools/testfiles/h5repacktst/Debug/h5repacktst.pdb" diff --git a/windows_vnet/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj b/windows_vnet/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj index afc7bfc..0c41299 100644 --- a/windows_vnet/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj +++ b/windows_vnet/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../tools/testfiles/h5repart_gentest/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/testfiles/h5reparttst/h5reparttst.vcproj b/windows_vnet/tools/testfiles/h5reparttst/h5reparttst.vcproj index 6684fef..47bfa7e 100644 --- a/windows_vnet/tools/testfiles/h5reparttst/h5reparttst.vcproj +++ b/windows_vnet/tools/testfiles/h5reparttst/h5reparttst.vcproj @@ -32,7 +32,7 @@ ProgramDataBaseFileName=".\../../../../tools/testfiles/h5reparttst/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj b/windows_vnet/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj index 1b3a1f1..10628bb 100644 --- a/windows_vnet/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj +++ b/windows_vnet/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj @@ -93,7 +93,7 @@ ProgramDataBaseFileName=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -103,7 +103,7 @@ OutputFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/testh5repack_detect_szip.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="libc.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/testh5repack_detect_szip.pdb" SubSystem="1" diff --git a/windows_vnet/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj b/windows_vnet/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj index 8ab4913..421922f 100644 --- a/windows_vnet/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj +++ b/windows_vnet/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj @@ -92,7 +92,7 @@ ProgramDataBaseFileName=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/toolslib/toolslib.vcproj b/windows_vnet/tools/toolslib/toolslib.vcproj index 25fb423..cd387ec 100644 --- a/windows_vnet/tools/toolslib/toolslib.vcproj +++ b/windows_vnet/tools/toolslib/toolslib.vcproj @@ -30,7 +30,7 @@ ProgramDataBaseFileName=".\..\..\..\tools\toolslib\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="1" + DebugInformationFormat="3" CompileAs="0"/> @@ -127,7 +127,7 @@ ProgramDataBaseFileName=".\toolsli0/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="1" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/windows_vnet/tools/toolslibD/toolslibD.vcproj b/windows_vnet/tools/toolslibD/toolslibD.vcproj index 7cd8024..ec19d40 100644 --- a/windows_vnet/tools/toolslibD/toolslibD.vcproj +++ b/windows_vnet/tools/toolslibD/toolslibD.vcproj @@ -79,7 +79,7 @@ ProgramDataBaseFileName=".\..\..\..\tools\toolslibD\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="1" + DebugInformationFormat="3" CompileAs="0"/> @@ -127,7 +127,7 @@ ProgramDataBaseFileName=".\toolslib/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="1" + DebugInformationFormat="3" CompileAs="0"/> -- cgit v0.12