]> git.proxmox.com Git - ceph.git/commitdiff
update sources to v12.2.4
authorFabian Grünbichler <f.gruenbichler@proxmox.com>
Wed, 28 Feb 2018 13:41:53 +0000 (14:41 +0100)
committerFabian Grünbichler <f.gruenbichler@proxmox.com>
Wed, 28 Feb 2018 13:43:03 +0000 (14:43 +0100)
482 files changed:
Makefile
ceph/CMakeLists.txt
ceph/alpine/APKBUILD
ceph/ceph.spec
ceph/cmake/modules/BuildBoost.cmake
ceph/debian/changelog
ceph/doc/install/manual-deployment.rst
ceph/doc/man/8/ceph.rst
ceph/doc/rados/command/list-inconsistent-obj.json
ceph/qa/standalone/ceph-helpers.sh
ceph/qa/standalone/scrub/osd-scrub-repair.sh
ceph/qa/workunits/cephtool/test.sh
ceph/src/.git_version
ceph/src/boost/libs/qvm/bld/gen/Jamfile.v2
ceph/src/boost/libs/qvm/bld/gen/gen.vcxproj
ceph/src/boost/libs/qvm/bld/gen/gen.vcxproj.filters
ceph/src/boost/libs/qvm/bld/qvm.sln
ceph/src/boost/libs/qvm/bld/test/access_m_fail1.vcxproj
ceph/src/boost/libs/qvm/bld/test/access_m_fail1.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/access_m_fail2.vcxproj
ceph/src/boost/libs/qvm/bld/test/access_m_fail2.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/access_m_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/access_m_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/access_q_fail.vcxproj
ceph/src/boost/libs/qvm/bld/test/access_q_fail.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/access_q_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/access_q_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/access_v_fail1.vcxproj
ceph/src/boost/libs/qvm/bld/test/access_v_fail1.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/access_v_fail2.vcxproj
ceph/src/boost/libs/qvm/bld/test/access_v_fail2.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/access_v_fail3.vcxproj
ceph/src/boost/libs/qvm/bld/test/access_v_fail3.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/access_v_fail4.vcxproj
ceph/src/boost/libs/qvm/bld/test/access_v_fail4.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/access_v_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/access_v_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/all tests.vcxproj
ceph/src/boost/libs/qvm/bld/test/assign_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/assign_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/cmp_mm_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/cmp_mm_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/cmp_qq_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/cmp_qq_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/cmp_vv_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/cmp_vv_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/col_mat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/col_mat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/col_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/col_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/conjugate_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/conjugate_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/convert_to_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/convert_to_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/cross_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/cross_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/deduce_matrix_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/deduce_matrix_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/deduce_scalar_fail1.vcxproj
ceph/src/boost/libs/qvm/bld/test/deduce_scalar_fail1.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/deduce_scalar_fail2.vcxproj
ceph/src/boost/libs/qvm/bld/test/deduce_scalar_fail2.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/deduce_scalar_fail3.vcxproj
ceph/src/boost/libs/qvm/bld/test/deduce_scalar_fail3.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/deduce_scalar_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/deduce_scalar_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/deduce_vector_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/deduce_vector_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/del_col_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/del_col_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/del_row_col_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/del_row_col_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/del_row_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/del_row_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/determinant_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/determinant_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/diag_mat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/diag_mat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/diag_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/diag_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/div_eq_ms_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/div_eq_ms_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/div_eq_qs_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/div_eq_qs_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/div_eq_vs_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/div_eq_vs_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/div_ms_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/div_ms_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/div_qs_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/div_qs_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/div_vs_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/div_vs_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/dot_qq_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/dot_qq_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/dot_vv_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/dot_vv_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/eq_mm_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/eq_mm_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/eq_qq_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/eq_qq_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/eq_vv_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/eq_vv_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/identity_mat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/identity_mat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/identity_quat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/identity_quat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/interop_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/interop_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/inverse_m_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/inverse_m_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/inverse_q_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/inverse_q_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mag_q_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mag_q_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mag_sqr_q_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mag_sqr_q_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mag_sqr_v_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mag_sqr_v_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mag_v_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mag_v_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mat_index_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mat_index_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mat_traits_array_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mat_traits_array_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/minus_eq_mm_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/minus_eq_mm_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/minus_eq_qq_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/minus_eq_qq_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/minus_eq_vv_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/minus_eq_vv_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/minus_m_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/minus_m_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/minus_mm_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/minus_mm_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/minus_q_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/minus_q_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/minus_qq_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/minus_qq_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/minus_v_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/minus_v_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/minus_vv_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/minus_vv_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_eq_mm_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_eq_mm_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_eq_ms_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_eq_ms_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_eq_qq_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_eq_qq_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_eq_qs_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_eq_qs_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_eq_vs_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_eq_vs_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_mm_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_mm_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_ms_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_ms_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_mv_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_mv_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_qq_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_qq_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_qs_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_qs_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_qv_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_qv_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_vm_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_vm_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/mul_vs_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/mul_vs_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/neg_col_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/neg_col_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/neg_row_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/neg_row_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/normalize_q_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/normalize_q_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/normalize_v_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/normalize_v_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/plus_eq_mm_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/plus_eq_mm_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/plus_eq_qq_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/plus_eq_qq_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/plus_eq_vv_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/plus_eq_vv_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/plus_mm_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/plus_mm_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/plus_qq_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/plus_qq_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/plus_vv_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/plus_vv_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/projection_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/projection_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/quat_traits_array_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/quat_traits_array_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/rot_mat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/rot_mat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/rot_quat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/rot_quat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/rotx_mat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/rotx_mat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/rotx_quat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/rotx_quat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/roty_mat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/roty_mat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/roty_quat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/roty_quat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/rotz_mat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/rotz_mat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/rotz_quat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/rotz_quat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/row_mat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/row_mat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/row_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/row_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/scalar_cast_m_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/scalar_cast_m_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/scalar_cast_q_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/scalar_cast_q_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/scalar_cast_v_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/scalar_cast_v_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/scalar_traits_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/scalar_traits_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/slerp_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/slerp_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swap_cols_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/swap_cols_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swap_rows_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/swap_rows_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle2_fail2.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle2_fail2.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle2_fail3.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle2_fail3.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle2_fail4.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle2_fail4.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle2_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle2_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle3_fail2.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle3_fail2.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle3_fail3.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle3_fail3.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle3_fail4.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle3_fail4.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle3_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle3_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle4_fail2.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle4_fail2.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle4_fail3.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle4_fail3.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle4_fail4.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle4_fail4.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle4_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle4_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/swizzle_const_fail.vcxproj
ceph/src/boost/libs/qvm/bld/test/swizzle_const_fail.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/to_string_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/to_string_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/transform_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/transform_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/translation_mat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/translation_mat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/translation_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/translation_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/transpose_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/transpose_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/vec_index_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/vec_index_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/vec_traits_array_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/vec_traits_array_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/zero_mat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/zero_mat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/zero_quat_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/zero_quat_test.vcxproj.filters
ceph/src/boost/libs/qvm/bld/test/zero_vec_test.vcxproj
ceph/src/boost/libs/qvm/bld/test/zero_vec_test.vcxproj.filters
ceph/src/boost/libs/qvm/index.html
ceph/src/boost/libs/qvm/meta/libraries.json
ceph/src/boost/libs/qvm/test/access_m_fail1.cpp
ceph/src/boost/libs/qvm/test/access_m_fail2.cpp
ceph/src/boost/libs/qvm/test/access_m_test.cpp
ceph/src/boost/libs/qvm/test/access_q_fail.cpp
ceph/src/boost/libs/qvm/test/access_q_test.cpp
ceph/src/boost/libs/qvm/test/access_v_fail1.cpp
ceph/src/boost/libs/qvm/test/access_v_fail2.cpp
ceph/src/boost/libs/qvm/test/access_v_test.cpp
ceph/src/boost/libs/qvm/test/assign_test.cpp
ceph/src/boost/libs/qvm/test/cmp_mm_test.cpp
ceph/src/boost/libs/qvm/test/cmp_qq_test.cpp
ceph/src/boost/libs/qvm/test/cmp_vv_test.cpp
ceph/src/boost/libs/qvm/test/col_mat_test.cpp
ceph/src/boost/libs/qvm/test/col_test.cpp
ceph/src/boost/libs/qvm/test/conjugate_test.cpp
ceph/src/boost/libs/qvm/test/convert_to_test.cpp
ceph/src/boost/libs/qvm/test/cross_test.cpp
ceph/src/boost/libs/qvm/test/deduce_matrix_test.cpp
ceph/src/boost/libs/qvm/test/deduce_scalar_fail1.cpp
ceph/src/boost/libs/qvm/test/deduce_scalar_fail2.cpp
ceph/src/boost/libs/qvm/test/deduce_scalar_fail3.cpp
ceph/src/boost/libs/qvm/test/deduce_scalar_test.cpp
ceph/src/boost/libs/qvm/test/deduce_vector_test.cpp
ceph/src/boost/libs/qvm/test/del_col_test.cpp
ceph/src/boost/libs/qvm/test/del_row_col_test.cpp
ceph/src/boost/libs/qvm/test/del_row_test.cpp
ceph/src/boost/libs/qvm/test/determinant_test.cpp
ceph/src/boost/libs/qvm/test/diag_mat_test.cpp
ceph/src/boost/libs/qvm/test/diag_test.cpp
ceph/src/boost/libs/qvm/test/div_eq_ms_test.cpp
ceph/src/boost/libs/qvm/test/div_eq_qs_test.cpp
ceph/src/boost/libs/qvm/test/div_eq_vs_test.cpp
ceph/src/boost/libs/qvm/test/div_ms_test.cpp
ceph/src/boost/libs/qvm/test/div_qs_test.cpp
ceph/src/boost/libs/qvm/test/div_vs_test.cpp
ceph/src/boost/libs/qvm/test/dot_qq_test.cpp
ceph/src/boost/libs/qvm/test/dot_vv_test.cpp
ceph/src/boost/libs/qvm/test/eq_mm_test.cpp
ceph/src/boost/libs/qvm/test/eq_qq_test.cpp
ceph/src/boost/libs/qvm/test/eq_vv_test.cpp
ceph/src/boost/libs/qvm/test/gold.hpp
ceph/src/boost/libs/qvm/test/header-test.cpp
ceph/src/boost/libs/qvm/test/identity_mat_test.cpp
ceph/src/boost/libs/qvm/test/identity_quat_test.cpp
ceph/src/boost/libs/qvm/test/interop_test.cpp
ceph/src/boost/libs/qvm/test/inverse_m_test.cpp
ceph/src/boost/libs/qvm/test/inverse_q_test.cpp
ceph/src/boost/libs/qvm/test/mag_q_test.cpp
ceph/src/boost/libs/qvm/test/mag_sqr_q_test.cpp
ceph/src/boost/libs/qvm/test/mag_sqr_v_test.cpp
ceph/src/boost/libs/qvm/test/mag_v_test.cpp
ceph/src/boost/libs/qvm/test/mat_traits_array_test.cpp
ceph/src/boost/libs/qvm/test/minus_eq_mm_test.cpp
ceph/src/boost/libs/qvm/test/minus_eq_qq_test.cpp
ceph/src/boost/libs/qvm/test/minus_eq_vv_test.cpp
ceph/src/boost/libs/qvm/test/minus_m_test.cpp
ceph/src/boost/libs/qvm/test/minus_mm_test.cpp
ceph/src/boost/libs/qvm/test/minus_q_test.cpp
ceph/src/boost/libs/qvm/test/minus_qq_test.cpp
ceph/src/boost/libs/qvm/test/minus_v_test.cpp
ceph/src/boost/libs/qvm/test/minus_vv_test.cpp
ceph/src/boost/libs/qvm/test/mul_eq_mm_test.cpp
ceph/src/boost/libs/qvm/test/mul_eq_ms_test.cpp
ceph/src/boost/libs/qvm/test/mul_eq_qq_test.cpp
ceph/src/boost/libs/qvm/test/mul_eq_qs_test.cpp
ceph/src/boost/libs/qvm/test/mul_eq_vs_test.cpp
ceph/src/boost/libs/qvm/test/mul_mm_test.cpp
ceph/src/boost/libs/qvm/test/mul_ms_test.cpp
ceph/src/boost/libs/qvm/test/mul_mv_test.cpp
ceph/src/boost/libs/qvm/test/mul_qq_test.cpp
ceph/src/boost/libs/qvm/test/mul_qs_test.cpp
ceph/src/boost/libs/qvm/test/mul_qv_test.cpp
ceph/src/boost/libs/qvm/test/mul_vm_test.cpp
ceph/src/boost/libs/qvm/test/mul_vs_test.cpp
ceph/src/boost/libs/qvm/test/neg_col_test.cpp
ceph/src/boost/libs/qvm/test/neg_row_test.cpp
ceph/src/boost/libs/qvm/test/normalize_q_test.cpp
ceph/src/boost/libs/qvm/test/normalize_v_test.cpp
ceph/src/boost/libs/qvm/test/plus_eq_mm_test.cpp
ceph/src/boost/libs/qvm/test/plus_eq_qq_test.cpp
ceph/src/boost/libs/qvm/test/plus_eq_vv_test.cpp
ceph/src/boost/libs/qvm/test/plus_mm_test.cpp
ceph/src/boost/libs/qvm/test/plus_qq_test.cpp
ceph/src/boost/libs/qvm/test/plus_vv_test.cpp
ceph/src/boost/libs/qvm/test/projection_test.cpp
ceph/src/boost/libs/qvm/test/quat_traits_array_test.cpp
ceph/src/boost/libs/qvm/test/rot_mat_test.cpp
ceph/src/boost/libs/qvm/test/rot_quat_test.cpp
ceph/src/boost/libs/qvm/test/rotx_mat_test.cpp
ceph/src/boost/libs/qvm/test/rotx_quat_test.cpp
ceph/src/boost/libs/qvm/test/roty_mat_test.cpp
ceph/src/boost/libs/qvm/test/roty_quat_test.cpp
ceph/src/boost/libs/qvm/test/rotz_mat_test.cpp
ceph/src/boost/libs/qvm/test/rotz_quat_test.cpp
ceph/src/boost/libs/qvm/test/row_mat_test.cpp
ceph/src/boost/libs/qvm/test/row_test.cpp
ceph/src/boost/libs/qvm/test/scalar_cast_m_test.cpp
ceph/src/boost/libs/qvm/test/scalar_cast_q_test.cpp
ceph/src/boost/libs/qvm/test/scalar_cast_v_test.cpp
ceph/src/boost/libs/qvm/test/slerp_test.cpp
ceph/src/boost/libs/qvm/test/swap_cols_test.cpp
ceph/src/boost/libs/qvm/test/swap_rows_test.cpp
ceph/src/boost/libs/qvm/test/swizzle2_test2.cpp
ceph/src/boost/libs/qvm/test/swizzle2_test3.cpp
ceph/src/boost/libs/qvm/test/swizzle2_test4.cpp
ceph/src/boost/libs/qvm/test/swizzle3_test2.cpp
ceph/src/boost/libs/qvm/test/swizzle3_test3.cpp
ceph/src/boost/libs/qvm/test/swizzle3_test4.cpp
ceph/src/boost/libs/qvm/test/swizzle4_test2.cpp
ceph/src/boost/libs/qvm/test/swizzle4_test3.cpp
ceph/src/boost/libs/qvm/test/swizzle4_test4.cpp
ceph/src/boost/libs/qvm/test/swizzle_const_fail.cpp
ceph/src/boost/libs/qvm/test/test_qvm.hpp
ceph/src/boost/libs/qvm/test/to_string_test.cpp
ceph/src/boost/libs/qvm/test/transform_test.cpp
ceph/src/boost/libs/qvm/test/translation_mat_test.cpp
ceph/src/boost/libs/qvm/test/translation_test.cpp
ceph/src/boost/libs/qvm/test/transpose_test.cpp
ceph/src/boost/libs/qvm/test/vec_traits_array_test.cpp
ceph/src/boost/libs/qvm/test/zero_mat_test.cpp
ceph/src/boost/libs/qvm/test/zero_quat_test.cpp
ceph/src/boost/libs/qvm/test/zero_vec_test.cpp
ceph/src/boost/libs/sort/Jamfile.v2
ceph/src/boost/libs/sort/README.md
ceph/src/boost/libs/sort/example/alrbreaker.cpp
ceph/src/boost/libs/sort/example/alreadysorted.cpp
ceph/src/boost/libs/sort/example/binaryalrbreaker.cpp
ceph/src/boost/libs/sort/example/boostrandomgen.cpp
ceph/src/boost/libs/sort/example/caseinsensitive.cpp
ceph/src/boost/libs/sort/example/charstringsample.cpp
ceph/src/boost/libs/sort/example/double.cpp
ceph/src/boost/libs/sort/example/floatfunctorsample.cpp
ceph/src/boost/libs/sort/example/floatsample.cpp
ceph/src/boost/libs/sort/example/generalizedstruct.cpp
ceph/src/boost/libs/sort/example/int64.cpp
ceph/src/boost/libs/sort/example/keyplusdatasample.cpp
ceph/src/boost/libs/sort/example/mostlysorted.cpp
ceph/src/boost/libs/sort/example/parallelint.cpp
ceph/src/boost/libs/sort/example/parallelstring.cpp
ceph/src/boost/libs/sort/example/randomgen.cpp
ceph/src/boost/libs/sort/example/reverseintsample.cpp
ceph/src/boost/libs/sort/example/reversestringfunctorsample.cpp
ceph/src/boost/libs/sort/example/reversestringsample.cpp
ceph/src/boost/libs/sort/example/rightshiftsample.cpp
ceph/src/boost/libs/sort/example/sample.cpp
ceph/src/boost/libs/sort/example/shiftfloatsample.cpp
ceph/src/boost/libs/sort/example/stringfunctorsample.cpp
ceph/src/boost/libs/sort/example/stringsample.cpp
ceph/src/boost/libs/sort/example/wstringsample.cpp
ceph/src/boost/libs/sort/index.html
ceph/src/boost/libs/sort/test/Jamfile.v2
ceph/src/boost/libs/sort/test/float_sort_test.cpp
ceph/src/boost/libs/sort/test/integer_sort_test.cpp
ceph/src/boost/libs/sort/test/sort_detail_test.cpp
ceph/src/boost/libs/sort/test/string_sort_test.cpp
ceph/src/boost/libs/sort/test/test.log
ceph/src/ceph-disk/ceph_disk/main.py
ceph/src/ceph-volume/ceph_volume/api/lvm.py
ceph/src/ceph-volume/ceph_volume/devices/lvm/common.py
ceph/src/ceph-volume/ceph_volume/devices/lvm/create.py
ceph/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
ceph/src/ceph-volume/ceph_volume/devices/lvm/zap.py
ceph/src/ceph-volume/ceph_volume/main.py
ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/test_create.py [new file with mode: 0644]
ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py
ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml [new file with mode: 0644]
ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/test.yml [new file with mode: 0644]
ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/dmcrypt/test.yml [new file with mode: 0644]
ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/dmcrypt/test.yml [new file with mode: 0644]
ceph/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
ceph/src/ceph-volume/ceph_volume/tests/test_main.py
ceph/src/ceph-volume/ceph_volume/tests/util/test_arg_validators.py
ceph/src/ceph-volume/ceph_volume/tests/util/test_prepare.py
ceph/src/ceph-volume/ceph_volume/util/arg_validators.py
ceph/src/ceph-volume/ceph_volume/util/prepare.py
ceph/src/common/scrub_types.h
ceph/src/crush/CrushWrapper.h
ceph/src/include/rados/rados_types.hpp
ceph/src/mgr/ClusterState.cc
ceph/src/mon/OSDMonitor.cc
ceph/src/mon/OSDMonitor.h
ceph/src/osd/PGBackend.cc
ceph/src/rgw/rgw_asio_client.cc
ceph/src/rgw/rgw_asio_client.h
ceph/src/rgw/rgw_cache.cc
ceph/src/rgw/rgw_cache.h
ceph/src/rgw/rgw_civetweb.cc
ceph/src/rgw/rgw_civetweb.h
ceph/src/rgw/rgw_client_io.cc
ceph/src/rgw/rgw_client_io.h
ceph/src/rgw/rgw_common.cc
ceph/src/rgw/rgw_common.h
ceph/src/rgw/rgw_fcgi.cc
ceph/src/rgw/rgw_fcgi.h
ceph/src/rgw/rgw_lib.h
ceph/src/rgw/rgw_loadgen.cc
ceph/src/rgw/rgw_loadgen.h
ceph/src/rgw/rgw_op.cc
ceph/src/rgw/rgw_op.h
ceph/src/rgw/rgw_process.cc
ceph/src/rgw/rgw_rados.cc
ceph/src/rgw/rgw_rados.h
ceph/src/rgw/rgw_rest.h
ceph/src/rgw/rgw_rest_s3.cc
ceph/src/rgw/rgw_rest_swift.cc
ceph/src/tools/ceph_objectstore_tool.cc
ceph/src/tools/rados/rados.cc

index 394c388bd94c8b5934ddce28ea7d62a2705bf4ec..6a15306fa27eec37a13795121c566e9855f49aac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=5.1
 
 PACKAGE=ceph
-VER=12.2.3
+VER=12.2.4
 DEBREL=pve1
 
 SRCDIR=ceph
index 2772c0d746a2880fd3c82c3c7b14008cd99143f1..503305ede6f281c67233030f8c3c4187d2d0bb93 100644 (file)
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.11)
 
 project(ceph)
-set(VERSION 12.2.3)
+set(VERSION 12.2.4)
 
 if(POLICY CMP0046)
   # Tweak policies (this one disables "missing" dependency warning)
index 6b30edd3bdf544fbe9d524170c2b5317131c62b5..db74653783a923ae8a0a6d510e89407569b4999f 100644 (file)
@@ -1,7 +1,7 @@
 # Contributor: John Coyle <dx9err@gmail.com>
 # Maintainer: John Coyle <dx9err@gmail.com>
 pkgname=ceph
-pkgver=12.2.3
+pkgver=12.2.4
 pkgrel=0
 pkgdesc="Ceph is a distributed object store and file system"
 pkgusers="ceph"
@@ -63,7 +63,7 @@ makedepends="
        xmlstarlet
        yasm
 "
-source="ceph-12.2.3.tar.bz2"
+source="ceph-12.2.4.tar.bz2"
 subpackages="
        $pkgname-base
        $pkgname-common
@@ -116,7 +116,7 @@ _sysconfdir=/etc
 _udevrulesdir=/etc/udev/rules.d
 _python_sitelib=/usr/lib/python2.7/site-packages
 
-builddir=$srcdir/ceph-12.2.3
+builddir=$srcdir/ceph-12.2.4
 
 build() {
        export CEPH_BUILD_VIRTUALENV=$builddir
index 29bb197c1e1cdf5c520835a3190e367fd7469789..38dab19ebc9ed1169b703d04883275512db532f9 100644 (file)
@@ -61,7 +61,7 @@
 # main package definition
 #################################################################################
 Name:          ceph
-Version:       12.2.3
+Version:       12.2.4
 Release:       0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:         2
@@ -77,7 +77,7 @@ License:      LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
 Group:         System/Filesystems
 %endif
 URL:           http://ceph.com/
-Source0:       http://ceph.com/download/ceph-12.2.3.tar.bz2
+Source0:       http://ceph.com/download/ceph-12.2.4.tar.bz2
 %if 0%{?suse_version}
 %if 0%{?is_opensuse}
 ExclusiveArch:  x86_64 aarch64 ppc64 ppc64le
@@ -778,7 +778,7 @@ python-rbd, python-rgw or python-cephfs instead.
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-12.2.3
+%autosetup -p1 -n ceph-12.2.4
 
 %build
 %if 0%{with cephfs_java}
index b1ae470ad20dede9626c47fa46801517c127882d..c7cd39a1107707d2063db1f7bb8663b223fbee08 100644 (file)
@@ -75,7 +75,7 @@ function(do_build_boost version)
   set(install_command
     ${b2} install)
   set(boost_root_dir "${CMAKE_BINARY_DIR}/boost")
-  if(EXISTS "${PROJECT_SOURCE_DIR}/src/boost/libs/config/include/boost/config.hpp")
+  if(EXISTS "${PROJECT_SOURCE_DIR}/src/boost/bootstrap.sh")
     message(STATUS "boost already in src")
     set(source_dir
       SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost")
index d050137769317043345e72cd4292002f43d0a1e4..d8c3290336c6ee2b732fa95a22dde9c783bb1c8a 100644 (file)
@@ -1,3 +1,9 @@
+ceph (12.2.4-1) stable; urgency=medium
+
+  * New upstream release
+
+ -- Ceph Release Team <ceph-maintainers@ceph.com>  Mon, 26 Feb 2018 21:47:17 +0000
+
 ceph (12.2.3-1) stable; urgency=medium
 
   * New upstream release
index 0d789a62c49ec32ddfe2a27df700f872f55df903..affab5be9193940df70d451e3dadcafd6f817876 100644 (file)
@@ -377,6 +377,10 @@ OSDs with the long form procedure, execute the following steps for each OSD.
        ceph osd new $UUID -i - \
        -n client.bootstrap-osd -k /var/lib/ceph/bootstrap-osd/ceph.keyring)
 
+   It is also possible to include a ``crush_device_class`` property in the JSON
+   to set an initial class other than the default (``ssd`` or ``hdd`` based on
+   the auto-detected device type).
+
 #. Create the default directory on your new OSD. ::
 
      mkdir /var/lib/ceph/osd/ceph-$ID
index 225c2754f6d3eb89218a12006e5b39dd685d9a77..c4ca9d822ff2937193f529851b03023142a0d9a3 100644 (file)
@@ -569,13 +569,14 @@ the accompanying lockbox cephx key.
 
 Usage::
 
-    ceph osd new {<uuid>} {<id>} -i {<secrets.json>}
+    ceph osd new {<uuid>} {<id>} -i {<params.json>}
 
-The secrets JSON file is optional but if provided, is expected to maintain
+The parameters JSON file is optional but if provided, is expected to maintain
 a form of the following format::
 
     {
-        "cephx_secret": "AQBWtwhZdBO5ExAAIDyjK2Bh16ZXylmzgYYEjg=="
+        "cephx_secret": "AQBWtwhZdBO5ExAAIDyjK2Bh16ZXylmzgYYEjg==",
+       "crush_device_class": "myclass"
     }
 
 Or::
@@ -583,9 +584,19 @@ Or::
     {
         "cephx_secret": "AQBWtwhZdBO5ExAAIDyjK2Bh16ZXylmzgYYEjg==",
         "cephx_lockbox_secret": "AQDNCglZuaeVCRAAYr76PzR1Anh7A0jswkODIQ==",
-        "dmcrypt_key": "<dm-crypt key>"
+        "dmcrypt_key": "<dm-crypt key>",
+       "crush_device_class": "myclass"
+    }
+
+Or::
+
+    {
+       "crush_device_class": "myclass"
     }
-        
+
+The "crush_device_class" property is optional. If specified, it will set the
+initial CRUSH device class for the new OSD.
+
 
 Subcommand ``crush`` is used for CRUSH management. It uses some additional
 subcommands.
index 76ca43e321de9eb2da01ee2820f482286931a659..859dc84ca2b5a9aa65ba339e7f8870cd8de54e46 100644 (file)
@@ -85,7 +85,8 @@
                 "omap_digest_mismatch",
                 "size_mismatch",
                 "attr_value_mismatch",
-                "attr_name_mismatch"
+                "attr_name_mismatch",
+                "snapset_inconsistency"
               ]
             },
             "minItems": 0,
index f50dd4618224548f92053b44bbabf1261a7e1e0b..d7d4db579be58e2a1a37c6af8cfba16a0f00d79b 100755 (executable)
@@ -1398,7 +1398,7 @@ function wait_for_clean() {
     local -a delays=($(get_timeout_delays $TIMEOUT .1))
     local -i loop=0
 
-    flush_pg_stats
+    flush_pg_stats || return 1
     while test $(get_num_pgs) == 0 ; do
        sleep 1
     done
@@ -1829,7 +1829,7 @@ function test_flush_pg_stats()
     run_osd $dir 0 || return 1
     create_rbd_pool || return 1
     rados -p rbd put obj /etc/group
-    flush_pg_stats
+    flush_pg_stats || return 1
     local jq_filter='.pools | .[] | select(.name == "rbd") | .stats'
     raw_bytes_used=`ceph df detail --format=json | jq "$jq_filter.raw_bytes_used"`
     bytes_used=`ceph df detail --format=json | jq "$jq_filter.bytes_used"`
index 4326ecff938c6301f156685023b4fad734b8c7d9..557de0d1bbdb4b3de8168178ff583cdb0d2d19a8 100755 (executable)
@@ -2817,6 +2817,153 @@ function TEST_periodic_scrub_replicated() {
     rados list-inconsistent-obj $pg | jq '.' | grep -qv $objname || return 1
 }
 
+#
+# Corrupt snapset in replicated pool
+#
+function TEST_corrupt_snapset_scrub_rep() {
+    local dir=$1
+    local poolname=csr_pool
+    local total_objs=2
+
+    setup $dir || return 1
+    run_mon $dir a --osd_pool_default_size=2 || return 1
+    run_mgr $dir x || return 1
+    run_osd $dir 0 || return 1
+    run_osd $dir 1 || return 1
+    create_rbd_pool || return 1
+    wait_for_clean || return 1
+
+    create_pool foo 1 || return 1
+    create_pool $poolname 1 1 || return 1
+    wait_for_clean || return 1
+
+    for i in $(seq 1 $total_objs) ; do
+        objname=ROBJ${i}
+        add_something $dir $poolname $objname || return 1
+
+        rados --pool $poolname setomapheader $objname hdr-$objname || return 1
+        rados --pool $poolname setomapval $objname key-$objname val-$objname || return 1
+    done
+
+    local pg=$(get_pg $poolname ROBJ0)
+
+    for i in $(seq 1 $total_objs) ; do
+        objname=ROBJ${i}
+
+        # Alternate corruption between osd.0 and osd.1
+        local osd=$(expr $i % 2)
+
+        rados -p $poolname mksnap snap1
+        echo -n head_of_snapshot_data > $dir/change
+
+        case $i in
+        1)
+          rados --pool $poolname put $objname $dir/change
+          objectstore_tool $dir $osd --head $objname clear-snapset corrupt || return 1
+          ;;
+
+        2)
+          rados --pool $poolname put $objname $dir/change
+          objectstore_tool $dir $osd --head $objname clear-snapset corrupt || return 1
+          ;;
+
+        esac
+    done
+    rm $dir/change
+
+    pg_scrub $pg
+
+    rados list-inconsistent-pg $poolname > $dir/json || return 1
+    # Check pg count
+    test $(jq '. | length' $dir/json) = "1" || return 1
+    # Check pgid
+    test $(jq -r '.[0]' $dir/json) = $pg || return 1
+
+    rados list-inconsistent-obj $pg > $dir/json || return 1
+
+    jq "$jqfilter" << EOF | python -c "$sortkeys" | sed -e "$sedfilter" > $dir/checkcsjson
+{
+  "epoch": 34,
+  "inconsistents": [
+    {
+      "object": {
+        "name": "ROBJ1",
+        "nspace": "",
+        "locator": "",
+        "snap": "head",
+        "version": 8
+      },
+      "errors": [
+        "snapset_inconsistency"
+      ],
+      "union_shard_errors": [],
+      "selected_object_info": "3:ce3f1d6a:::ROBJ1:head(27'8 client.4143.0:1 dirty|omap|data_digest s 21 uv 8 dd 53acb008 alloc_hint [0 0 0])",
+      "shards": [
+        {
+          "osd": 0,
+          "primary": false,
+          "errors": [],
+          "size": 21,
+          "snapset": "1=[1]:{1=[1]}"
+        },
+        {
+          "osd": 1,
+          "primary": true,
+          "errors": [],
+          "size": 21,
+          "snapset": "0=[]:[]+stray_clone_snaps={1=[1]}"
+        }
+      ]
+    },
+    {
+      "object": {
+        "name": "ROBJ2",
+        "nspace": "",
+        "locator": "",
+        "snap": "head",
+        "version": 10
+      },
+      "errors": [
+        "snapset_inconsistency"
+      ],
+      "union_shard_errors": [],
+      "selected_object_info": "3:e97ce31e:::ROBJ2:head(31'10 client.4155.0:1 dirty|omap|data_digest s 21 uv 10 dd 53acb008 alloc_hint [0 0 0])",
+      "shards": [
+        {
+          "osd": 0,
+          "primary": false,
+          "errors": [],
+          "size": 21,
+          "snapset": "0=[]:[]+stray_clone_snaps={1=[1]}"
+        },
+        {
+          "osd": 1,
+          "primary": true,
+          "errors": [],
+          "size": 21,
+          "snapset": "1=[1]:{1=[1]}"
+        }
+      ]
+    }
+  ]
+}
+EOF
+
+    jq "$jqfilter" $dir/json | python -c "$sortkeys" | sed -e "$sedfilter" > $dir/csjson
+    diff ${DIFFCOLOPTS} $dir/checkcsjson $dir/csjson || test $getjson = "yes" || return 1
+    if test $getjson = "yes"
+    then
+        jq '.' $dir/json > save6.json
+    fi
+
+    if which jsonschema > /dev/null;
+    then
+      jsonschema -i $dir/json $CEPH_ROOT/doc/rados/command/list-inconsistent-obj.json || return 1
+    fi
+
+    rados rmpool $poolname $poolname --yes-i-really-really-mean-it
+    teardown $dir || return 1
+}
 
 main osd-scrub-repair "$@"
 
index 15344172a966cd972e851308566361c1b33bd00d..00606a256d9ec88abaa2853f8681436367e6f311 100755 (executable)
@@ -1272,7 +1272,6 @@ function test_mon_osd_create_destroy()
   ceph osd rm $id2
   ceph osd setmaxosd $old_maxosd
 
-  ceph osd new $uuid -i $bad_json 2>&1 | grep 'EINVAL'
   ceph osd new $uuid -i $no_cephx 2>&1 | grep 'EINVAL'
   ceph osd new $uuid -i $no_lockbox 2>&1 | grep 'EINVAL'
 
index 9c816e47374e5849175c6e820a5b7e6800784971..cbdd56899a02eecd2bb830ba40bb58d6b3474f28 100644 (file)
@@ -1,2 +1,2 @@
-2dab17a455c09584f2a85e6b10888337d1ec8949
-v12.2.3
+52085d5249a80c5f5121a76d6288429f35e4e77b
+v12.2.4
index 3a58aa7b93f5aa5f61aa4ef0db6e7047b888e878..1b90e932cc0e2c0d9ee494ff00040c6c1d57b9ec 100644 (file)
@@ -1,13 +1,13 @@
-# Copyright (c) 2008-2009 Emil Dotchevski and Reverge Studios, Inc.
-
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-import testing ;
-
-project
-    : source-location
-        ../../gen
-    ;
-
-run gen.cpp : -od ../../include/boost/qvm/gen ;
+# Copyright (c) 2008-2009 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+# Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+import testing ;\r
+\r
+project\r
+    : source-location\r
+        ../../gen\r
+    ;\r
+\r
+run gen.cpp : -od ../../include/boost/qvm/gen ;\r
index 0f4f7cdd92cf6f7517303d08e088a30a740d9253..48f3fd70f7fa33e3da0468a74fc53d007dc8b5b5 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\gen\gen.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6BC86B3D-16DE-2AEA-2B2B-31AA13143012}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>$(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>$(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>$(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\gen\gen.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{6BC86B3D-16DE-2AEA-2B2B-31AA13143012}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>$(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>$(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>$(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>$(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>$(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>$(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>$(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>$(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>$(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>\r
index 70f7a65462f5947402378415d507d86cf2642f76..607b7ec898a5ab47e1b103e3678bda0a1b9b8810 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\gen\gen.cpp">
-        <Filter>qvm\gen</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{482A79AA-4B67-0E64-1BFB-31FE2C505E34}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\gen">
-      <UniqueIdentifier>{242B44CF-3AFB-0120-61E4-5E6E22FF22B2}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\gen\gen.cpp">\r
+        <Filter>qvm\gen</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{482A79AA-4B67-0E64-1BFB-31FE2C505E34}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\gen">\r
+      <UniqueIdentifier>{242B44CF-3AFB-0120-61E4-5E6E22FF22B2}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 1611b857d65b00f6e54f08c3e8b46550b4d16848..234812dcdd7874197b5885d16e6ce0fd0f1dccb9 100644 (file)
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 14 for Windows Desktop
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all tests", "test\all tests.vcxproj", "{58495107-524D-262A-14F9-75054C6228FA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mat_traits_array_test", "test\mat_traits_array_test.vcxproj", "{67A8721D-4983-18EF-3C00-284306CA5634}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quat_traits_array_test", "test\quat_traits_array_test.vcxproj", "{497D4873-6EE2-5C14-53AC-4D47257B5B42}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vec_traits_array_test", "test\vec_traits_array_test.vcxproj", "{49010CFB-132B-682E-589B-0668577A0DC6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_m_test", "test\access_m_test.vcxproj", "{4B0B4ABC-3047-27C0-0737-1C9C70C2683A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_m_fail2", "test\access_m_fail2.vcxproj", "{4B9B021E-2EAE-4FA2-7408-3F8407B6711A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_m_fail1", "test\access_m_fail1.vcxproj", "{4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_q_fail", "test\access_q_fail.vcxproj", "{3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_q_test", "test\access_q_test.vcxproj", "{41D50804-0184-4ECA-1FDB-0F69302A789A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_v_fail2", "test\access_v_fail2.vcxproj", "{42F476C8-7E53-1E8E-797E-55395E120A5A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_v_fail1", "test\access_v_fail1.vcxproj", "{42C954F7-7328-5896-6DB5-0DD240041F01}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_v_test", "test\access_v_test.vcxproj", "{42751154-5CD4-4CA8-5622-7F0303E8484E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "assign_test", "test\assign_test.vcxproj", "{47161A3C-4FAA-15AF-77E0-3EFE41441185}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "to_string_test", "test\to_string_test.vcxproj", "{477E59C9-08B0-5599-0133-29D54652239C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmp_vv_test", "test\cmp_vv_test.vcxproj", "{47F44147-58D6-0D81-2BAF-52077C0307F6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_test", "test\cross_test.vcxproj", "{486354CD-1D6C-0969-0597-5B8C1962032F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "div_eq_vs_test", "test\div_eq_vs_test.vcxproj", "{48BF6C69-3F51-5156-6DBF-09096DCF4303}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "div_vs_test", "test\div_vs_test.vcxproj", "{492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dot_vv_test", "test\dot_vv_test.vcxproj", "{499D1374-487C-4927-218E-1C12288D3975}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eq_vv_test", "test\eq_vv_test.vcxproj", "{49F50113-2499-3315-616B-3A3870D104B8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mag_v_test", "test\mag_v_test.vcxproj", "{4A6E128E-3A87-48FB-3433-71C132AA5DA3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mag_sqr_v_test", "test\mag_sqr_v_test.vcxproj", "{4AC25631-50DC-54EA-4BC6-00906EC63456}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_v_test", "test\minus_v_test.vcxproj", "{4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_eq_vv_test", "test\minus_eq_vv_test.vcxproj", "{4B790568-14A5-64C3-1C16-5B89179F33FE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_vv_test", "test\minus_vv_test.vcxproj", "{4BCB1F0E-6531-12B2-0B5E-5B0147921621}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_eq_vs_test", "test\mul_eq_vs_test.vcxproj", "{4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_vs_test", "test\mul_vs_test.vcxproj", "{4C7F2448-6333-448C-3364-26A364432138}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_vm_test", "test\mul_vm_test.vcxproj", "{4CDA3BE4-0518-0C79-1B8C-542038B0610D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "normalize_v_test", "test\normalize_v_test.vcxproj", "{4D282B8D-0FDC-5C69-628A-44415C7B4E9E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plus_eq_vv_test", "test\plus_eq_vv_test.vcxproj", "{4D81192C-6BF8-4656-2267-626724BF19E2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plus_vv_test", "test\plus_vv_test.vcxproj", "{4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scalar_cast_v_test", "test\scalar_cast_v_test.vcxproj", "{4E341E67-69FA-7830-4A6D-2E09417024FA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vec_index_test", "test\vec_index_test.vcxproj", "{4E830E10-74BE-4820-116A-1E2A653A128B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmp_mm_test", "test\cmp_mm_test.vcxproj", "{4EE823A1-67FB-2A0B-7272-79AB5E203011}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "determinant_test", "test\determinant_test.vcxproj", "{4F670915-097A-7BF0-15CF-4FE2384A721E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "div_eq_ms_test", "test\div_eq_ms_test.vcxproj", "{4FD94697-13D8-55D8-1801-68BD61D261E7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "div_ms_test", "test\div_ms_test.vcxproj", "{50283641-1E9C-25C7-5EFF-58DF059D4F79}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eq_mm_test", "test\eq_mm_test.vcxproj", "{508023E0-7AB9-0FB5-1EDC-77044DE11ABC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_m_test", "test\minus_m_test.vcxproj", "{50E8636D-33BE-4F9F-282E-61DC52EF2CD3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_eq_mm_test", "test\minus_eq_mm_test.vcxproj", "{51472505-1B6B-758B-38A1-1EAF33846138}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_mm_test", "test\minus_mm_test.vcxproj", "{519F12A4-7788-5F78-787F-3CD57BC82C7C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_eq_mm_test", "test\mul_eq_mm_test.vcxproj", "{51EE024D-024C-2F68-3F7C-2CF61F931A0D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_eq_ms_test", "test\mul_eq_ms_test.vcxproj", "{524345F0-18A0-3B56-570F-3BC55BAF70C0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_mm_test", "test\mul_mm_test.vcxproj", "{529E5D8B-3A85-0343-3F37-6941301C3095}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_ms_test", "test\mul_ms_test.vcxproj", "{52F07731-0B12-3132-2E80-68BA600F12B7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_mv_test", "test\mul_mv_test.vcxproj", "{534864D0-672E-1B1F-6E5D-06DF28535DFA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inverse_m_test", "test\inverse_m_test.vcxproj", "{53A37C6C-0913-630C-5685-345C7CC01DCF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plus_eq_mm_test", "test\plus_eq_mm_test.vcxproj", "{540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plus_mm_test", "test\plus_mm_test.vcxproj", "{54854D74-5807-38DD-329F-56BC43A708D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scalar_cast_m_test", "test\scalar_cast_m_test.vcxproj", "{54D33D1E-62CB-08CC-799D-46DE67727662}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mat_index_test", "test\mat_index_test.vcxproj", "{552556C4-3357-36BB-68E5-465617655884}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmp_qq_test", "test\cmp_qq_test.vcxproj", "{59BC61B6-54D5-65C4-11C4-584D30474409}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "conjugate_test", "test\conjugate_test.vcxproj", "{5A144F55-30F2-4FB1-51A1-7672788B0F4D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "normalize_q_test", "test\normalize_q_test.vcxproj", "{5D5521C1-3355-7102-73EA-3DD714D62B76}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "div_eq_qs_test", "test\div_eq_qs_test.vcxproj", "{5DAA6563-49AA-7CF0-0B7D-4CA650F20228}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "div_qs_test", "test\div_qs_test.vcxproj", "{5DF8550D-546E-4CE0-527B-3CC774BD6FBA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dot_qq_test", "test\dot_qq_test.vcxproj", "{5E3A1CC5-4811-24D2-784E-6F8E67E60B08}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eq_qq_test", "test\eq_qq_test.vcxproj", "{5E7E0E7A-017D-5AC4-466C-31AB67371AE8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inverse_q_test", "test\inverse_q_test.vcxproj", "{5EC3002E-3AE8-10B5-148A-73C866892AC7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mag_q_test", "test\mag_q_test.vcxproj", "{5F1843D1-513D-1CA4-2C1D-029722A5017A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mag_sqr_q_test", "test\mag_sqr_q_test.vcxproj", "{5F605F82-5071-3095-2286-540B2E1F05EA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_q_test", "test\minus_q_test.vcxproj", "{5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_eq_qq_test", "test\minus_eq_qq_test.vcxproj", "{5FFC3ED5-65F9-5074-3081-344E75B4610C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_qq_test", "test\minus_qq_test.vcxproj", "{60445A86-652D-6464-26EA-05C2012E657C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_eq_qs_test", "test\mul_eq_qs_test.vcxproj", "{6096742C-35B9-1253-1632-053B3121479F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_qs_test", "test\mul_qs_test.vcxproj", "{60E80DD2-0645-4042-057B-04B3611529C1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_qv_test", "test\mul_qv_test.vcxproj", "{61464F6A-6DF2-662E-15ED-418641AA5E26}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_qq_test", "test\mul_qq_test.vcxproj", "{61911518-32EE-581F-34A1-2251594C5726}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_eq_qq_test", "test\mul_eq_qq_test.vcxproj", "{61D930C8-3222-6C0F-2B09-73C564C65B96}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plus_eq_qq_test", "test\plus_eq_qq_test.vcxproj", "{621E227D-6B8E-2201-7927-35E264186B76}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plus_qq_test", "test\plus_qq_test.vcxproj", "{62621432-24F9-57F3-4745-780063697B55}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scalar_cast_q_test", "test\scalar_cast_q_test.vcxproj", "{62A031ED-52D4-51E6-44CE-1B6F4A6A2213}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slerp_test", "test\slerp_test.vcxproj", "{62E279A5-4678-29D8-6AA2-4E363D933D61}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convert_to_test", "test\convert_to_test.vcxproj", "{45D8782C-23BC-5A59-47C8-5416580E1D6F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rot_mat_test", "test\rot_mat_test.vcxproj", "{46A97746-15C7-5A2D-5A6D-29C5622B419D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rot_quat_test", "test\rot_quat_test.vcxproj", "{473504AB-4E66-2410-1EF3-3D566CF655EC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rotx_mat_test", "test\rotx_mat_test.vcxproj", "{47C21211-0705-6DF2-637A-50E777C26A3B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rotx_quat_test", "test\rotx_quat_test.vcxproj", "{482D7B9A-05D3-0BDC-1517-4B1508F970E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "roty_mat_test", "test\roty_mat_test.vcxproj", "{48BA08FF-3E72-55BE-599E-5EA713C40532}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "roty_quat_test", "test\roty_quat_test.vcxproj", "{490F4CA2-54C7-61AC-7131-6D764FE05BE5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rotz_mat_test", "test\rotz_mat_test.vcxproj", "{497E6028-195D-5D95-4B18-76FB6D3F571E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rotz_quat_test", "test\rotz_quat_test.vcxproj", "{4A0D178A-17C4-0577-37E9-19E304335FFE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zero_vec_test", "test\zero_vec_test.vcxproj", "{4A732D1A-0B02-6761-18F1-75637D197D84}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zero_mat_test", "test\zero_mat_test.vcxproj", "{4ACB1AB9-671E-514F-58CF-1389455D48C8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zero_quat_test", "test\zero_quat_test.vcxproj", "{4B230858-433B-3B3C-18AC-31AF0DA1140B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "identity_mat_test", "test\identity_mat_test.vcxproj", "{4B717802-4DFF-0B2C-5FAA-21D0316C019D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "identity_quat_test", "test\identity_quat_test.vcxproj", "{4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "col_test", "test\col_test.vcxproj", "{4C631AF8-79DC-36F9-0538-10E2351D3373}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "col_mat_test", "test\col_mat_test.vcxproj", "{4CB10AA2-04A0-06E9-4C36-010458E82104}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neg_col_test", "test\neg_col_test.vcxproj", "{4D007A4C-0F64-56D8-1334-71257CB30E95}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neg_row_test", "test\neg_row_test.vcxproj", "{4D446C00-48CF-0CCA-6152-33437C051E75}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "del_col_test", "test\del_col_test.vcxproj", "{4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "del_row_test", "test\del_row_test.vcxproj", "{4DF8713A-46D1-3EA4-0958-7EE518B5298C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "del_row_col_test", "test\del_row_col_test.vcxproj", "{4E4D34DD-5D25-4A92-20EB-0DB454D1003F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swap_cols_test", "test\swap_cols_test.vcxproj", "{4EBC4863-21BB-467B-7AD2-173972307B78}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swap_rows_test", "test\swap_rows_test.vcxproj", "{4F3803DA-7D72-3A61-75E4-5E18403248F3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diag_test", "test\diag_test.vcxproj", "{4F834988-426E-2C51-1497-3EE357D441F4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diag_mat_test", "test\diag_mat_test.vcxproj", "{4FDF6123-6452-743E-7CBF-6C5F2C4101C8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "row_test", "test\row_test.vcxproj", "{50404CB7-11C8-7829-357D-388918FE2ABE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "row_mat_test", "test\row_mat_test.vcxproj", "{509F0E4F-7974-1E15-45EF-755D79935F23}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "transpose_test", "test\transpose_test.vcxproj", "{50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translation_test", "test\translation_test.vcxproj", "{51466B98-6055-57F2-4CCA-03A465A217F8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translation_mat_test", "test\translation_mat_test.vcxproj", "{519B2F3A-76AA-63E0-645D-127321BE6EAB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle2_fail2", "test\swizzle2_fail2.vcxproj", "{52C745F0-0A99-2BA1-5F2A-159E004752AE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle2_fail3", "test\swizzle2_fail3.vcxproj", "{53293184-380F-2F8D-17E8-61C86D057BA4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle2_fail4", "test\swizzle2_fail4.vcxproj", "{534D7F5C-37A8-3985-531C-0A8272C27DDC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle2_test", "test\swizzle2_test.vcxproj", "{53E060BB-7BD8-3F66-6838-3CC115DE7B4C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle3_fail2", "test\swizzle3_fail2.vcxproj", "{54327A61-4C64-6D55-5780-3C3945D15D6E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle3_fail3", "test\swizzle3_fail3.vcxproj", "{54903BF9-3411-1341-67F3-790C266711D3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle3_fail4", "test\swizzle3_fail4.vcxproj", "{54DF2BA2-3ED6-6331-2EF0-692E4A317F65}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle3_test", "test\swizzle3_test.vcxproj", "{55304548-0F62-1120-1E39-68A67A256187}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle4_fail2", "test\swizzle4_fail2.vcxproj", "{557F34F2-1A26-610F-6537-58C71DEF4F18}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle4_fail3", "test\swizzle4_fail3.vcxproj", "{55BD52AE-4801-5B02-62C0-7C3704F075D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle4_fail4", "test\swizzle4_fail4.vcxproj", "{56186A49-69E6-22EF-4AE8-29B4595D35AA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle4_test", "test\swizzle4_test.vcxproj", "{567401E5-0BCB-6ADC-3310-57302DC9757F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deduce_scalar_test", "test\deduce_scalar_test.vcxproj", "{56D2437D-7378-10C8-4382-14030E5E29E4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deduce_scalar_fail1", "test\deduce_scalar_fail1.vcxproj", "{576524DB-37A8-16A9-589E-4642317B2754}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deduce_scalar_fail2", "test\deduce_scalar_fail2.vcxproj", "{57BA687D-4DFC-2297-7031-55116D967E07}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deduce_scalar_fail3", "test\deduce_scalar_fail3.vcxproj", "{581C5412-7B71-2682-28EE-213B5A5426FD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deduce_matrix_test", "test\deduce_matrix_test.vcxproj", "{587E3FA6-28E6-2A6E-61AC-6D6547114FF3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deduce_vector_test", "test\deduce_vector_test.vcxproj", "{58C3315A-6252-605F-2FCA-2F8246635FD2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interop_test", "test\interop_test.vcxproj", "{590A4D0B-6186-7450-2632-00F651DD6442}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "transform_test", "test\transform_test.vcxproj", "{594F3EC0-1AF1-2A42-7450-4314512E7421}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "projection_test", "test\projection_test.vcxproj", "{59A72C5F-770E-142F-342E-613919723F65}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scalar_traits_test", "test\scalar_traits_test.vcxproj", "{59EF4810-7642-2820-2A97-32AD24EC43D5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{18042314-9FA1-4A9A-9F77-FE933CF94D50}"
-       ProjectSection(SolutionItems) = preProject
-               ..\test\Jamfile.v2 = ..\test\Jamfile.v2
-       EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8A2F8A70-0694-40C4-B46F-FEFC0A59D8AF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gen", "gen\gen.vcxproj", "{6BC86B3D-16DE-2AEA-2B2B-31AA13143012}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle_const_fail", "test\swizzle_const_fail.vcxproj", "{13A81B5C-3126-7689-29CB-7EB809060F4C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{C8EF795B-16A1-4410-B1B3-5CF3F6832317}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial", "doc\tutorial.vcxproj", "{38B340E0-373D-22A8-4354-0D386DC50BA2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interoperability", "doc\interoperability.vcxproj", "{3C557EE0-6716-47E4-1E5A-20C676CE50C1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mat_traits_array", "doc\mat_traits_array.vcxproj", "{3C8020B1-7240-0DDB-2A23-682D14DC3C1A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vec_traits_array", "doc\vec_traits_array.vcxproj", "{3CB44078-4EC3-6DD0-2ECC-5D9957630526}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bld", "bld", "{C1F6B1DF-3D6E-4AA2-81D2-A9CDB3C6E0CF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{1D4E71E5-F63F-4611-9F38-5177D49CEA91}"
-       ProjectSection(SolutionItems) = preProject
-               doc\Jamfile.v2 = doc\Jamfile.v2
-       EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{461FE07F-A59B-421D-AAD6-48B41368EDE2}"
-       ProjectSection(SolutionItems) = preProject
-               gen\Jamfile.v2 = gen\Jamfile.v2
-       EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3492B32A-CA32-4B64-B0D3-FF6AF6B83DEE}"
-       ProjectSection(SolutionItems) = preProject
-               test\Jamfile.v2 = test\Jamfile.v2
-       EndProjectSection
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               debug|Win32 = debug|Win32
-               release|Win32 = release|Win32
-               release-assert|Win32 = release-assert|Win32
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {58495107-524D-262A-14F9-75054C6228FA}.debug|Win32.ActiveCfg = debug|Win32
-               {58495107-524D-262A-14F9-75054C6228FA}.debug|Win32.Build.0 = debug|Win32
-               {58495107-524D-262A-14F9-75054C6228FA}.release|Win32.ActiveCfg = release|Win32
-               {58495107-524D-262A-14F9-75054C6228FA}.release|Win32.Build.0 = release|Win32
-               {58495107-524D-262A-14F9-75054C6228FA}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {58495107-524D-262A-14F9-75054C6228FA}.release-assert|Win32.Build.0 = release-assert|Win32
-               {67A8721D-4983-18EF-3C00-284306CA5634}.debug|Win32.ActiveCfg = debug|Win32
-               {67A8721D-4983-18EF-3C00-284306CA5634}.debug|Win32.Build.0 = debug|Win32
-               {67A8721D-4983-18EF-3C00-284306CA5634}.release|Win32.ActiveCfg = release|Win32
-               {67A8721D-4983-18EF-3C00-284306CA5634}.release|Win32.Build.0 = release|Win32
-               {67A8721D-4983-18EF-3C00-284306CA5634}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {67A8721D-4983-18EF-3C00-284306CA5634}.release-assert|Win32.Build.0 = release-assert|Win32
-               {497D4873-6EE2-5C14-53AC-4D47257B5B42}.debug|Win32.ActiveCfg = debug|Win32
-               {497D4873-6EE2-5C14-53AC-4D47257B5B42}.debug|Win32.Build.0 = debug|Win32
-               {497D4873-6EE2-5C14-53AC-4D47257B5B42}.release|Win32.ActiveCfg = release|Win32
-               {497D4873-6EE2-5C14-53AC-4D47257B5B42}.release|Win32.Build.0 = release|Win32
-               {497D4873-6EE2-5C14-53AC-4D47257B5B42}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {497D4873-6EE2-5C14-53AC-4D47257B5B42}.release-assert|Win32.Build.0 = release-assert|Win32
-               {49010CFB-132B-682E-589B-0668577A0DC6}.debug|Win32.ActiveCfg = debug|Win32
-               {49010CFB-132B-682E-589B-0668577A0DC6}.debug|Win32.Build.0 = debug|Win32
-               {49010CFB-132B-682E-589B-0668577A0DC6}.release|Win32.ActiveCfg = release|Win32
-               {49010CFB-132B-682E-589B-0668577A0DC6}.release|Win32.Build.0 = release|Win32
-               {49010CFB-132B-682E-589B-0668577A0DC6}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {49010CFB-132B-682E-589B-0668577A0DC6}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A}.debug|Win32.ActiveCfg = debug|Win32
-               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A}.debug|Win32.Build.0 = debug|Win32
-               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A}.release|Win32.ActiveCfg = release|Win32
-               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A}.release|Win32.Build.0 = release|Win32
-               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A}.debug|Win32.ActiveCfg = debug|Win32
-               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A}.debug|Win32.Build.0 = debug|Win32
-               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A}.release|Win32.ActiveCfg = release|Win32
-               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A}.release|Win32.Build.0 = release|Win32
-               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}.debug|Win32.ActiveCfg = debug|Win32
-               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}.debug|Win32.Build.0 = debug|Win32
-               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}.release|Win32.ActiveCfg = release|Win32
-               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}.release|Win32.Build.0 = release|Win32
-               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}.release-assert|Win32.Build.0 = release-assert|Win32
-               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}.debug|Win32.ActiveCfg = debug|Win32
-               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}.debug|Win32.Build.0 = debug|Win32
-               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}.release|Win32.ActiveCfg = release|Win32
-               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}.release|Win32.Build.0 = release|Win32
-               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}.release-assert|Win32.Build.0 = release-assert|Win32
-               {41D50804-0184-4ECA-1FDB-0F69302A789A}.debug|Win32.ActiveCfg = debug|Win32
-               {41D50804-0184-4ECA-1FDB-0F69302A789A}.debug|Win32.Build.0 = debug|Win32
-               {41D50804-0184-4ECA-1FDB-0F69302A789A}.release|Win32.ActiveCfg = release|Win32
-               {41D50804-0184-4ECA-1FDB-0F69302A789A}.release|Win32.Build.0 = release|Win32
-               {41D50804-0184-4ECA-1FDB-0F69302A789A}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {41D50804-0184-4ECA-1FDB-0F69302A789A}.release-assert|Win32.Build.0 = release-assert|Win32
-               {42F476C8-7E53-1E8E-797E-55395E120A5A}.debug|Win32.ActiveCfg = debug|Win32
-               {42F476C8-7E53-1E8E-797E-55395E120A5A}.debug|Win32.Build.0 = debug|Win32
-               {42F476C8-7E53-1E8E-797E-55395E120A5A}.release|Win32.ActiveCfg = release|Win32
-               {42F476C8-7E53-1E8E-797E-55395E120A5A}.release|Win32.Build.0 = release|Win32
-               {42F476C8-7E53-1E8E-797E-55395E120A5A}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {42F476C8-7E53-1E8E-797E-55395E120A5A}.release-assert|Win32.Build.0 = release-assert|Win32
-               {42C954F7-7328-5896-6DB5-0DD240041F01}.debug|Win32.ActiveCfg = debug|Win32
-               {42C954F7-7328-5896-6DB5-0DD240041F01}.debug|Win32.Build.0 = debug|Win32
-               {42C954F7-7328-5896-6DB5-0DD240041F01}.release|Win32.ActiveCfg = release|Win32
-               {42C954F7-7328-5896-6DB5-0DD240041F01}.release|Win32.Build.0 = release|Win32
-               {42C954F7-7328-5896-6DB5-0DD240041F01}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {42C954F7-7328-5896-6DB5-0DD240041F01}.release-assert|Win32.Build.0 = release-assert|Win32
-               {42751154-5CD4-4CA8-5622-7F0303E8484E}.debug|Win32.ActiveCfg = debug|Win32
-               {42751154-5CD4-4CA8-5622-7F0303E8484E}.debug|Win32.Build.0 = debug|Win32
-               {42751154-5CD4-4CA8-5622-7F0303E8484E}.release|Win32.ActiveCfg = release|Win32
-               {42751154-5CD4-4CA8-5622-7F0303E8484E}.release|Win32.Build.0 = release|Win32
-               {42751154-5CD4-4CA8-5622-7F0303E8484E}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {42751154-5CD4-4CA8-5622-7F0303E8484E}.release-assert|Win32.Build.0 = release-assert|Win32
-               {47161A3C-4FAA-15AF-77E0-3EFE41441185}.debug|Win32.ActiveCfg = debug|Win32
-               {47161A3C-4FAA-15AF-77E0-3EFE41441185}.debug|Win32.Build.0 = debug|Win32
-               {47161A3C-4FAA-15AF-77E0-3EFE41441185}.release|Win32.ActiveCfg = release|Win32
-               {47161A3C-4FAA-15AF-77E0-3EFE41441185}.release|Win32.Build.0 = release|Win32
-               {47161A3C-4FAA-15AF-77E0-3EFE41441185}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {47161A3C-4FAA-15AF-77E0-3EFE41441185}.release-assert|Win32.Build.0 = release-assert|Win32
-               {477E59C9-08B0-5599-0133-29D54652239C}.debug|Win32.ActiveCfg = debug|Win32
-               {477E59C9-08B0-5599-0133-29D54652239C}.debug|Win32.Build.0 = debug|Win32
-               {477E59C9-08B0-5599-0133-29D54652239C}.release|Win32.ActiveCfg = release|Win32
-               {477E59C9-08B0-5599-0133-29D54652239C}.release|Win32.Build.0 = release|Win32
-               {477E59C9-08B0-5599-0133-29D54652239C}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {477E59C9-08B0-5599-0133-29D54652239C}.release-assert|Win32.Build.0 = release-assert|Win32
-               {47F44147-58D6-0D81-2BAF-52077C0307F6}.debug|Win32.ActiveCfg = debug|Win32
-               {47F44147-58D6-0D81-2BAF-52077C0307F6}.debug|Win32.Build.0 = debug|Win32
-               {47F44147-58D6-0D81-2BAF-52077C0307F6}.release|Win32.ActiveCfg = release|Win32
-               {47F44147-58D6-0D81-2BAF-52077C0307F6}.release|Win32.Build.0 = release|Win32
-               {47F44147-58D6-0D81-2BAF-52077C0307F6}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {47F44147-58D6-0D81-2BAF-52077C0307F6}.release-assert|Win32.Build.0 = release-assert|Win32
-               {486354CD-1D6C-0969-0597-5B8C1962032F}.debug|Win32.ActiveCfg = debug|Win32
-               {486354CD-1D6C-0969-0597-5B8C1962032F}.debug|Win32.Build.0 = debug|Win32
-               {486354CD-1D6C-0969-0597-5B8C1962032F}.release|Win32.ActiveCfg = release|Win32
-               {486354CD-1D6C-0969-0597-5B8C1962032F}.release|Win32.Build.0 = release|Win32
-               {486354CD-1D6C-0969-0597-5B8C1962032F}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {486354CD-1D6C-0969-0597-5B8C1962032F}.release-assert|Win32.Build.0 = release-assert|Win32
-               {48BF6C69-3F51-5156-6DBF-09096DCF4303}.debug|Win32.ActiveCfg = debug|Win32
-               {48BF6C69-3F51-5156-6DBF-09096DCF4303}.debug|Win32.Build.0 = debug|Win32
-               {48BF6C69-3F51-5156-6DBF-09096DCF4303}.release|Win32.ActiveCfg = release|Win32
-               {48BF6C69-3F51-5156-6DBF-09096DCF4303}.release|Win32.Build.0 = release|Win32
-               {48BF6C69-3F51-5156-6DBF-09096DCF4303}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {48BF6C69-3F51-5156-6DBF-09096DCF4303}.release-assert|Win32.Build.0 = release-assert|Win32
-               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}.debug|Win32.ActiveCfg = debug|Win32
-               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}.debug|Win32.Build.0 = debug|Win32
-               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}.release|Win32.ActiveCfg = release|Win32
-               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}.release|Win32.Build.0 = release|Win32
-               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}.release-assert|Win32.Build.0 = release-assert|Win32
-               {499D1374-487C-4927-218E-1C12288D3975}.debug|Win32.ActiveCfg = debug|Win32
-               {499D1374-487C-4927-218E-1C12288D3975}.debug|Win32.Build.0 = debug|Win32
-               {499D1374-487C-4927-218E-1C12288D3975}.release|Win32.ActiveCfg = release|Win32
-               {499D1374-487C-4927-218E-1C12288D3975}.release|Win32.Build.0 = release|Win32
-               {499D1374-487C-4927-218E-1C12288D3975}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {499D1374-487C-4927-218E-1C12288D3975}.release-assert|Win32.Build.0 = release-assert|Win32
-               {49F50113-2499-3315-616B-3A3870D104B8}.debug|Win32.ActiveCfg = debug|Win32
-               {49F50113-2499-3315-616B-3A3870D104B8}.debug|Win32.Build.0 = debug|Win32
-               {49F50113-2499-3315-616B-3A3870D104B8}.release|Win32.ActiveCfg = release|Win32
-               {49F50113-2499-3315-616B-3A3870D104B8}.release|Win32.Build.0 = release|Win32
-               {49F50113-2499-3315-616B-3A3870D104B8}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {49F50113-2499-3315-616B-3A3870D104B8}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4A6E128E-3A87-48FB-3433-71C132AA5DA3}.debug|Win32.ActiveCfg = debug|Win32
-               {4A6E128E-3A87-48FB-3433-71C132AA5DA3}.debug|Win32.Build.0 = debug|Win32
-               {4A6E128E-3A87-48FB-3433-71C132AA5DA3}.release|Win32.ActiveCfg = release|Win32
-               {4A6E128E-3A87-48FB-3433-71C132AA5DA3}.release|Win32.Build.0 = release|Win32
-               {4A6E128E-3A87-48FB-3433-71C132AA5DA3}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4A6E128E-3A87-48FB-3433-71C132AA5DA3}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4AC25631-50DC-54EA-4BC6-00906EC63456}.debug|Win32.ActiveCfg = debug|Win32
-               {4AC25631-50DC-54EA-4BC6-00906EC63456}.debug|Win32.Build.0 = debug|Win32
-               {4AC25631-50DC-54EA-4BC6-00906EC63456}.release|Win32.ActiveCfg = release|Win32
-               {4AC25631-50DC-54EA-4BC6-00906EC63456}.release|Win32.Build.0 = release|Win32
-               {4AC25631-50DC-54EA-4BC6-00906EC63456}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4AC25631-50DC-54EA-4BC6-00906EC63456}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}.debug|Win32.ActiveCfg = debug|Win32
-               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}.debug|Win32.Build.0 = debug|Win32
-               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}.release|Win32.ActiveCfg = release|Win32
-               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}.release|Win32.Build.0 = release|Win32
-               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4B790568-14A5-64C3-1C16-5B89179F33FE}.debug|Win32.ActiveCfg = debug|Win32
-               {4B790568-14A5-64C3-1C16-5B89179F33FE}.debug|Win32.Build.0 = debug|Win32
-               {4B790568-14A5-64C3-1C16-5B89179F33FE}.release|Win32.ActiveCfg = release|Win32
-               {4B790568-14A5-64C3-1C16-5B89179F33FE}.release|Win32.Build.0 = release|Win32
-               {4B790568-14A5-64C3-1C16-5B89179F33FE}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4B790568-14A5-64C3-1C16-5B89179F33FE}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4BCB1F0E-6531-12B2-0B5E-5B0147921621}.debug|Win32.ActiveCfg = debug|Win32
-               {4BCB1F0E-6531-12B2-0B5E-5B0147921621}.debug|Win32.Build.0 = debug|Win32
-               {4BCB1F0E-6531-12B2-0B5E-5B0147921621}.release|Win32.ActiveCfg = release|Win32
-               {4BCB1F0E-6531-12B2-0B5E-5B0147921621}.release|Win32.Build.0 = release|Win32
-               {4BCB1F0E-6531-12B2-0B5E-5B0147921621}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4BCB1F0E-6531-12B2-0B5E-5B0147921621}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}.debug|Win32.ActiveCfg = debug|Win32
-               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}.debug|Win32.Build.0 = debug|Win32
-               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}.release|Win32.ActiveCfg = release|Win32
-               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}.release|Win32.Build.0 = release|Win32
-               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4C7F2448-6333-448C-3364-26A364432138}.debug|Win32.ActiveCfg = debug|Win32
-               {4C7F2448-6333-448C-3364-26A364432138}.debug|Win32.Build.0 = debug|Win32
-               {4C7F2448-6333-448C-3364-26A364432138}.release|Win32.ActiveCfg = release|Win32
-               {4C7F2448-6333-448C-3364-26A364432138}.release|Win32.Build.0 = release|Win32
-               {4C7F2448-6333-448C-3364-26A364432138}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4C7F2448-6333-448C-3364-26A364432138}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4CDA3BE4-0518-0C79-1B8C-542038B0610D}.debug|Win32.ActiveCfg = debug|Win32
-               {4CDA3BE4-0518-0C79-1B8C-542038B0610D}.debug|Win32.Build.0 = debug|Win32
-               {4CDA3BE4-0518-0C79-1B8C-542038B0610D}.release|Win32.ActiveCfg = release|Win32
-               {4CDA3BE4-0518-0C79-1B8C-542038B0610D}.release|Win32.Build.0 = release|Win32
-               {4CDA3BE4-0518-0C79-1B8C-542038B0610D}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4CDA3BE4-0518-0C79-1B8C-542038B0610D}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E}.debug|Win32.ActiveCfg = debug|Win32
-               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E}.debug|Win32.Build.0 = debug|Win32
-               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E}.release|Win32.ActiveCfg = release|Win32
-               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E}.release|Win32.Build.0 = release|Win32
-               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4D81192C-6BF8-4656-2267-626724BF19E2}.debug|Win32.ActiveCfg = debug|Win32
-               {4D81192C-6BF8-4656-2267-626724BF19E2}.debug|Win32.Build.0 = debug|Win32
-               {4D81192C-6BF8-4656-2267-626724BF19E2}.release|Win32.ActiveCfg = release|Win32
-               {4D81192C-6BF8-4656-2267-626724BF19E2}.release|Win32.Build.0 = release|Win32
-               {4D81192C-6BF8-4656-2267-626724BF19E2}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4D81192C-6BF8-4656-2267-626724BF19E2}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}.debug|Win32.ActiveCfg = debug|Win32
-               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}.debug|Win32.Build.0 = debug|Win32
-               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}.release|Win32.ActiveCfg = release|Win32
-               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}.release|Win32.Build.0 = release|Win32
-               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4E341E67-69FA-7830-4A6D-2E09417024FA}.debug|Win32.ActiveCfg = debug|Win32
-               {4E341E67-69FA-7830-4A6D-2E09417024FA}.debug|Win32.Build.0 = debug|Win32
-               {4E341E67-69FA-7830-4A6D-2E09417024FA}.release|Win32.ActiveCfg = release|Win32
-               {4E341E67-69FA-7830-4A6D-2E09417024FA}.release|Win32.Build.0 = release|Win32
-               {4E341E67-69FA-7830-4A6D-2E09417024FA}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4E341E67-69FA-7830-4A6D-2E09417024FA}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4E830E10-74BE-4820-116A-1E2A653A128B}.debug|Win32.ActiveCfg = debug|Win32
-               {4E830E10-74BE-4820-116A-1E2A653A128B}.debug|Win32.Build.0 = debug|Win32
-               {4E830E10-74BE-4820-116A-1E2A653A128B}.release|Win32.ActiveCfg = release|Win32
-               {4E830E10-74BE-4820-116A-1E2A653A128B}.release|Win32.Build.0 = release|Win32
-               {4E830E10-74BE-4820-116A-1E2A653A128B}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4E830E10-74BE-4820-116A-1E2A653A128B}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4EE823A1-67FB-2A0B-7272-79AB5E203011}.debug|Win32.ActiveCfg = debug|Win32
-               {4EE823A1-67FB-2A0B-7272-79AB5E203011}.debug|Win32.Build.0 = debug|Win32
-               {4EE823A1-67FB-2A0B-7272-79AB5E203011}.release|Win32.ActiveCfg = release|Win32
-               {4EE823A1-67FB-2A0B-7272-79AB5E203011}.release|Win32.Build.0 = release|Win32
-               {4EE823A1-67FB-2A0B-7272-79AB5E203011}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4EE823A1-67FB-2A0B-7272-79AB5E203011}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4F670915-097A-7BF0-15CF-4FE2384A721E}.debug|Win32.ActiveCfg = debug|Win32
-               {4F670915-097A-7BF0-15CF-4FE2384A721E}.debug|Win32.Build.0 = debug|Win32
-               {4F670915-097A-7BF0-15CF-4FE2384A721E}.release|Win32.ActiveCfg = release|Win32
-               {4F670915-097A-7BF0-15CF-4FE2384A721E}.release|Win32.Build.0 = release|Win32
-               {4F670915-097A-7BF0-15CF-4FE2384A721E}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4F670915-097A-7BF0-15CF-4FE2384A721E}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4FD94697-13D8-55D8-1801-68BD61D261E7}.debug|Win32.ActiveCfg = debug|Win32
-               {4FD94697-13D8-55D8-1801-68BD61D261E7}.debug|Win32.Build.0 = debug|Win32
-               {4FD94697-13D8-55D8-1801-68BD61D261E7}.release|Win32.ActiveCfg = release|Win32
-               {4FD94697-13D8-55D8-1801-68BD61D261E7}.release|Win32.Build.0 = release|Win32
-               {4FD94697-13D8-55D8-1801-68BD61D261E7}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4FD94697-13D8-55D8-1801-68BD61D261E7}.release-assert|Win32.Build.0 = release-assert|Win32
-               {50283641-1E9C-25C7-5EFF-58DF059D4F79}.debug|Win32.ActiveCfg = debug|Win32
-               {50283641-1E9C-25C7-5EFF-58DF059D4F79}.debug|Win32.Build.0 = debug|Win32
-               {50283641-1E9C-25C7-5EFF-58DF059D4F79}.release|Win32.ActiveCfg = release|Win32
-               {50283641-1E9C-25C7-5EFF-58DF059D4F79}.release|Win32.Build.0 = release|Win32
-               {50283641-1E9C-25C7-5EFF-58DF059D4F79}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {50283641-1E9C-25C7-5EFF-58DF059D4F79}.release-assert|Win32.Build.0 = release-assert|Win32
-               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC}.debug|Win32.ActiveCfg = debug|Win32
-               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC}.debug|Win32.Build.0 = debug|Win32
-               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC}.release|Win32.ActiveCfg = release|Win32
-               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC}.release|Win32.Build.0 = release|Win32
-               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC}.release-assert|Win32.Build.0 = release-assert|Win32
-               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3}.debug|Win32.ActiveCfg = debug|Win32
-               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3}.debug|Win32.Build.0 = debug|Win32
-               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3}.release|Win32.ActiveCfg = release|Win32
-               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3}.release|Win32.Build.0 = release|Win32
-               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3}.release-assert|Win32.Build.0 = release-assert|Win32
-               {51472505-1B6B-758B-38A1-1EAF33846138}.debug|Win32.ActiveCfg = debug|Win32
-               {51472505-1B6B-758B-38A1-1EAF33846138}.debug|Win32.Build.0 = debug|Win32
-               {51472505-1B6B-758B-38A1-1EAF33846138}.release|Win32.ActiveCfg = release|Win32
-               {51472505-1B6B-758B-38A1-1EAF33846138}.release|Win32.Build.0 = release|Win32
-               {51472505-1B6B-758B-38A1-1EAF33846138}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {51472505-1B6B-758B-38A1-1EAF33846138}.release-assert|Win32.Build.0 = release-assert|Win32
-               {519F12A4-7788-5F78-787F-3CD57BC82C7C}.debug|Win32.ActiveCfg = debug|Win32
-               {519F12A4-7788-5F78-787F-3CD57BC82C7C}.debug|Win32.Build.0 = debug|Win32
-               {519F12A4-7788-5F78-787F-3CD57BC82C7C}.release|Win32.ActiveCfg = release|Win32
-               {519F12A4-7788-5F78-787F-3CD57BC82C7C}.release|Win32.Build.0 = release|Win32
-               {519F12A4-7788-5F78-787F-3CD57BC82C7C}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {519F12A4-7788-5F78-787F-3CD57BC82C7C}.release-assert|Win32.Build.0 = release-assert|Win32
-               {51EE024D-024C-2F68-3F7C-2CF61F931A0D}.debug|Win32.ActiveCfg = debug|Win32
-               {51EE024D-024C-2F68-3F7C-2CF61F931A0D}.debug|Win32.Build.0 = debug|Win32
-               {51EE024D-024C-2F68-3F7C-2CF61F931A0D}.release|Win32.ActiveCfg = release|Win32
-               {51EE024D-024C-2F68-3F7C-2CF61F931A0D}.release|Win32.Build.0 = release|Win32
-               {51EE024D-024C-2F68-3F7C-2CF61F931A0D}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {51EE024D-024C-2F68-3F7C-2CF61F931A0D}.release-assert|Win32.Build.0 = release-assert|Win32
-               {524345F0-18A0-3B56-570F-3BC55BAF70C0}.debug|Win32.ActiveCfg = debug|Win32
-               {524345F0-18A0-3B56-570F-3BC55BAF70C0}.debug|Win32.Build.0 = debug|Win32
-               {524345F0-18A0-3B56-570F-3BC55BAF70C0}.release|Win32.ActiveCfg = release|Win32
-               {524345F0-18A0-3B56-570F-3BC55BAF70C0}.release|Win32.Build.0 = release|Win32
-               {524345F0-18A0-3B56-570F-3BC55BAF70C0}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {524345F0-18A0-3B56-570F-3BC55BAF70C0}.release-assert|Win32.Build.0 = release-assert|Win32
-               {529E5D8B-3A85-0343-3F37-6941301C3095}.debug|Win32.ActiveCfg = debug|Win32
-               {529E5D8B-3A85-0343-3F37-6941301C3095}.debug|Win32.Build.0 = debug|Win32
-               {529E5D8B-3A85-0343-3F37-6941301C3095}.release|Win32.ActiveCfg = release|Win32
-               {529E5D8B-3A85-0343-3F37-6941301C3095}.release|Win32.Build.0 = release|Win32
-               {529E5D8B-3A85-0343-3F37-6941301C3095}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {529E5D8B-3A85-0343-3F37-6941301C3095}.release-assert|Win32.Build.0 = release-assert|Win32
-               {52F07731-0B12-3132-2E80-68BA600F12B7}.debug|Win32.ActiveCfg = debug|Win32
-               {52F07731-0B12-3132-2E80-68BA600F12B7}.debug|Win32.Build.0 = debug|Win32
-               {52F07731-0B12-3132-2E80-68BA600F12B7}.release|Win32.ActiveCfg = release|Win32
-               {52F07731-0B12-3132-2E80-68BA600F12B7}.release|Win32.Build.0 = release|Win32
-               {52F07731-0B12-3132-2E80-68BA600F12B7}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {52F07731-0B12-3132-2E80-68BA600F12B7}.release-assert|Win32.Build.0 = release-assert|Win32
-               {534864D0-672E-1B1F-6E5D-06DF28535DFA}.debug|Win32.ActiveCfg = debug|Win32
-               {534864D0-672E-1B1F-6E5D-06DF28535DFA}.debug|Win32.Build.0 = debug|Win32
-               {534864D0-672E-1B1F-6E5D-06DF28535DFA}.release|Win32.ActiveCfg = release|Win32
-               {534864D0-672E-1B1F-6E5D-06DF28535DFA}.release|Win32.Build.0 = release|Win32
-               {534864D0-672E-1B1F-6E5D-06DF28535DFA}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {534864D0-672E-1B1F-6E5D-06DF28535DFA}.release-assert|Win32.Build.0 = release-assert|Win32
-               {53A37C6C-0913-630C-5685-345C7CC01DCF}.debug|Win32.ActiveCfg = debug|Win32
-               {53A37C6C-0913-630C-5685-345C7CC01DCF}.debug|Win32.Build.0 = debug|Win32
-               {53A37C6C-0913-630C-5685-345C7CC01DCF}.release|Win32.ActiveCfg = release|Win32
-               {53A37C6C-0913-630C-5685-345C7CC01DCF}.release|Win32.Build.0 = release|Win32
-               {53A37C6C-0913-630C-5685-345C7CC01DCF}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {53A37C6C-0913-630C-5685-345C7CC01DCF}.release-assert|Win32.Build.0 = release-assert|Win32
-               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}.debug|Win32.ActiveCfg = debug|Win32
-               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}.debug|Win32.Build.0 = debug|Win32
-               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}.release|Win32.ActiveCfg = release|Win32
-               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}.release|Win32.Build.0 = release|Win32
-               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}.release-assert|Win32.Build.0 = release-assert|Win32
-               {54854D74-5807-38DD-329F-56BC43A708D1}.debug|Win32.ActiveCfg = debug|Win32
-               {54854D74-5807-38DD-329F-56BC43A708D1}.debug|Win32.Build.0 = debug|Win32
-               {54854D74-5807-38DD-329F-56BC43A708D1}.release|Win32.ActiveCfg = release|Win32
-               {54854D74-5807-38DD-329F-56BC43A708D1}.release|Win32.Build.0 = release|Win32
-               {54854D74-5807-38DD-329F-56BC43A708D1}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {54854D74-5807-38DD-329F-56BC43A708D1}.release-assert|Win32.Build.0 = release-assert|Win32
-               {54D33D1E-62CB-08CC-799D-46DE67727662}.debug|Win32.ActiveCfg = debug|Win32
-               {54D33D1E-62CB-08CC-799D-46DE67727662}.debug|Win32.Build.0 = debug|Win32
-               {54D33D1E-62CB-08CC-799D-46DE67727662}.release|Win32.ActiveCfg = release|Win32
-               {54D33D1E-62CB-08CC-799D-46DE67727662}.release|Win32.Build.0 = release|Win32
-               {54D33D1E-62CB-08CC-799D-46DE67727662}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {54D33D1E-62CB-08CC-799D-46DE67727662}.release-assert|Win32.Build.0 = release-assert|Win32
-               {552556C4-3357-36BB-68E5-465617655884}.debug|Win32.ActiveCfg = debug|Win32
-               {552556C4-3357-36BB-68E5-465617655884}.debug|Win32.Build.0 = debug|Win32
-               {552556C4-3357-36BB-68E5-465617655884}.release|Win32.ActiveCfg = release|Win32
-               {552556C4-3357-36BB-68E5-465617655884}.release|Win32.Build.0 = release|Win32
-               {552556C4-3357-36BB-68E5-465617655884}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {552556C4-3357-36BB-68E5-465617655884}.release-assert|Win32.Build.0 = release-assert|Win32
-               {59BC61B6-54D5-65C4-11C4-584D30474409}.debug|Win32.ActiveCfg = debug|Win32
-               {59BC61B6-54D5-65C4-11C4-584D30474409}.debug|Win32.Build.0 = debug|Win32
-               {59BC61B6-54D5-65C4-11C4-584D30474409}.release|Win32.ActiveCfg = release|Win32
-               {59BC61B6-54D5-65C4-11C4-584D30474409}.release|Win32.Build.0 = release|Win32
-               {59BC61B6-54D5-65C4-11C4-584D30474409}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {59BC61B6-54D5-65C4-11C4-584D30474409}.release-assert|Win32.Build.0 = release-assert|Win32
-               {5A144F55-30F2-4FB1-51A1-7672788B0F4D}.debug|Win32.ActiveCfg = debug|Win32
-               {5A144F55-30F2-4FB1-51A1-7672788B0F4D}.debug|Win32.Build.0 = debug|Win32
-               {5A144F55-30F2-4FB1-51A1-7672788B0F4D}.release|Win32.ActiveCfg = release|Win32
-               {5A144F55-30F2-4FB1-51A1-7672788B0F4D}.release|Win32.Build.0 = release|Win32
-               {5A144F55-30F2-4FB1-51A1-7672788B0F4D}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {5A144F55-30F2-4FB1-51A1-7672788B0F4D}.release-assert|Win32.Build.0 = release-assert|Win32
-               {5D5521C1-3355-7102-73EA-3DD714D62B76}.debug|Win32.ActiveCfg = debug|Win32
-               {5D5521C1-3355-7102-73EA-3DD714D62B76}.debug|Win32.Build.0 = debug|Win32
-               {5D5521C1-3355-7102-73EA-3DD714D62B76}.release|Win32.ActiveCfg = release|Win32
-               {5D5521C1-3355-7102-73EA-3DD714D62B76}.release|Win32.Build.0 = release|Win32
-               {5D5521C1-3355-7102-73EA-3DD714D62B76}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {5D5521C1-3355-7102-73EA-3DD714D62B76}.release-assert|Win32.Build.0 = release-assert|Win32
-               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228}.debug|Win32.ActiveCfg = debug|Win32
-               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228}.debug|Win32.Build.0 = debug|Win32
-               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228}.release|Win32.ActiveCfg = release|Win32
-               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228}.release|Win32.Build.0 = release|Win32
-               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228}.release-assert|Win32.Build.0 = release-assert|Win32
-               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA}.debug|Win32.ActiveCfg = debug|Win32
-               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA}.debug|Win32.Build.0 = debug|Win32
-               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA}.release|Win32.ActiveCfg = release|Win32
-               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA}.release|Win32.Build.0 = release|Win32
-               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA}.release-assert|Win32.Build.0 = release-assert|Win32
-               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08}.debug|Win32.ActiveCfg = debug|Win32
-               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08}.debug|Win32.Build.0 = debug|Win32
-               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08}.release|Win32.ActiveCfg = release|Win32
-               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08}.release|Win32.Build.0 = release|Win32
-               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08}.release-assert|Win32.Build.0 = release-assert|Win32
-               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8}.debug|Win32.ActiveCfg = debug|Win32
-               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8}.debug|Win32.Build.0 = debug|Win32
-               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8}.release|Win32.ActiveCfg = release|Win32
-               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8}.release|Win32.Build.0 = release|Win32
-               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8}.release-assert|Win32.Build.0 = release-assert|Win32
-               {5EC3002E-3AE8-10B5-148A-73C866892AC7}.debug|Win32.ActiveCfg = debug|Win32
-               {5EC3002E-3AE8-10B5-148A-73C866892AC7}.debug|Win32.Build.0 = debug|Win32
-               {5EC3002E-3AE8-10B5-148A-73C866892AC7}.release|Win32.ActiveCfg = release|Win32
-               {5EC3002E-3AE8-10B5-148A-73C866892AC7}.release|Win32.Build.0 = release|Win32
-               {5EC3002E-3AE8-10B5-148A-73C866892AC7}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {5EC3002E-3AE8-10B5-148A-73C866892AC7}.release-assert|Win32.Build.0 = release-assert|Win32
-               {5F1843D1-513D-1CA4-2C1D-029722A5017A}.debug|Win32.ActiveCfg = debug|Win32
-               {5F1843D1-513D-1CA4-2C1D-029722A5017A}.debug|Win32.Build.0 = debug|Win32
-               {5F1843D1-513D-1CA4-2C1D-029722A5017A}.release|Win32.ActiveCfg = release|Win32
-               {5F1843D1-513D-1CA4-2C1D-029722A5017A}.release|Win32.Build.0 = release|Win32
-               {5F1843D1-513D-1CA4-2C1D-029722A5017A}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {5F1843D1-513D-1CA4-2C1D-029722A5017A}.release-assert|Win32.Build.0 = release-assert|Win32
-               {5F605F82-5071-3095-2286-540B2E1F05EA}.debug|Win32.ActiveCfg = debug|Win32
-               {5F605F82-5071-3095-2286-540B2E1F05EA}.debug|Win32.Build.0 = debug|Win32
-               {5F605F82-5071-3095-2286-540B2E1F05EA}.release|Win32.ActiveCfg = release|Win32
-               {5F605F82-5071-3095-2286-540B2E1F05EA}.release|Win32.Build.0 = release|Win32
-               {5F605F82-5071-3095-2286-540B2E1F05EA}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {5F605F82-5071-3095-2286-540B2E1F05EA}.release-assert|Win32.Build.0 = release-assert|Win32
-               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}.debug|Win32.ActiveCfg = debug|Win32
-               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}.debug|Win32.Build.0 = debug|Win32
-               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}.release|Win32.ActiveCfg = release|Win32
-               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}.release|Win32.Build.0 = release|Win32
-               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}.release-assert|Win32.Build.0 = release-assert|Win32
-               {5FFC3ED5-65F9-5074-3081-344E75B4610C}.debug|Win32.ActiveCfg = debug|Win32
-               {5FFC3ED5-65F9-5074-3081-344E75B4610C}.debug|Win32.Build.0 = debug|Win32
-               {5FFC3ED5-65F9-5074-3081-344E75B4610C}.release|Win32.ActiveCfg = release|Win32
-               {5FFC3ED5-65F9-5074-3081-344E75B4610C}.release|Win32.Build.0 = release|Win32
-               {5FFC3ED5-65F9-5074-3081-344E75B4610C}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {5FFC3ED5-65F9-5074-3081-344E75B4610C}.release-assert|Win32.Build.0 = release-assert|Win32
-               {60445A86-652D-6464-26EA-05C2012E657C}.debug|Win32.ActiveCfg = debug|Win32
-               {60445A86-652D-6464-26EA-05C2012E657C}.debug|Win32.Build.0 = debug|Win32
-               {60445A86-652D-6464-26EA-05C2012E657C}.release|Win32.ActiveCfg = release|Win32
-               {60445A86-652D-6464-26EA-05C2012E657C}.release|Win32.Build.0 = release|Win32
-               {60445A86-652D-6464-26EA-05C2012E657C}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {60445A86-652D-6464-26EA-05C2012E657C}.release-assert|Win32.Build.0 = release-assert|Win32
-               {6096742C-35B9-1253-1632-053B3121479F}.debug|Win32.ActiveCfg = debug|Win32
-               {6096742C-35B9-1253-1632-053B3121479F}.debug|Win32.Build.0 = debug|Win32
-               {6096742C-35B9-1253-1632-053B3121479F}.release|Win32.ActiveCfg = release|Win32
-               {6096742C-35B9-1253-1632-053B3121479F}.release|Win32.Build.0 = release|Win32
-               {6096742C-35B9-1253-1632-053B3121479F}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {6096742C-35B9-1253-1632-053B3121479F}.release-assert|Win32.Build.0 = release-assert|Win32
-               {60E80DD2-0645-4042-057B-04B3611529C1}.debug|Win32.ActiveCfg = debug|Win32
-               {60E80DD2-0645-4042-057B-04B3611529C1}.debug|Win32.Build.0 = debug|Win32
-               {60E80DD2-0645-4042-057B-04B3611529C1}.release|Win32.ActiveCfg = release|Win32
-               {60E80DD2-0645-4042-057B-04B3611529C1}.release|Win32.Build.0 = release|Win32
-               {60E80DD2-0645-4042-057B-04B3611529C1}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {60E80DD2-0645-4042-057B-04B3611529C1}.release-assert|Win32.Build.0 = release-assert|Win32
-               {61464F6A-6DF2-662E-15ED-418641AA5E26}.debug|Win32.ActiveCfg = debug|Win32
-               {61464F6A-6DF2-662E-15ED-418641AA5E26}.debug|Win32.Build.0 = debug|Win32
-               {61464F6A-6DF2-662E-15ED-418641AA5E26}.release|Win32.ActiveCfg = release|Win32
-               {61464F6A-6DF2-662E-15ED-418641AA5E26}.release|Win32.Build.0 = release|Win32
-               {61464F6A-6DF2-662E-15ED-418641AA5E26}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {61464F6A-6DF2-662E-15ED-418641AA5E26}.release-assert|Win32.Build.0 = release-assert|Win32
-               {61911518-32EE-581F-34A1-2251594C5726}.debug|Win32.ActiveCfg = debug|Win32
-               {61911518-32EE-581F-34A1-2251594C5726}.debug|Win32.Build.0 = debug|Win32
-               {61911518-32EE-581F-34A1-2251594C5726}.release|Win32.ActiveCfg = release|Win32
-               {61911518-32EE-581F-34A1-2251594C5726}.release|Win32.Build.0 = release|Win32
-               {61911518-32EE-581F-34A1-2251594C5726}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {61911518-32EE-581F-34A1-2251594C5726}.release-assert|Win32.Build.0 = release-assert|Win32
-               {61D930C8-3222-6C0F-2B09-73C564C65B96}.debug|Win32.ActiveCfg = debug|Win32
-               {61D930C8-3222-6C0F-2B09-73C564C65B96}.debug|Win32.Build.0 = debug|Win32
-               {61D930C8-3222-6C0F-2B09-73C564C65B96}.release|Win32.ActiveCfg = release|Win32
-               {61D930C8-3222-6C0F-2B09-73C564C65B96}.release|Win32.Build.0 = release|Win32
-               {61D930C8-3222-6C0F-2B09-73C564C65B96}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {61D930C8-3222-6C0F-2B09-73C564C65B96}.release-assert|Win32.Build.0 = release-assert|Win32
-               {621E227D-6B8E-2201-7927-35E264186B76}.debug|Win32.ActiveCfg = debug|Win32
-               {621E227D-6B8E-2201-7927-35E264186B76}.debug|Win32.Build.0 = debug|Win32
-               {621E227D-6B8E-2201-7927-35E264186B76}.release|Win32.ActiveCfg = release|Win32
-               {621E227D-6B8E-2201-7927-35E264186B76}.release|Win32.Build.0 = release|Win32
-               {621E227D-6B8E-2201-7927-35E264186B76}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {621E227D-6B8E-2201-7927-35E264186B76}.release-assert|Win32.Build.0 = release-assert|Win32
-               {62621432-24F9-57F3-4745-780063697B55}.debug|Win32.ActiveCfg = debug|Win32
-               {62621432-24F9-57F3-4745-780063697B55}.debug|Win32.Build.0 = debug|Win32
-               {62621432-24F9-57F3-4745-780063697B55}.release|Win32.ActiveCfg = release|Win32
-               {62621432-24F9-57F3-4745-780063697B55}.release|Win32.Build.0 = release|Win32
-               {62621432-24F9-57F3-4745-780063697B55}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {62621432-24F9-57F3-4745-780063697B55}.release-assert|Win32.Build.0 = release-assert|Win32
-               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213}.debug|Win32.ActiveCfg = debug|Win32
-               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213}.debug|Win32.Build.0 = debug|Win32
-               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213}.release|Win32.ActiveCfg = release|Win32
-               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213}.release|Win32.Build.0 = release|Win32
-               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213}.release-assert|Win32.Build.0 = release-assert|Win32
-               {62E279A5-4678-29D8-6AA2-4E363D933D61}.debug|Win32.ActiveCfg = debug|Win32
-               {62E279A5-4678-29D8-6AA2-4E363D933D61}.debug|Win32.Build.0 = debug|Win32
-               {62E279A5-4678-29D8-6AA2-4E363D933D61}.release|Win32.ActiveCfg = release|Win32
-               {62E279A5-4678-29D8-6AA2-4E363D933D61}.release|Win32.Build.0 = release|Win32
-               {62E279A5-4678-29D8-6AA2-4E363D933D61}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {62E279A5-4678-29D8-6AA2-4E363D933D61}.release-assert|Win32.Build.0 = release-assert|Win32
-               {45D8782C-23BC-5A59-47C8-5416580E1D6F}.debug|Win32.ActiveCfg = debug|Win32
-               {45D8782C-23BC-5A59-47C8-5416580E1D6F}.debug|Win32.Build.0 = debug|Win32
-               {45D8782C-23BC-5A59-47C8-5416580E1D6F}.release|Win32.ActiveCfg = release|Win32
-               {45D8782C-23BC-5A59-47C8-5416580E1D6F}.release|Win32.Build.0 = release|Win32
-               {45D8782C-23BC-5A59-47C8-5416580E1D6F}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {45D8782C-23BC-5A59-47C8-5416580E1D6F}.release-assert|Win32.Build.0 = release-assert|Win32
-               {46A97746-15C7-5A2D-5A6D-29C5622B419D}.debug|Win32.ActiveCfg = debug|Win32
-               {46A97746-15C7-5A2D-5A6D-29C5622B419D}.debug|Win32.Build.0 = debug|Win32
-               {46A97746-15C7-5A2D-5A6D-29C5622B419D}.release|Win32.ActiveCfg = release|Win32
-               {46A97746-15C7-5A2D-5A6D-29C5622B419D}.release|Win32.Build.0 = release|Win32
-               {46A97746-15C7-5A2D-5A6D-29C5622B419D}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {46A97746-15C7-5A2D-5A6D-29C5622B419D}.release-assert|Win32.Build.0 = release-assert|Win32
-               {473504AB-4E66-2410-1EF3-3D566CF655EC}.debug|Win32.ActiveCfg = debug|Win32
-               {473504AB-4E66-2410-1EF3-3D566CF655EC}.debug|Win32.Build.0 = debug|Win32
-               {473504AB-4E66-2410-1EF3-3D566CF655EC}.release|Win32.ActiveCfg = release|Win32
-               {473504AB-4E66-2410-1EF3-3D566CF655EC}.release|Win32.Build.0 = release|Win32
-               {473504AB-4E66-2410-1EF3-3D566CF655EC}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {473504AB-4E66-2410-1EF3-3D566CF655EC}.release-assert|Win32.Build.0 = release-assert|Win32
-               {47C21211-0705-6DF2-637A-50E777C26A3B}.debug|Win32.ActiveCfg = debug|Win32
-               {47C21211-0705-6DF2-637A-50E777C26A3B}.debug|Win32.Build.0 = debug|Win32
-               {47C21211-0705-6DF2-637A-50E777C26A3B}.release|Win32.ActiveCfg = release|Win32
-               {47C21211-0705-6DF2-637A-50E777C26A3B}.release|Win32.Build.0 = release|Win32
-               {47C21211-0705-6DF2-637A-50E777C26A3B}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {47C21211-0705-6DF2-637A-50E777C26A3B}.release-assert|Win32.Build.0 = release-assert|Win32
-               {482D7B9A-05D3-0BDC-1517-4B1508F970E3}.debug|Win32.ActiveCfg = debug|Win32
-               {482D7B9A-05D3-0BDC-1517-4B1508F970E3}.debug|Win32.Build.0 = debug|Win32
-               {482D7B9A-05D3-0BDC-1517-4B1508F970E3}.release|Win32.ActiveCfg = release|Win32
-               {482D7B9A-05D3-0BDC-1517-4B1508F970E3}.release|Win32.Build.0 = release|Win32
-               {482D7B9A-05D3-0BDC-1517-4B1508F970E3}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {482D7B9A-05D3-0BDC-1517-4B1508F970E3}.release-assert|Win32.Build.0 = release-assert|Win32
-               {48BA08FF-3E72-55BE-599E-5EA713C40532}.debug|Win32.ActiveCfg = debug|Win32
-               {48BA08FF-3E72-55BE-599E-5EA713C40532}.debug|Win32.Build.0 = debug|Win32
-               {48BA08FF-3E72-55BE-599E-5EA713C40532}.release|Win32.ActiveCfg = release|Win32
-               {48BA08FF-3E72-55BE-599E-5EA713C40532}.release|Win32.Build.0 = release|Win32
-               {48BA08FF-3E72-55BE-599E-5EA713C40532}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {48BA08FF-3E72-55BE-599E-5EA713C40532}.release-assert|Win32.Build.0 = release-assert|Win32
-               {490F4CA2-54C7-61AC-7131-6D764FE05BE5}.debug|Win32.ActiveCfg = debug|Win32
-               {490F4CA2-54C7-61AC-7131-6D764FE05BE5}.debug|Win32.Build.0 = debug|Win32
-               {490F4CA2-54C7-61AC-7131-6D764FE05BE5}.release|Win32.ActiveCfg = release|Win32
-               {490F4CA2-54C7-61AC-7131-6D764FE05BE5}.release|Win32.Build.0 = release|Win32
-               {490F4CA2-54C7-61AC-7131-6D764FE05BE5}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {490F4CA2-54C7-61AC-7131-6D764FE05BE5}.release-assert|Win32.Build.0 = release-assert|Win32
-               {497E6028-195D-5D95-4B18-76FB6D3F571E}.debug|Win32.ActiveCfg = debug|Win32
-               {497E6028-195D-5D95-4B18-76FB6D3F571E}.debug|Win32.Build.0 = debug|Win32
-               {497E6028-195D-5D95-4B18-76FB6D3F571E}.release|Win32.ActiveCfg = release|Win32
-               {497E6028-195D-5D95-4B18-76FB6D3F571E}.release|Win32.Build.0 = release|Win32
-               {497E6028-195D-5D95-4B18-76FB6D3F571E}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {497E6028-195D-5D95-4B18-76FB6D3F571E}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4A0D178A-17C4-0577-37E9-19E304335FFE}.debug|Win32.ActiveCfg = debug|Win32
-               {4A0D178A-17C4-0577-37E9-19E304335FFE}.debug|Win32.Build.0 = debug|Win32
-               {4A0D178A-17C4-0577-37E9-19E304335FFE}.release|Win32.ActiveCfg = release|Win32
-               {4A0D178A-17C4-0577-37E9-19E304335FFE}.release|Win32.Build.0 = release|Win32
-               {4A0D178A-17C4-0577-37E9-19E304335FFE}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4A0D178A-17C4-0577-37E9-19E304335FFE}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4A732D1A-0B02-6761-18F1-75637D197D84}.debug|Win32.ActiveCfg = debug|Win32
-               {4A732D1A-0B02-6761-18F1-75637D197D84}.debug|Win32.Build.0 = debug|Win32
-               {4A732D1A-0B02-6761-18F1-75637D197D84}.release|Win32.ActiveCfg = release|Win32
-               {4A732D1A-0B02-6761-18F1-75637D197D84}.release|Win32.Build.0 = release|Win32
-               {4A732D1A-0B02-6761-18F1-75637D197D84}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4A732D1A-0B02-6761-18F1-75637D197D84}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4ACB1AB9-671E-514F-58CF-1389455D48C8}.debug|Win32.ActiveCfg = debug|Win32
-               {4ACB1AB9-671E-514F-58CF-1389455D48C8}.debug|Win32.Build.0 = debug|Win32
-               {4ACB1AB9-671E-514F-58CF-1389455D48C8}.release|Win32.ActiveCfg = release|Win32
-               {4ACB1AB9-671E-514F-58CF-1389455D48C8}.release|Win32.Build.0 = release|Win32
-               {4ACB1AB9-671E-514F-58CF-1389455D48C8}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4ACB1AB9-671E-514F-58CF-1389455D48C8}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4B230858-433B-3B3C-18AC-31AF0DA1140B}.debug|Win32.ActiveCfg = debug|Win32
-               {4B230858-433B-3B3C-18AC-31AF0DA1140B}.debug|Win32.Build.0 = debug|Win32
-               {4B230858-433B-3B3C-18AC-31AF0DA1140B}.release|Win32.ActiveCfg = release|Win32
-               {4B230858-433B-3B3C-18AC-31AF0DA1140B}.release|Win32.Build.0 = release|Win32
-               {4B230858-433B-3B3C-18AC-31AF0DA1140B}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4B230858-433B-3B3C-18AC-31AF0DA1140B}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4B717802-4DFF-0B2C-5FAA-21D0316C019D}.debug|Win32.ActiveCfg = debug|Win32
-               {4B717802-4DFF-0B2C-5FAA-21D0316C019D}.debug|Win32.Build.0 = debug|Win32
-               {4B717802-4DFF-0B2C-5FAA-21D0316C019D}.release|Win32.ActiveCfg = release|Win32
-               {4B717802-4DFF-0B2C-5FAA-21D0316C019D}.release|Win32.Build.0 = release|Win32
-               {4B717802-4DFF-0B2C-5FAA-21D0316C019D}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4B717802-4DFF-0B2C-5FAA-21D0316C019D}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}.debug|Win32.ActiveCfg = debug|Win32
-               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}.debug|Win32.Build.0 = debug|Win32
-               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}.release|Win32.ActiveCfg = release|Win32
-               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}.release|Win32.Build.0 = release|Win32
-               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4C631AF8-79DC-36F9-0538-10E2351D3373}.debug|Win32.ActiveCfg = debug|Win32
-               {4C631AF8-79DC-36F9-0538-10E2351D3373}.debug|Win32.Build.0 = debug|Win32
-               {4C631AF8-79DC-36F9-0538-10E2351D3373}.release|Win32.ActiveCfg = release|Win32
-               {4C631AF8-79DC-36F9-0538-10E2351D3373}.release|Win32.Build.0 = release|Win32
-               {4C631AF8-79DC-36F9-0538-10E2351D3373}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4C631AF8-79DC-36F9-0538-10E2351D3373}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4CB10AA2-04A0-06E9-4C36-010458E82104}.debug|Win32.ActiveCfg = debug|Win32
-               {4CB10AA2-04A0-06E9-4C36-010458E82104}.debug|Win32.Build.0 = debug|Win32
-               {4CB10AA2-04A0-06E9-4C36-010458E82104}.release|Win32.ActiveCfg = release|Win32
-               {4CB10AA2-04A0-06E9-4C36-010458E82104}.release|Win32.Build.0 = release|Win32
-               {4CB10AA2-04A0-06E9-4C36-010458E82104}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4CB10AA2-04A0-06E9-4C36-010458E82104}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4D007A4C-0F64-56D8-1334-71257CB30E95}.debug|Win32.ActiveCfg = debug|Win32
-               {4D007A4C-0F64-56D8-1334-71257CB30E95}.debug|Win32.Build.0 = debug|Win32
-               {4D007A4C-0F64-56D8-1334-71257CB30E95}.release|Win32.ActiveCfg = release|Win32
-               {4D007A4C-0F64-56D8-1334-71257CB30E95}.release|Win32.Build.0 = release|Win32
-               {4D007A4C-0F64-56D8-1334-71257CB30E95}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4D007A4C-0F64-56D8-1334-71257CB30E95}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4D446C00-48CF-0CCA-6152-33437C051E75}.debug|Win32.ActiveCfg = debug|Win32
-               {4D446C00-48CF-0CCA-6152-33437C051E75}.debug|Win32.Build.0 = debug|Win32
-               {4D446C00-48CF-0CCA-6152-33437C051E75}.release|Win32.ActiveCfg = release|Win32
-               {4D446C00-48CF-0CCA-6152-33437C051E75}.release|Win32.Build.0 = release|Win32
-               {4D446C00-48CF-0CCA-6152-33437C051E75}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4D446C00-48CF-0CCA-6152-33437C051E75}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}.debug|Win32.ActiveCfg = debug|Win32
-               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}.debug|Win32.Build.0 = debug|Win32
-               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}.release|Win32.ActiveCfg = release|Win32
-               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}.release|Win32.Build.0 = release|Win32
-               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4DF8713A-46D1-3EA4-0958-7EE518B5298C}.debug|Win32.ActiveCfg = debug|Win32
-               {4DF8713A-46D1-3EA4-0958-7EE518B5298C}.debug|Win32.Build.0 = debug|Win32
-               {4DF8713A-46D1-3EA4-0958-7EE518B5298C}.release|Win32.ActiveCfg = release|Win32
-               {4DF8713A-46D1-3EA4-0958-7EE518B5298C}.release|Win32.Build.0 = release|Win32
-               {4DF8713A-46D1-3EA4-0958-7EE518B5298C}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4DF8713A-46D1-3EA4-0958-7EE518B5298C}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F}.debug|Win32.ActiveCfg = debug|Win32
-               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F}.debug|Win32.Build.0 = debug|Win32
-               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F}.release|Win32.ActiveCfg = release|Win32
-               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F}.release|Win32.Build.0 = release|Win32
-               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4EBC4863-21BB-467B-7AD2-173972307B78}.debug|Win32.ActiveCfg = debug|Win32
-               {4EBC4863-21BB-467B-7AD2-173972307B78}.debug|Win32.Build.0 = debug|Win32
-               {4EBC4863-21BB-467B-7AD2-173972307B78}.release|Win32.ActiveCfg = release|Win32
-               {4EBC4863-21BB-467B-7AD2-173972307B78}.release|Win32.Build.0 = release|Win32
-               {4EBC4863-21BB-467B-7AD2-173972307B78}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4EBC4863-21BB-467B-7AD2-173972307B78}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4F3803DA-7D72-3A61-75E4-5E18403248F3}.debug|Win32.ActiveCfg = debug|Win32
-               {4F3803DA-7D72-3A61-75E4-5E18403248F3}.debug|Win32.Build.0 = debug|Win32
-               {4F3803DA-7D72-3A61-75E4-5E18403248F3}.release|Win32.ActiveCfg = release|Win32
-               {4F3803DA-7D72-3A61-75E4-5E18403248F3}.release|Win32.Build.0 = release|Win32
-               {4F3803DA-7D72-3A61-75E4-5E18403248F3}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4F3803DA-7D72-3A61-75E4-5E18403248F3}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4F834988-426E-2C51-1497-3EE357D441F4}.debug|Win32.ActiveCfg = debug|Win32
-               {4F834988-426E-2C51-1497-3EE357D441F4}.debug|Win32.Build.0 = debug|Win32
-               {4F834988-426E-2C51-1497-3EE357D441F4}.release|Win32.ActiveCfg = release|Win32
-               {4F834988-426E-2C51-1497-3EE357D441F4}.release|Win32.Build.0 = release|Win32
-               {4F834988-426E-2C51-1497-3EE357D441F4}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4F834988-426E-2C51-1497-3EE357D441F4}.release-assert|Win32.Build.0 = release-assert|Win32
-               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8}.debug|Win32.ActiveCfg = debug|Win32
-               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8}.debug|Win32.Build.0 = debug|Win32
-               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8}.release|Win32.ActiveCfg = release|Win32
-               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8}.release|Win32.Build.0 = release|Win32
-               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8}.release-assert|Win32.Build.0 = release-assert|Win32
-               {50404CB7-11C8-7829-357D-388918FE2ABE}.debug|Win32.ActiveCfg = debug|Win32
-               {50404CB7-11C8-7829-357D-388918FE2ABE}.debug|Win32.Build.0 = debug|Win32
-               {50404CB7-11C8-7829-357D-388918FE2ABE}.release|Win32.ActiveCfg = release|Win32
-               {50404CB7-11C8-7829-357D-388918FE2ABE}.release|Win32.Build.0 = release|Win32
-               {50404CB7-11C8-7829-357D-388918FE2ABE}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {50404CB7-11C8-7829-357D-388918FE2ABE}.release-assert|Win32.Build.0 = release-assert|Win32
-               {509F0E4F-7974-1E15-45EF-755D79935F23}.debug|Win32.ActiveCfg = debug|Win32
-               {509F0E4F-7974-1E15-45EF-755D79935F23}.debug|Win32.Build.0 = debug|Win32
-               {509F0E4F-7974-1E15-45EF-755D79935F23}.release|Win32.ActiveCfg = release|Win32
-               {509F0E4F-7974-1E15-45EF-755D79935F23}.release|Win32.Build.0 = release|Win32
-               {509F0E4F-7974-1E15-45EF-755D79935F23}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {509F0E4F-7974-1E15-45EF-755D79935F23}.release-assert|Win32.Build.0 = release-assert|Win32
-               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}.debug|Win32.ActiveCfg = debug|Win32
-               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}.debug|Win32.Build.0 = debug|Win32
-               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}.release|Win32.ActiveCfg = release|Win32
-               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}.release|Win32.Build.0 = release|Win32
-               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}.release-assert|Win32.Build.0 = release-assert|Win32
-               {51466B98-6055-57F2-4CCA-03A465A217F8}.debug|Win32.ActiveCfg = debug|Win32
-               {51466B98-6055-57F2-4CCA-03A465A217F8}.debug|Win32.Build.0 = debug|Win32
-               {51466B98-6055-57F2-4CCA-03A465A217F8}.release|Win32.ActiveCfg = release|Win32
-               {51466B98-6055-57F2-4CCA-03A465A217F8}.release|Win32.Build.0 = release|Win32
-               {51466B98-6055-57F2-4CCA-03A465A217F8}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {51466B98-6055-57F2-4CCA-03A465A217F8}.release-assert|Win32.Build.0 = release-assert|Win32
-               {519B2F3A-76AA-63E0-645D-127321BE6EAB}.debug|Win32.ActiveCfg = debug|Win32
-               {519B2F3A-76AA-63E0-645D-127321BE6EAB}.debug|Win32.Build.0 = debug|Win32
-               {519B2F3A-76AA-63E0-645D-127321BE6EAB}.release|Win32.ActiveCfg = release|Win32
-               {519B2F3A-76AA-63E0-645D-127321BE6EAB}.release|Win32.Build.0 = release|Win32
-               {519B2F3A-76AA-63E0-645D-127321BE6EAB}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {519B2F3A-76AA-63E0-645D-127321BE6EAB}.release-assert|Win32.Build.0 = release-assert|Win32
-               {52C745F0-0A99-2BA1-5F2A-159E004752AE}.debug|Win32.ActiveCfg = debug|Win32
-               {52C745F0-0A99-2BA1-5F2A-159E004752AE}.debug|Win32.Build.0 = debug|Win32
-               {52C745F0-0A99-2BA1-5F2A-159E004752AE}.release|Win32.ActiveCfg = release|Win32
-               {52C745F0-0A99-2BA1-5F2A-159E004752AE}.release|Win32.Build.0 = release|Win32
-               {52C745F0-0A99-2BA1-5F2A-159E004752AE}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {52C745F0-0A99-2BA1-5F2A-159E004752AE}.release-assert|Win32.Build.0 = release-assert|Win32
-               {53293184-380F-2F8D-17E8-61C86D057BA4}.debug|Win32.ActiveCfg = debug|Win32
-               {53293184-380F-2F8D-17E8-61C86D057BA4}.debug|Win32.Build.0 = debug|Win32
-               {53293184-380F-2F8D-17E8-61C86D057BA4}.release|Win32.ActiveCfg = release|Win32
-               {53293184-380F-2F8D-17E8-61C86D057BA4}.release|Win32.Build.0 = release|Win32
-               {53293184-380F-2F8D-17E8-61C86D057BA4}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {53293184-380F-2F8D-17E8-61C86D057BA4}.release-assert|Win32.Build.0 = release-assert|Win32
-               {534D7F5C-37A8-3985-531C-0A8272C27DDC}.debug|Win32.ActiveCfg = debug|Win32
-               {534D7F5C-37A8-3985-531C-0A8272C27DDC}.debug|Win32.Build.0 = debug|Win32
-               {534D7F5C-37A8-3985-531C-0A8272C27DDC}.release|Win32.ActiveCfg = release|Win32
-               {534D7F5C-37A8-3985-531C-0A8272C27DDC}.release|Win32.Build.0 = release|Win32
-               {534D7F5C-37A8-3985-531C-0A8272C27DDC}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {534D7F5C-37A8-3985-531C-0A8272C27DDC}.release-assert|Win32.Build.0 = release-assert|Win32
-               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C}.debug|Win32.ActiveCfg = debug|Win32
-               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C}.debug|Win32.Build.0 = debug|Win32
-               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C}.release|Win32.ActiveCfg = release|Win32
-               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C}.release|Win32.Build.0 = release|Win32
-               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C}.release-assert|Win32.Build.0 = release-assert|Win32
-               {54327A61-4C64-6D55-5780-3C3945D15D6E}.debug|Win32.ActiveCfg = debug|Win32
-               {54327A61-4C64-6D55-5780-3C3945D15D6E}.debug|Win32.Build.0 = debug|Win32
-               {54327A61-4C64-6D55-5780-3C3945D15D6E}.release|Win32.ActiveCfg = release|Win32
-               {54327A61-4C64-6D55-5780-3C3945D15D6E}.release|Win32.Build.0 = release|Win32
-               {54327A61-4C64-6D55-5780-3C3945D15D6E}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {54327A61-4C64-6D55-5780-3C3945D15D6E}.release-assert|Win32.Build.0 = release-assert|Win32
-               {54903BF9-3411-1341-67F3-790C266711D3}.debug|Win32.ActiveCfg = debug|Win32
-               {54903BF9-3411-1341-67F3-790C266711D3}.debug|Win32.Build.0 = debug|Win32
-               {54903BF9-3411-1341-67F3-790C266711D3}.release|Win32.ActiveCfg = release|Win32
-               {54903BF9-3411-1341-67F3-790C266711D3}.release|Win32.Build.0 = release|Win32
-               {54903BF9-3411-1341-67F3-790C266711D3}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {54903BF9-3411-1341-67F3-790C266711D3}.release-assert|Win32.Build.0 = release-assert|Win32
-               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65}.debug|Win32.ActiveCfg = debug|Win32
-               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65}.debug|Win32.Build.0 = debug|Win32
-               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65}.release|Win32.ActiveCfg = release|Win32
-               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65}.release|Win32.Build.0 = release|Win32
-               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65}.release-assert|Win32.Build.0 = release-assert|Win32
-               {55304548-0F62-1120-1E39-68A67A256187}.debug|Win32.ActiveCfg = debug|Win32
-               {55304548-0F62-1120-1E39-68A67A256187}.debug|Win32.Build.0 = debug|Win32
-               {55304548-0F62-1120-1E39-68A67A256187}.release|Win32.ActiveCfg = release|Win32
-               {55304548-0F62-1120-1E39-68A67A256187}.release|Win32.Build.0 = release|Win32
-               {55304548-0F62-1120-1E39-68A67A256187}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {55304548-0F62-1120-1E39-68A67A256187}.release-assert|Win32.Build.0 = release-assert|Win32
-               {557F34F2-1A26-610F-6537-58C71DEF4F18}.debug|Win32.ActiveCfg = debug|Win32
-               {557F34F2-1A26-610F-6537-58C71DEF4F18}.debug|Win32.Build.0 = debug|Win32
-               {557F34F2-1A26-610F-6537-58C71DEF4F18}.release|Win32.ActiveCfg = release|Win32
-               {557F34F2-1A26-610F-6537-58C71DEF4F18}.release|Win32.Build.0 = release|Win32
-               {557F34F2-1A26-610F-6537-58C71DEF4F18}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {557F34F2-1A26-610F-6537-58C71DEF4F18}.release-assert|Win32.Build.0 = release-assert|Win32
-               {55BD52AE-4801-5B02-62C0-7C3704F075D6}.debug|Win32.ActiveCfg = debug|Win32
-               {55BD52AE-4801-5B02-62C0-7C3704F075D6}.debug|Win32.Build.0 = debug|Win32
-               {55BD52AE-4801-5B02-62C0-7C3704F075D6}.release|Win32.ActiveCfg = release|Win32
-               {55BD52AE-4801-5B02-62C0-7C3704F075D6}.release|Win32.Build.0 = release|Win32
-               {55BD52AE-4801-5B02-62C0-7C3704F075D6}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {55BD52AE-4801-5B02-62C0-7C3704F075D6}.release-assert|Win32.Build.0 = release-assert|Win32
-               {56186A49-69E6-22EF-4AE8-29B4595D35AA}.debug|Win32.ActiveCfg = debug|Win32
-               {56186A49-69E6-22EF-4AE8-29B4595D35AA}.debug|Win32.Build.0 = debug|Win32
-               {56186A49-69E6-22EF-4AE8-29B4595D35AA}.release|Win32.ActiveCfg = release|Win32
-               {56186A49-69E6-22EF-4AE8-29B4595D35AA}.release|Win32.Build.0 = release|Win32
-               {56186A49-69E6-22EF-4AE8-29B4595D35AA}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {56186A49-69E6-22EF-4AE8-29B4595D35AA}.release-assert|Win32.Build.0 = release-assert|Win32
-               {567401E5-0BCB-6ADC-3310-57302DC9757F}.debug|Win32.ActiveCfg = debug|Win32
-               {567401E5-0BCB-6ADC-3310-57302DC9757F}.debug|Win32.Build.0 = debug|Win32
-               {567401E5-0BCB-6ADC-3310-57302DC9757F}.release|Win32.ActiveCfg = release|Win32
-               {567401E5-0BCB-6ADC-3310-57302DC9757F}.release|Win32.Build.0 = release|Win32
-               {567401E5-0BCB-6ADC-3310-57302DC9757F}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {567401E5-0BCB-6ADC-3310-57302DC9757F}.release-assert|Win32.Build.0 = release-assert|Win32
-               {56D2437D-7378-10C8-4382-14030E5E29E4}.debug|Win32.ActiveCfg = debug|Win32
-               {56D2437D-7378-10C8-4382-14030E5E29E4}.debug|Win32.Build.0 = debug|Win32
-               {56D2437D-7378-10C8-4382-14030E5E29E4}.release|Win32.ActiveCfg = release|Win32
-               {56D2437D-7378-10C8-4382-14030E5E29E4}.release|Win32.Build.0 = release|Win32
-               {56D2437D-7378-10C8-4382-14030E5E29E4}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {56D2437D-7378-10C8-4382-14030E5E29E4}.release-assert|Win32.Build.0 = release-assert|Win32
-               {576524DB-37A8-16A9-589E-4642317B2754}.debug|Win32.ActiveCfg = debug|Win32
-               {576524DB-37A8-16A9-589E-4642317B2754}.debug|Win32.Build.0 = debug|Win32
-               {576524DB-37A8-16A9-589E-4642317B2754}.release|Win32.ActiveCfg = release|Win32
-               {576524DB-37A8-16A9-589E-4642317B2754}.release|Win32.Build.0 = release|Win32
-               {576524DB-37A8-16A9-589E-4642317B2754}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {576524DB-37A8-16A9-589E-4642317B2754}.release-assert|Win32.Build.0 = release-assert|Win32
-               {57BA687D-4DFC-2297-7031-55116D967E07}.debug|Win32.ActiveCfg = debug|Win32
-               {57BA687D-4DFC-2297-7031-55116D967E07}.debug|Win32.Build.0 = debug|Win32
-               {57BA687D-4DFC-2297-7031-55116D967E07}.release|Win32.ActiveCfg = release|Win32
-               {57BA687D-4DFC-2297-7031-55116D967E07}.release|Win32.Build.0 = release|Win32
-               {57BA687D-4DFC-2297-7031-55116D967E07}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {57BA687D-4DFC-2297-7031-55116D967E07}.release-assert|Win32.Build.0 = release-assert|Win32
-               {581C5412-7B71-2682-28EE-213B5A5426FD}.debug|Win32.ActiveCfg = debug|Win32
-               {581C5412-7B71-2682-28EE-213B5A5426FD}.debug|Win32.Build.0 = debug|Win32
-               {581C5412-7B71-2682-28EE-213B5A5426FD}.release|Win32.ActiveCfg = release|Win32
-               {581C5412-7B71-2682-28EE-213B5A5426FD}.release|Win32.Build.0 = release|Win32
-               {581C5412-7B71-2682-28EE-213B5A5426FD}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {581C5412-7B71-2682-28EE-213B5A5426FD}.release-assert|Win32.Build.0 = release-assert|Win32
-               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3}.debug|Win32.ActiveCfg = debug|Win32
-               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3}.debug|Win32.Build.0 = debug|Win32
-               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3}.release|Win32.ActiveCfg = release|Win32
-               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3}.release|Win32.Build.0 = release|Win32
-               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3}.release-assert|Win32.Build.0 = release-assert|Win32
-               {58C3315A-6252-605F-2FCA-2F8246635FD2}.debug|Win32.ActiveCfg = debug|Win32
-               {58C3315A-6252-605F-2FCA-2F8246635FD2}.debug|Win32.Build.0 = debug|Win32
-               {58C3315A-6252-605F-2FCA-2F8246635FD2}.release|Win32.ActiveCfg = release|Win32
-               {58C3315A-6252-605F-2FCA-2F8246635FD2}.release|Win32.Build.0 = release|Win32
-               {58C3315A-6252-605F-2FCA-2F8246635FD2}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {58C3315A-6252-605F-2FCA-2F8246635FD2}.release-assert|Win32.Build.0 = release-assert|Win32
-               {590A4D0B-6186-7450-2632-00F651DD6442}.debug|Win32.ActiveCfg = debug|Win32
-               {590A4D0B-6186-7450-2632-00F651DD6442}.debug|Win32.Build.0 = debug|Win32
-               {590A4D0B-6186-7450-2632-00F651DD6442}.release|Win32.ActiveCfg = release|Win32
-               {590A4D0B-6186-7450-2632-00F651DD6442}.release|Win32.Build.0 = release|Win32
-               {590A4D0B-6186-7450-2632-00F651DD6442}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {590A4D0B-6186-7450-2632-00F651DD6442}.release-assert|Win32.Build.0 = release-assert|Win32
-               {594F3EC0-1AF1-2A42-7450-4314512E7421}.debug|Win32.ActiveCfg = debug|Win32
-               {594F3EC0-1AF1-2A42-7450-4314512E7421}.debug|Win32.Build.0 = debug|Win32
-               {594F3EC0-1AF1-2A42-7450-4314512E7421}.release|Win32.ActiveCfg = release|Win32
-               {594F3EC0-1AF1-2A42-7450-4314512E7421}.release|Win32.Build.0 = release|Win32
-               {594F3EC0-1AF1-2A42-7450-4314512E7421}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {594F3EC0-1AF1-2A42-7450-4314512E7421}.release-assert|Win32.Build.0 = release-assert|Win32
-               {59A72C5F-770E-142F-342E-613919723F65}.debug|Win32.ActiveCfg = debug|Win32
-               {59A72C5F-770E-142F-342E-613919723F65}.debug|Win32.Build.0 = debug|Win32
-               {59A72C5F-770E-142F-342E-613919723F65}.release|Win32.ActiveCfg = release|Win32
-               {59A72C5F-770E-142F-342E-613919723F65}.release|Win32.Build.0 = release|Win32
-               {59A72C5F-770E-142F-342E-613919723F65}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {59A72C5F-770E-142F-342E-613919723F65}.release-assert|Win32.Build.0 = release-assert|Win32
-               {59EF4810-7642-2820-2A97-32AD24EC43D5}.debug|Win32.ActiveCfg = debug|Win32
-               {59EF4810-7642-2820-2A97-32AD24EC43D5}.debug|Win32.Build.0 = debug|Win32
-               {59EF4810-7642-2820-2A97-32AD24EC43D5}.release|Win32.ActiveCfg = release|Win32
-               {59EF4810-7642-2820-2A97-32AD24EC43D5}.release|Win32.Build.0 = release|Win32
-               {59EF4810-7642-2820-2A97-32AD24EC43D5}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {59EF4810-7642-2820-2A97-32AD24EC43D5}.release-assert|Win32.Build.0 = release-assert|Win32
-               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012}.debug|Win32.ActiveCfg = debug|Win32
-               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012}.debug|Win32.Build.0 = debug|Win32
-               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012}.release|Win32.ActiveCfg = release|Win32
-               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012}.release|Win32.Build.0 = release|Win32
-               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012}.release-assert|Win32.Build.0 = release-assert|Win32
-               {13A81B5C-3126-7689-29CB-7EB809060F4C}.debug|Win32.ActiveCfg = debug|Win32
-               {13A81B5C-3126-7689-29CB-7EB809060F4C}.debug|Win32.Build.0 = debug|Win32
-               {13A81B5C-3126-7689-29CB-7EB809060F4C}.release|Win32.ActiveCfg = release|Win32
-               {13A81B5C-3126-7689-29CB-7EB809060F4C}.release|Win32.Build.0 = release|Win32
-               {13A81B5C-3126-7689-29CB-7EB809060F4C}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {13A81B5C-3126-7689-29CB-7EB809060F4C}.release-assert|Win32.Build.0 = release-assert|Win32
-               {38B340E0-373D-22A8-4354-0D386DC50BA2}.debug|Win32.ActiveCfg = debug|Win32
-               {38B340E0-373D-22A8-4354-0D386DC50BA2}.debug|Win32.Build.0 = debug|Win32
-               {38B340E0-373D-22A8-4354-0D386DC50BA2}.release|Win32.ActiveCfg = release|Win32
-               {38B340E0-373D-22A8-4354-0D386DC50BA2}.release|Win32.Build.0 = release|Win32
-               {38B340E0-373D-22A8-4354-0D386DC50BA2}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {38B340E0-373D-22A8-4354-0D386DC50BA2}.release-assert|Win32.Build.0 = release-assert|Win32
-               {3C557EE0-6716-47E4-1E5A-20C676CE50C1}.debug|Win32.ActiveCfg = debug|Win32
-               {3C557EE0-6716-47E4-1E5A-20C676CE50C1}.debug|Win32.Build.0 = debug|Win32
-               {3C557EE0-6716-47E4-1E5A-20C676CE50C1}.release|Win32.ActiveCfg = release|Win32
-               {3C557EE0-6716-47E4-1E5A-20C676CE50C1}.release|Win32.Build.0 = release|Win32
-               {3C557EE0-6716-47E4-1E5A-20C676CE50C1}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {3C557EE0-6716-47E4-1E5A-20C676CE50C1}.release-assert|Win32.Build.0 = release-assert|Win32
-               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A}.debug|Win32.ActiveCfg = debug|Win32
-               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A}.debug|Win32.Build.0 = debug|Win32
-               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A}.release|Win32.ActiveCfg = release|Win32
-               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A}.release|Win32.Build.0 = release|Win32
-               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A}.release-assert|Win32.Build.0 = release-assert|Win32
-               {3CB44078-4EC3-6DD0-2ECC-5D9957630526}.debug|Win32.ActiveCfg = debug|Win32
-               {3CB44078-4EC3-6DD0-2ECC-5D9957630526}.debug|Win32.Build.0 = debug|Win32
-               {3CB44078-4EC3-6DD0-2ECC-5D9957630526}.release|Win32.ActiveCfg = release|Win32
-               {3CB44078-4EC3-6DD0-2ECC-5D9957630526}.release|Win32.Build.0 = release|Win32
-               {3CB44078-4EC3-6DD0-2ECC-5D9957630526}.release-assert|Win32.ActiveCfg = release-assert|Win32
-               {3CB44078-4EC3-6DD0-2ECC-5D9957630526}.release-assert|Win32.Build.0 = release-assert|Win32
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-       GlobalSection(NestedProjects) = preSolution
-               {58495107-524D-262A-14F9-75054C6228FA} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {67A8721D-4983-18EF-3C00-284306CA5634} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {497D4873-6EE2-5C14-53AC-4D47257B5B42} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {49010CFB-132B-682E-589B-0668577A0DC6} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {41D50804-0184-4ECA-1FDB-0F69302A789A} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {42F476C8-7E53-1E8E-797E-55395E120A5A} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {42C954F7-7328-5896-6DB5-0DD240041F01} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {42751154-5CD4-4CA8-5622-7F0303E8484E} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {47161A3C-4FAA-15AF-77E0-3EFE41441185} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {477E59C9-08B0-5599-0133-29D54652239C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {47F44147-58D6-0D81-2BAF-52077C0307F6} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {486354CD-1D6C-0969-0597-5B8C1962032F} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {48BF6C69-3F51-5156-6DBF-09096DCF4303} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {499D1374-487C-4927-218E-1C12288D3975} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {49F50113-2499-3315-616B-3A3870D104B8} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4A6E128E-3A87-48FB-3433-71C132AA5DA3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4AC25631-50DC-54EA-4BC6-00906EC63456} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4B790568-14A5-64C3-1C16-5B89179F33FE} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4BCB1F0E-6531-12B2-0B5E-5B0147921621} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4C7F2448-6333-448C-3364-26A364432138} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4CDA3BE4-0518-0C79-1B8C-542038B0610D} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4D81192C-6BF8-4656-2267-626724BF19E2} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4E341E67-69FA-7830-4A6D-2E09417024FA} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4E830E10-74BE-4820-116A-1E2A653A128B} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4EE823A1-67FB-2A0B-7272-79AB5E203011} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4F670915-097A-7BF0-15CF-4FE2384A721E} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4FD94697-13D8-55D8-1801-68BD61D261E7} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {50283641-1E9C-25C7-5EFF-58DF059D4F79} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {51472505-1B6B-758B-38A1-1EAF33846138} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {519F12A4-7788-5F78-787F-3CD57BC82C7C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {51EE024D-024C-2F68-3F7C-2CF61F931A0D} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {524345F0-18A0-3B56-570F-3BC55BAF70C0} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {529E5D8B-3A85-0343-3F37-6941301C3095} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {52F07731-0B12-3132-2E80-68BA600F12B7} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {534864D0-672E-1B1F-6E5D-06DF28535DFA} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {53A37C6C-0913-630C-5685-345C7CC01DCF} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {54854D74-5807-38DD-329F-56BC43A708D1} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {54D33D1E-62CB-08CC-799D-46DE67727662} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {552556C4-3357-36BB-68E5-465617655884} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {59BC61B6-54D5-65C4-11C4-584D30474409} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {5A144F55-30F2-4FB1-51A1-7672788B0F4D} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {5D5521C1-3355-7102-73EA-3DD714D62B76} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {5EC3002E-3AE8-10B5-148A-73C866892AC7} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {5F1843D1-513D-1CA4-2C1D-029722A5017A} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {5F605F82-5071-3095-2286-540B2E1F05EA} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {5FFC3ED5-65F9-5074-3081-344E75B4610C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {60445A86-652D-6464-26EA-05C2012E657C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {6096742C-35B9-1253-1632-053B3121479F} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {60E80DD2-0645-4042-057B-04B3611529C1} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {61464F6A-6DF2-662E-15ED-418641AA5E26} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {61911518-32EE-581F-34A1-2251594C5726} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {61D930C8-3222-6C0F-2B09-73C564C65B96} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {621E227D-6B8E-2201-7927-35E264186B76} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {62621432-24F9-57F3-4745-780063697B55} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {62E279A5-4678-29D8-6AA2-4E363D933D61} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {45D8782C-23BC-5A59-47C8-5416580E1D6F} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {46A97746-15C7-5A2D-5A6D-29C5622B419D} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {473504AB-4E66-2410-1EF3-3D566CF655EC} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {47C21211-0705-6DF2-637A-50E777C26A3B} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {482D7B9A-05D3-0BDC-1517-4B1508F970E3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {48BA08FF-3E72-55BE-599E-5EA713C40532} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {490F4CA2-54C7-61AC-7131-6D764FE05BE5} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {497E6028-195D-5D95-4B18-76FB6D3F571E} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4A0D178A-17C4-0577-37E9-19E304335FFE} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4A732D1A-0B02-6761-18F1-75637D197D84} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4ACB1AB9-671E-514F-58CF-1389455D48C8} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4B230858-433B-3B3C-18AC-31AF0DA1140B} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4B717802-4DFF-0B2C-5FAA-21D0316C019D} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4C631AF8-79DC-36F9-0538-10E2351D3373} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4CB10AA2-04A0-06E9-4C36-010458E82104} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4D007A4C-0F64-56D8-1334-71257CB30E95} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4D446C00-48CF-0CCA-6152-33437C051E75} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4DF8713A-46D1-3EA4-0958-7EE518B5298C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4EBC4863-21BB-467B-7AD2-173972307B78} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4F3803DA-7D72-3A61-75E4-5E18403248F3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4F834988-426E-2C51-1497-3EE357D441F4} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {50404CB7-11C8-7829-357D-388918FE2ABE} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {509F0E4F-7974-1E15-45EF-755D79935F23} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {51466B98-6055-57F2-4CCA-03A465A217F8} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {519B2F3A-76AA-63E0-645D-127321BE6EAB} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {52C745F0-0A99-2BA1-5F2A-159E004752AE} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {53293184-380F-2F8D-17E8-61C86D057BA4} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {534D7F5C-37A8-3985-531C-0A8272C27DDC} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {54327A61-4C64-6D55-5780-3C3945D15D6E} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {54903BF9-3411-1341-67F3-790C266711D3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {55304548-0F62-1120-1E39-68A67A256187} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {557F34F2-1A26-610F-6537-58C71DEF4F18} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {55BD52AE-4801-5B02-62C0-7C3704F075D6} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {56186A49-69E6-22EF-4AE8-29B4595D35AA} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {567401E5-0BCB-6ADC-3310-57302DC9757F} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {56D2437D-7378-10C8-4382-14030E5E29E4} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {576524DB-37A8-16A9-589E-4642317B2754} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {57BA687D-4DFC-2297-7031-55116D967E07} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {581C5412-7B71-2682-28EE-213B5A5426FD} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {58C3315A-6252-605F-2FCA-2F8246635FD2} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {590A4D0B-6186-7450-2632-00F651DD6442} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {594F3EC0-1AF1-2A42-7450-4314512E7421} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {59A72C5F-770E-142F-342E-613919723F65} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {59EF4810-7642-2820-2A97-32AD24EC43D5} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012} = {8A2F8A70-0694-40C4-B46F-FEFC0A59D8AF}
-               {13A81B5C-3126-7689-29CB-7EB809060F4C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}
-               {38B340E0-373D-22A8-4354-0D386DC50BA2} = {C8EF795B-16A1-4410-B1B3-5CF3F6832317}
-               {3C557EE0-6716-47E4-1E5A-20C676CE50C1} = {C8EF795B-16A1-4410-B1B3-5CF3F6832317}
-               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A} = {C8EF795B-16A1-4410-B1B3-5CF3F6832317}
-               {3CB44078-4EC3-6DD0-2ECC-5D9957630526} = {C8EF795B-16A1-4410-B1B3-5CF3F6832317}
-               {1D4E71E5-F63F-4611-9F38-5177D49CEA91} = {C1F6B1DF-3D6E-4AA2-81D2-A9CDB3C6E0CF}
-               {461FE07F-A59B-421D-AAD6-48B41368EDE2} = {C1F6B1DF-3D6E-4AA2-81D2-A9CDB3C6E0CF}
-               {3492B32A-CA32-4B64-B0D3-FF6AF6B83DEE} = {C1F6B1DF-3D6E-4AA2-81D2-A9CDB3C6E0CF}
-       EndGlobalSection
-EndGlobal
+\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio Express 14 for Windows Desktop\r
+VisualStudioVersion = 14.0.25123.0\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all tests", "test\all tests.vcxproj", "{58495107-524D-262A-14F9-75054C6228FA}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mat_traits_array_test", "test\mat_traits_array_test.vcxproj", "{67A8721D-4983-18EF-3C00-284306CA5634}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quat_traits_array_test", "test\quat_traits_array_test.vcxproj", "{497D4873-6EE2-5C14-53AC-4D47257B5B42}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vec_traits_array_test", "test\vec_traits_array_test.vcxproj", "{49010CFB-132B-682E-589B-0668577A0DC6}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_m_test", "test\access_m_test.vcxproj", "{4B0B4ABC-3047-27C0-0737-1C9C70C2683A}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_m_fail2", "test\access_m_fail2.vcxproj", "{4B9B021E-2EAE-4FA2-7408-3F8407B6711A}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_m_fail1", "test\access_m_fail1.vcxproj", "{4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_q_fail", "test\access_q_fail.vcxproj", "{3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_q_test", "test\access_q_test.vcxproj", "{41D50804-0184-4ECA-1FDB-0F69302A789A}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_v_fail2", "test\access_v_fail2.vcxproj", "{42F476C8-7E53-1E8E-797E-55395E120A5A}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_v_fail1", "test\access_v_fail1.vcxproj", "{42C954F7-7328-5896-6DB5-0DD240041F01}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "access_v_test", "test\access_v_test.vcxproj", "{42751154-5CD4-4CA8-5622-7F0303E8484E}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "assign_test", "test\assign_test.vcxproj", "{47161A3C-4FAA-15AF-77E0-3EFE41441185}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "to_string_test", "test\to_string_test.vcxproj", "{477E59C9-08B0-5599-0133-29D54652239C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmp_vv_test", "test\cmp_vv_test.vcxproj", "{47F44147-58D6-0D81-2BAF-52077C0307F6}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_test", "test\cross_test.vcxproj", "{486354CD-1D6C-0969-0597-5B8C1962032F}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "div_eq_vs_test", "test\div_eq_vs_test.vcxproj", "{48BF6C69-3F51-5156-6DBF-09096DCF4303}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "div_vs_test", "test\div_vs_test.vcxproj", "{492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dot_vv_test", "test\dot_vv_test.vcxproj", "{499D1374-487C-4927-218E-1C12288D3975}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eq_vv_test", "test\eq_vv_test.vcxproj", "{49F50113-2499-3315-616B-3A3870D104B8}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mag_v_test", "test\mag_v_test.vcxproj", "{4A6E128E-3A87-48FB-3433-71C132AA5DA3}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mag_sqr_v_test", "test\mag_sqr_v_test.vcxproj", "{4AC25631-50DC-54EA-4BC6-00906EC63456}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_v_test", "test\minus_v_test.vcxproj", "{4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_eq_vv_test", "test\minus_eq_vv_test.vcxproj", "{4B790568-14A5-64C3-1C16-5B89179F33FE}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_vv_test", "test\minus_vv_test.vcxproj", "{4BCB1F0E-6531-12B2-0B5E-5B0147921621}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_eq_vs_test", "test\mul_eq_vs_test.vcxproj", "{4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_vs_test", "test\mul_vs_test.vcxproj", "{4C7F2448-6333-448C-3364-26A364432138}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_vm_test", "test\mul_vm_test.vcxproj", "{4CDA3BE4-0518-0C79-1B8C-542038B0610D}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "normalize_v_test", "test\normalize_v_test.vcxproj", "{4D282B8D-0FDC-5C69-628A-44415C7B4E9E}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plus_eq_vv_test", "test\plus_eq_vv_test.vcxproj", "{4D81192C-6BF8-4656-2267-626724BF19E2}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plus_vv_test", "test\plus_vv_test.vcxproj", "{4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scalar_cast_v_test", "test\scalar_cast_v_test.vcxproj", "{4E341E67-69FA-7830-4A6D-2E09417024FA}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vec_index_test", "test\vec_index_test.vcxproj", "{4E830E10-74BE-4820-116A-1E2A653A128B}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmp_mm_test", "test\cmp_mm_test.vcxproj", "{4EE823A1-67FB-2A0B-7272-79AB5E203011}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "determinant_test", "test\determinant_test.vcxproj", "{4F670915-097A-7BF0-15CF-4FE2384A721E}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "div_eq_ms_test", "test\div_eq_ms_test.vcxproj", "{4FD94697-13D8-55D8-1801-68BD61D261E7}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "div_ms_test", "test\div_ms_test.vcxproj", "{50283641-1E9C-25C7-5EFF-58DF059D4F79}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eq_mm_test", "test\eq_mm_test.vcxproj", "{508023E0-7AB9-0FB5-1EDC-77044DE11ABC}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_m_test", "test\minus_m_test.vcxproj", "{50E8636D-33BE-4F9F-282E-61DC52EF2CD3}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_eq_mm_test", "test\minus_eq_mm_test.vcxproj", "{51472505-1B6B-758B-38A1-1EAF33846138}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_mm_test", "test\minus_mm_test.vcxproj", "{519F12A4-7788-5F78-787F-3CD57BC82C7C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_eq_mm_test", "test\mul_eq_mm_test.vcxproj", "{51EE024D-024C-2F68-3F7C-2CF61F931A0D}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_eq_ms_test", "test\mul_eq_ms_test.vcxproj", "{524345F0-18A0-3B56-570F-3BC55BAF70C0}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_mm_test", "test\mul_mm_test.vcxproj", "{529E5D8B-3A85-0343-3F37-6941301C3095}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_ms_test", "test\mul_ms_test.vcxproj", "{52F07731-0B12-3132-2E80-68BA600F12B7}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_mv_test", "test\mul_mv_test.vcxproj", "{534864D0-672E-1B1F-6E5D-06DF28535DFA}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inverse_m_test", "test\inverse_m_test.vcxproj", "{53A37C6C-0913-630C-5685-345C7CC01DCF}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plus_eq_mm_test", "test\plus_eq_mm_test.vcxproj", "{540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plus_mm_test", "test\plus_mm_test.vcxproj", "{54854D74-5807-38DD-329F-56BC43A708D1}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scalar_cast_m_test", "test\scalar_cast_m_test.vcxproj", "{54D33D1E-62CB-08CC-799D-46DE67727662}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mat_index_test", "test\mat_index_test.vcxproj", "{552556C4-3357-36BB-68E5-465617655884}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmp_qq_test", "test\cmp_qq_test.vcxproj", "{59BC61B6-54D5-65C4-11C4-584D30474409}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "conjugate_test", "test\conjugate_test.vcxproj", "{5A144F55-30F2-4FB1-51A1-7672788B0F4D}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "normalize_q_test", "test\normalize_q_test.vcxproj", "{5D5521C1-3355-7102-73EA-3DD714D62B76}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "div_eq_qs_test", "test\div_eq_qs_test.vcxproj", "{5DAA6563-49AA-7CF0-0B7D-4CA650F20228}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "div_qs_test", "test\div_qs_test.vcxproj", "{5DF8550D-546E-4CE0-527B-3CC774BD6FBA}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dot_qq_test", "test\dot_qq_test.vcxproj", "{5E3A1CC5-4811-24D2-784E-6F8E67E60B08}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eq_qq_test", "test\eq_qq_test.vcxproj", "{5E7E0E7A-017D-5AC4-466C-31AB67371AE8}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inverse_q_test", "test\inverse_q_test.vcxproj", "{5EC3002E-3AE8-10B5-148A-73C866892AC7}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mag_q_test", "test\mag_q_test.vcxproj", "{5F1843D1-513D-1CA4-2C1D-029722A5017A}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mag_sqr_q_test", "test\mag_sqr_q_test.vcxproj", "{5F605F82-5071-3095-2286-540B2E1F05EA}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_q_test", "test\minus_q_test.vcxproj", "{5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_eq_qq_test", "test\minus_eq_qq_test.vcxproj", "{5FFC3ED5-65F9-5074-3081-344E75B4610C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minus_qq_test", "test\minus_qq_test.vcxproj", "{60445A86-652D-6464-26EA-05C2012E657C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_eq_qs_test", "test\mul_eq_qs_test.vcxproj", "{6096742C-35B9-1253-1632-053B3121479F}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_qs_test", "test\mul_qs_test.vcxproj", "{60E80DD2-0645-4042-057B-04B3611529C1}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_qv_test", "test\mul_qv_test.vcxproj", "{61464F6A-6DF2-662E-15ED-418641AA5E26}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_qq_test", "test\mul_qq_test.vcxproj", "{61911518-32EE-581F-34A1-2251594C5726}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mul_eq_qq_test", "test\mul_eq_qq_test.vcxproj", "{61D930C8-3222-6C0F-2B09-73C564C65B96}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plus_eq_qq_test", "test\plus_eq_qq_test.vcxproj", "{621E227D-6B8E-2201-7927-35E264186B76}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plus_qq_test", "test\plus_qq_test.vcxproj", "{62621432-24F9-57F3-4745-780063697B55}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scalar_cast_q_test", "test\scalar_cast_q_test.vcxproj", "{62A031ED-52D4-51E6-44CE-1B6F4A6A2213}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slerp_test", "test\slerp_test.vcxproj", "{62E279A5-4678-29D8-6AA2-4E363D933D61}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convert_to_test", "test\convert_to_test.vcxproj", "{45D8782C-23BC-5A59-47C8-5416580E1D6F}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rot_mat_test", "test\rot_mat_test.vcxproj", "{46A97746-15C7-5A2D-5A6D-29C5622B419D}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rot_quat_test", "test\rot_quat_test.vcxproj", "{473504AB-4E66-2410-1EF3-3D566CF655EC}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rotx_mat_test", "test\rotx_mat_test.vcxproj", "{47C21211-0705-6DF2-637A-50E777C26A3B}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rotx_quat_test", "test\rotx_quat_test.vcxproj", "{482D7B9A-05D3-0BDC-1517-4B1508F970E3}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "roty_mat_test", "test\roty_mat_test.vcxproj", "{48BA08FF-3E72-55BE-599E-5EA713C40532}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "roty_quat_test", "test\roty_quat_test.vcxproj", "{490F4CA2-54C7-61AC-7131-6D764FE05BE5}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rotz_mat_test", "test\rotz_mat_test.vcxproj", "{497E6028-195D-5D95-4B18-76FB6D3F571E}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rotz_quat_test", "test\rotz_quat_test.vcxproj", "{4A0D178A-17C4-0577-37E9-19E304335FFE}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zero_vec_test", "test\zero_vec_test.vcxproj", "{4A732D1A-0B02-6761-18F1-75637D197D84}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zero_mat_test", "test\zero_mat_test.vcxproj", "{4ACB1AB9-671E-514F-58CF-1389455D48C8}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zero_quat_test", "test\zero_quat_test.vcxproj", "{4B230858-433B-3B3C-18AC-31AF0DA1140B}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "identity_mat_test", "test\identity_mat_test.vcxproj", "{4B717802-4DFF-0B2C-5FAA-21D0316C019D}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "identity_quat_test", "test\identity_quat_test.vcxproj", "{4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "col_test", "test\col_test.vcxproj", "{4C631AF8-79DC-36F9-0538-10E2351D3373}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "col_mat_test", "test\col_mat_test.vcxproj", "{4CB10AA2-04A0-06E9-4C36-010458E82104}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neg_col_test", "test\neg_col_test.vcxproj", "{4D007A4C-0F64-56D8-1334-71257CB30E95}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neg_row_test", "test\neg_row_test.vcxproj", "{4D446C00-48CF-0CCA-6152-33437C051E75}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "del_col_test", "test\del_col_test.vcxproj", "{4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "del_row_test", "test\del_row_test.vcxproj", "{4DF8713A-46D1-3EA4-0958-7EE518B5298C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "del_row_col_test", "test\del_row_col_test.vcxproj", "{4E4D34DD-5D25-4A92-20EB-0DB454D1003F}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swap_cols_test", "test\swap_cols_test.vcxproj", "{4EBC4863-21BB-467B-7AD2-173972307B78}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swap_rows_test", "test\swap_rows_test.vcxproj", "{4F3803DA-7D72-3A61-75E4-5E18403248F3}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diag_test", "test\diag_test.vcxproj", "{4F834988-426E-2C51-1497-3EE357D441F4}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diag_mat_test", "test\diag_mat_test.vcxproj", "{4FDF6123-6452-743E-7CBF-6C5F2C4101C8}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "row_test", "test\row_test.vcxproj", "{50404CB7-11C8-7829-357D-388918FE2ABE}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "row_mat_test", "test\row_mat_test.vcxproj", "{509F0E4F-7974-1E15-45EF-755D79935F23}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "transpose_test", "test\transpose_test.vcxproj", "{50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translation_test", "test\translation_test.vcxproj", "{51466B98-6055-57F2-4CCA-03A465A217F8}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translation_mat_test", "test\translation_mat_test.vcxproj", "{519B2F3A-76AA-63E0-645D-127321BE6EAB}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle2_fail2", "test\swizzle2_fail2.vcxproj", "{52C745F0-0A99-2BA1-5F2A-159E004752AE}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle2_fail3", "test\swizzle2_fail3.vcxproj", "{53293184-380F-2F8D-17E8-61C86D057BA4}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle2_fail4", "test\swizzle2_fail4.vcxproj", "{534D7F5C-37A8-3985-531C-0A8272C27DDC}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle2_test", "test\swizzle2_test.vcxproj", "{53E060BB-7BD8-3F66-6838-3CC115DE7B4C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle3_fail2", "test\swizzle3_fail2.vcxproj", "{54327A61-4C64-6D55-5780-3C3945D15D6E}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle3_fail3", "test\swizzle3_fail3.vcxproj", "{54903BF9-3411-1341-67F3-790C266711D3}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle3_fail4", "test\swizzle3_fail4.vcxproj", "{54DF2BA2-3ED6-6331-2EF0-692E4A317F65}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle3_test", "test\swizzle3_test.vcxproj", "{55304548-0F62-1120-1E39-68A67A256187}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle4_fail2", "test\swizzle4_fail2.vcxproj", "{557F34F2-1A26-610F-6537-58C71DEF4F18}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle4_fail3", "test\swizzle4_fail3.vcxproj", "{55BD52AE-4801-5B02-62C0-7C3704F075D6}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle4_fail4", "test\swizzle4_fail4.vcxproj", "{56186A49-69E6-22EF-4AE8-29B4595D35AA}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle4_test", "test\swizzle4_test.vcxproj", "{567401E5-0BCB-6ADC-3310-57302DC9757F}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deduce_scalar_test", "test\deduce_scalar_test.vcxproj", "{56D2437D-7378-10C8-4382-14030E5E29E4}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deduce_scalar_fail1", "test\deduce_scalar_fail1.vcxproj", "{576524DB-37A8-16A9-589E-4642317B2754}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deduce_scalar_fail2", "test\deduce_scalar_fail2.vcxproj", "{57BA687D-4DFC-2297-7031-55116D967E07}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deduce_scalar_fail3", "test\deduce_scalar_fail3.vcxproj", "{581C5412-7B71-2682-28EE-213B5A5426FD}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deduce_matrix_test", "test\deduce_matrix_test.vcxproj", "{587E3FA6-28E6-2A6E-61AC-6D6547114FF3}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deduce_vector_test", "test\deduce_vector_test.vcxproj", "{58C3315A-6252-605F-2FCA-2F8246635FD2}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interop_test", "test\interop_test.vcxproj", "{590A4D0B-6186-7450-2632-00F651DD6442}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "transform_test", "test\transform_test.vcxproj", "{594F3EC0-1AF1-2A42-7450-4314512E7421}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "projection_test", "test\projection_test.vcxproj", "{59A72C5F-770E-142F-342E-613919723F65}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scalar_traits_test", "test\scalar_traits_test.vcxproj", "{59EF4810-7642-2820-2A97-32AD24EC43D5}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{18042314-9FA1-4A9A-9F77-FE933CF94D50}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               ..\test\Jamfile.v2 = ..\test\Jamfile.v2\r
+       EndProjectSection\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8A2F8A70-0694-40C4-B46F-FEFC0A59D8AF}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gen", "gen\gen.vcxproj", "{6BC86B3D-16DE-2AEA-2B2B-31AA13143012}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swizzle_const_fail", "test\swizzle_const_fail.vcxproj", "{13A81B5C-3126-7689-29CB-7EB809060F4C}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{C8EF795B-16A1-4410-B1B3-5CF3F6832317}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial", "doc\tutorial.vcxproj", "{38B340E0-373D-22A8-4354-0D386DC50BA2}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interoperability", "doc\interoperability.vcxproj", "{3C557EE0-6716-47E4-1E5A-20C676CE50C1}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mat_traits_array", "doc\mat_traits_array.vcxproj", "{3C8020B1-7240-0DDB-2A23-682D14DC3C1A}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vec_traits_array", "doc\vec_traits_array.vcxproj", "{3CB44078-4EC3-6DD0-2ECC-5D9957630526}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bld", "bld", "{C1F6B1DF-3D6E-4AA2-81D2-A9CDB3C6E0CF}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{1D4E71E5-F63F-4611-9F38-5177D49CEA91}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               doc\Jamfile.v2 = doc\Jamfile.v2\r
+       EndProjectSection\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{461FE07F-A59B-421D-AAD6-48B41368EDE2}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               gen\Jamfile.v2 = gen\Jamfile.v2\r
+       EndProjectSection\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3492B32A-CA32-4B64-B0D3-FF6AF6B83DEE}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               test\Jamfile.v2 = test\Jamfile.v2\r
+       EndProjectSection\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               debug|Win32 = debug|Win32\r
+               release|Win32 = release|Win32\r
+               release-assert|Win32 = release-assert|Win32\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {58495107-524D-262A-14F9-75054C6228FA}.debug|Win32.ActiveCfg = debug|Win32\r
+               {58495107-524D-262A-14F9-75054C6228FA}.debug|Win32.Build.0 = debug|Win32\r
+               {58495107-524D-262A-14F9-75054C6228FA}.release|Win32.ActiveCfg = release|Win32\r
+               {58495107-524D-262A-14F9-75054C6228FA}.release|Win32.Build.0 = release|Win32\r
+               {58495107-524D-262A-14F9-75054C6228FA}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {58495107-524D-262A-14F9-75054C6228FA}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {67A8721D-4983-18EF-3C00-284306CA5634}.debug|Win32.ActiveCfg = debug|Win32\r
+               {67A8721D-4983-18EF-3C00-284306CA5634}.debug|Win32.Build.0 = debug|Win32\r
+               {67A8721D-4983-18EF-3C00-284306CA5634}.release|Win32.ActiveCfg = release|Win32\r
+               {67A8721D-4983-18EF-3C00-284306CA5634}.release|Win32.Build.0 = release|Win32\r
+               {67A8721D-4983-18EF-3C00-284306CA5634}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {67A8721D-4983-18EF-3C00-284306CA5634}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {497D4873-6EE2-5C14-53AC-4D47257B5B42}.debug|Win32.ActiveCfg = debug|Win32\r
+               {497D4873-6EE2-5C14-53AC-4D47257B5B42}.debug|Win32.Build.0 = debug|Win32\r
+               {497D4873-6EE2-5C14-53AC-4D47257B5B42}.release|Win32.ActiveCfg = release|Win32\r
+               {497D4873-6EE2-5C14-53AC-4D47257B5B42}.release|Win32.Build.0 = release|Win32\r
+               {497D4873-6EE2-5C14-53AC-4D47257B5B42}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {497D4873-6EE2-5C14-53AC-4D47257B5B42}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {49010CFB-132B-682E-589B-0668577A0DC6}.debug|Win32.ActiveCfg = debug|Win32\r
+               {49010CFB-132B-682E-589B-0668577A0DC6}.debug|Win32.Build.0 = debug|Win32\r
+               {49010CFB-132B-682E-589B-0668577A0DC6}.release|Win32.ActiveCfg = release|Win32\r
+               {49010CFB-132B-682E-589B-0668577A0DC6}.release|Win32.Build.0 = release|Win32\r
+               {49010CFB-132B-682E-589B-0668577A0DC6}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {49010CFB-132B-682E-589B-0668577A0DC6}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A}.debug|Win32.Build.0 = debug|Win32\r
+               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A}.release|Win32.ActiveCfg = release|Win32\r
+               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A}.release|Win32.Build.0 = release|Win32\r
+               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A}.debug|Win32.Build.0 = debug|Win32\r
+               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A}.release|Win32.ActiveCfg = release|Win32\r
+               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A}.release|Win32.Build.0 = release|Win32\r
+               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}.debug|Win32.Build.0 = debug|Win32\r
+               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}.release|Win32.ActiveCfg = release|Win32\r
+               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}.release|Win32.Build.0 = release|Win32\r
+               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}.debug|Win32.ActiveCfg = debug|Win32\r
+               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}.debug|Win32.Build.0 = debug|Win32\r
+               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}.release|Win32.ActiveCfg = release|Win32\r
+               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}.release|Win32.Build.0 = release|Win32\r
+               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {41D50804-0184-4ECA-1FDB-0F69302A789A}.debug|Win32.ActiveCfg = debug|Win32\r
+               {41D50804-0184-4ECA-1FDB-0F69302A789A}.debug|Win32.Build.0 = debug|Win32\r
+               {41D50804-0184-4ECA-1FDB-0F69302A789A}.release|Win32.ActiveCfg = release|Win32\r
+               {41D50804-0184-4ECA-1FDB-0F69302A789A}.release|Win32.Build.0 = release|Win32\r
+               {41D50804-0184-4ECA-1FDB-0F69302A789A}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {41D50804-0184-4ECA-1FDB-0F69302A789A}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {42F476C8-7E53-1E8E-797E-55395E120A5A}.debug|Win32.ActiveCfg = debug|Win32\r
+               {42F476C8-7E53-1E8E-797E-55395E120A5A}.debug|Win32.Build.0 = debug|Win32\r
+               {42F476C8-7E53-1E8E-797E-55395E120A5A}.release|Win32.ActiveCfg = release|Win32\r
+               {42F476C8-7E53-1E8E-797E-55395E120A5A}.release|Win32.Build.0 = release|Win32\r
+               {42F476C8-7E53-1E8E-797E-55395E120A5A}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {42F476C8-7E53-1E8E-797E-55395E120A5A}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {42C954F7-7328-5896-6DB5-0DD240041F01}.debug|Win32.ActiveCfg = debug|Win32\r
+               {42C954F7-7328-5896-6DB5-0DD240041F01}.debug|Win32.Build.0 = debug|Win32\r
+               {42C954F7-7328-5896-6DB5-0DD240041F01}.release|Win32.ActiveCfg = release|Win32\r
+               {42C954F7-7328-5896-6DB5-0DD240041F01}.release|Win32.Build.0 = release|Win32\r
+               {42C954F7-7328-5896-6DB5-0DD240041F01}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {42C954F7-7328-5896-6DB5-0DD240041F01}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {42751154-5CD4-4CA8-5622-7F0303E8484E}.debug|Win32.ActiveCfg = debug|Win32\r
+               {42751154-5CD4-4CA8-5622-7F0303E8484E}.debug|Win32.Build.0 = debug|Win32\r
+               {42751154-5CD4-4CA8-5622-7F0303E8484E}.release|Win32.ActiveCfg = release|Win32\r
+               {42751154-5CD4-4CA8-5622-7F0303E8484E}.release|Win32.Build.0 = release|Win32\r
+               {42751154-5CD4-4CA8-5622-7F0303E8484E}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {42751154-5CD4-4CA8-5622-7F0303E8484E}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {47161A3C-4FAA-15AF-77E0-3EFE41441185}.debug|Win32.ActiveCfg = debug|Win32\r
+               {47161A3C-4FAA-15AF-77E0-3EFE41441185}.debug|Win32.Build.0 = debug|Win32\r
+               {47161A3C-4FAA-15AF-77E0-3EFE41441185}.release|Win32.ActiveCfg = release|Win32\r
+               {47161A3C-4FAA-15AF-77E0-3EFE41441185}.release|Win32.Build.0 = release|Win32\r
+               {47161A3C-4FAA-15AF-77E0-3EFE41441185}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {47161A3C-4FAA-15AF-77E0-3EFE41441185}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {477E59C9-08B0-5599-0133-29D54652239C}.debug|Win32.ActiveCfg = debug|Win32\r
+               {477E59C9-08B0-5599-0133-29D54652239C}.debug|Win32.Build.0 = debug|Win32\r
+               {477E59C9-08B0-5599-0133-29D54652239C}.release|Win32.ActiveCfg = release|Win32\r
+               {477E59C9-08B0-5599-0133-29D54652239C}.release|Win32.Build.0 = release|Win32\r
+               {477E59C9-08B0-5599-0133-29D54652239C}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {477E59C9-08B0-5599-0133-29D54652239C}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {47F44147-58D6-0D81-2BAF-52077C0307F6}.debug|Win32.ActiveCfg = debug|Win32\r
+               {47F44147-58D6-0D81-2BAF-52077C0307F6}.debug|Win32.Build.0 = debug|Win32\r
+               {47F44147-58D6-0D81-2BAF-52077C0307F6}.release|Win32.ActiveCfg = release|Win32\r
+               {47F44147-58D6-0D81-2BAF-52077C0307F6}.release|Win32.Build.0 = release|Win32\r
+               {47F44147-58D6-0D81-2BAF-52077C0307F6}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {47F44147-58D6-0D81-2BAF-52077C0307F6}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {486354CD-1D6C-0969-0597-5B8C1962032F}.debug|Win32.ActiveCfg = debug|Win32\r
+               {486354CD-1D6C-0969-0597-5B8C1962032F}.debug|Win32.Build.0 = debug|Win32\r
+               {486354CD-1D6C-0969-0597-5B8C1962032F}.release|Win32.ActiveCfg = release|Win32\r
+               {486354CD-1D6C-0969-0597-5B8C1962032F}.release|Win32.Build.0 = release|Win32\r
+               {486354CD-1D6C-0969-0597-5B8C1962032F}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {486354CD-1D6C-0969-0597-5B8C1962032F}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {48BF6C69-3F51-5156-6DBF-09096DCF4303}.debug|Win32.ActiveCfg = debug|Win32\r
+               {48BF6C69-3F51-5156-6DBF-09096DCF4303}.debug|Win32.Build.0 = debug|Win32\r
+               {48BF6C69-3F51-5156-6DBF-09096DCF4303}.release|Win32.ActiveCfg = release|Win32\r
+               {48BF6C69-3F51-5156-6DBF-09096DCF4303}.release|Win32.Build.0 = release|Win32\r
+               {48BF6C69-3F51-5156-6DBF-09096DCF4303}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {48BF6C69-3F51-5156-6DBF-09096DCF4303}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}.debug|Win32.ActiveCfg = debug|Win32\r
+               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}.debug|Win32.Build.0 = debug|Win32\r
+               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}.release|Win32.ActiveCfg = release|Win32\r
+               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}.release|Win32.Build.0 = release|Win32\r
+               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {499D1374-487C-4927-218E-1C12288D3975}.debug|Win32.ActiveCfg = debug|Win32\r
+               {499D1374-487C-4927-218E-1C12288D3975}.debug|Win32.Build.0 = debug|Win32\r
+               {499D1374-487C-4927-218E-1C12288D3975}.release|Win32.ActiveCfg = release|Win32\r
+               {499D1374-487C-4927-218E-1C12288D3975}.release|Win32.Build.0 = release|Win32\r
+               {499D1374-487C-4927-218E-1C12288D3975}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {499D1374-487C-4927-218E-1C12288D3975}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {49F50113-2499-3315-616B-3A3870D104B8}.debug|Win32.ActiveCfg = debug|Win32\r
+               {49F50113-2499-3315-616B-3A3870D104B8}.debug|Win32.Build.0 = debug|Win32\r
+               {49F50113-2499-3315-616B-3A3870D104B8}.release|Win32.ActiveCfg = release|Win32\r
+               {49F50113-2499-3315-616B-3A3870D104B8}.release|Win32.Build.0 = release|Win32\r
+               {49F50113-2499-3315-616B-3A3870D104B8}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {49F50113-2499-3315-616B-3A3870D104B8}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4A6E128E-3A87-48FB-3433-71C132AA5DA3}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4A6E128E-3A87-48FB-3433-71C132AA5DA3}.debug|Win32.Build.0 = debug|Win32\r
+               {4A6E128E-3A87-48FB-3433-71C132AA5DA3}.release|Win32.ActiveCfg = release|Win32\r
+               {4A6E128E-3A87-48FB-3433-71C132AA5DA3}.release|Win32.Build.0 = release|Win32\r
+               {4A6E128E-3A87-48FB-3433-71C132AA5DA3}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4A6E128E-3A87-48FB-3433-71C132AA5DA3}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4AC25631-50DC-54EA-4BC6-00906EC63456}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4AC25631-50DC-54EA-4BC6-00906EC63456}.debug|Win32.Build.0 = debug|Win32\r
+               {4AC25631-50DC-54EA-4BC6-00906EC63456}.release|Win32.ActiveCfg = release|Win32\r
+               {4AC25631-50DC-54EA-4BC6-00906EC63456}.release|Win32.Build.0 = release|Win32\r
+               {4AC25631-50DC-54EA-4BC6-00906EC63456}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4AC25631-50DC-54EA-4BC6-00906EC63456}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}.debug|Win32.Build.0 = debug|Win32\r
+               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}.release|Win32.ActiveCfg = release|Win32\r
+               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}.release|Win32.Build.0 = release|Win32\r
+               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4B790568-14A5-64C3-1C16-5B89179F33FE}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4B790568-14A5-64C3-1C16-5B89179F33FE}.debug|Win32.Build.0 = debug|Win32\r
+               {4B790568-14A5-64C3-1C16-5B89179F33FE}.release|Win32.ActiveCfg = release|Win32\r
+               {4B790568-14A5-64C3-1C16-5B89179F33FE}.release|Win32.Build.0 = release|Win32\r
+               {4B790568-14A5-64C3-1C16-5B89179F33FE}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4B790568-14A5-64C3-1C16-5B89179F33FE}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4BCB1F0E-6531-12B2-0B5E-5B0147921621}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4BCB1F0E-6531-12B2-0B5E-5B0147921621}.debug|Win32.Build.0 = debug|Win32\r
+               {4BCB1F0E-6531-12B2-0B5E-5B0147921621}.release|Win32.ActiveCfg = release|Win32\r
+               {4BCB1F0E-6531-12B2-0B5E-5B0147921621}.release|Win32.Build.0 = release|Win32\r
+               {4BCB1F0E-6531-12B2-0B5E-5B0147921621}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4BCB1F0E-6531-12B2-0B5E-5B0147921621}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}.debug|Win32.Build.0 = debug|Win32\r
+               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}.release|Win32.ActiveCfg = release|Win32\r
+               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}.release|Win32.Build.0 = release|Win32\r
+               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4C7F2448-6333-448C-3364-26A364432138}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4C7F2448-6333-448C-3364-26A364432138}.debug|Win32.Build.0 = debug|Win32\r
+               {4C7F2448-6333-448C-3364-26A364432138}.release|Win32.ActiveCfg = release|Win32\r
+               {4C7F2448-6333-448C-3364-26A364432138}.release|Win32.Build.0 = release|Win32\r
+               {4C7F2448-6333-448C-3364-26A364432138}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4C7F2448-6333-448C-3364-26A364432138}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4CDA3BE4-0518-0C79-1B8C-542038B0610D}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4CDA3BE4-0518-0C79-1B8C-542038B0610D}.debug|Win32.Build.0 = debug|Win32\r
+               {4CDA3BE4-0518-0C79-1B8C-542038B0610D}.release|Win32.ActiveCfg = release|Win32\r
+               {4CDA3BE4-0518-0C79-1B8C-542038B0610D}.release|Win32.Build.0 = release|Win32\r
+               {4CDA3BE4-0518-0C79-1B8C-542038B0610D}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4CDA3BE4-0518-0C79-1B8C-542038B0610D}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E}.debug|Win32.Build.0 = debug|Win32\r
+               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E}.release|Win32.ActiveCfg = release|Win32\r
+               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E}.release|Win32.Build.0 = release|Win32\r
+               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4D81192C-6BF8-4656-2267-626724BF19E2}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4D81192C-6BF8-4656-2267-626724BF19E2}.debug|Win32.Build.0 = debug|Win32\r
+               {4D81192C-6BF8-4656-2267-626724BF19E2}.release|Win32.ActiveCfg = release|Win32\r
+               {4D81192C-6BF8-4656-2267-626724BF19E2}.release|Win32.Build.0 = release|Win32\r
+               {4D81192C-6BF8-4656-2267-626724BF19E2}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4D81192C-6BF8-4656-2267-626724BF19E2}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}.debug|Win32.Build.0 = debug|Win32\r
+               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}.release|Win32.ActiveCfg = release|Win32\r
+               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}.release|Win32.Build.0 = release|Win32\r
+               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4E341E67-69FA-7830-4A6D-2E09417024FA}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4E341E67-69FA-7830-4A6D-2E09417024FA}.debug|Win32.Build.0 = debug|Win32\r
+               {4E341E67-69FA-7830-4A6D-2E09417024FA}.release|Win32.ActiveCfg = release|Win32\r
+               {4E341E67-69FA-7830-4A6D-2E09417024FA}.release|Win32.Build.0 = release|Win32\r
+               {4E341E67-69FA-7830-4A6D-2E09417024FA}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4E341E67-69FA-7830-4A6D-2E09417024FA}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4E830E10-74BE-4820-116A-1E2A653A128B}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4E830E10-74BE-4820-116A-1E2A653A128B}.debug|Win32.Build.0 = debug|Win32\r
+               {4E830E10-74BE-4820-116A-1E2A653A128B}.release|Win32.ActiveCfg = release|Win32\r
+               {4E830E10-74BE-4820-116A-1E2A653A128B}.release|Win32.Build.0 = release|Win32\r
+               {4E830E10-74BE-4820-116A-1E2A653A128B}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4E830E10-74BE-4820-116A-1E2A653A128B}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4EE823A1-67FB-2A0B-7272-79AB5E203011}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4EE823A1-67FB-2A0B-7272-79AB5E203011}.debug|Win32.Build.0 = debug|Win32\r
+               {4EE823A1-67FB-2A0B-7272-79AB5E203011}.release|Win32.ActiveCfg = release|Win32\r
+               {4EE823A1-67FB-2A0B-7272-79AB5E203011}.release|Win32.Build.0 = release|Win32\r
+               {4EE823A1-67FB-2A0B-7272-79AB5E203011}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4EE823A1-67FB-2A0B-7272-79AB5E203011}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4F670915-097A-7BF0-15CF-4FE2384A721E}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4F670915-097A-7BF0-15CF-4FE2384A721E}.debug|Win32.Build.0 = debug|Win32\r
+               {4F670915-097A-7BF0-15CF-4FE2384A721E}.release|Win32.ActiveCfg = release|Win32\r
+               {4F670915-097A-7BF0-15CF-4FE2384A721E}.release|Win32.Build.0 = release|Win32\r
+               {4F670915-097A-7BF0-15CF-4FE2384A721E}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4F670915-097A-7BF0-15CF-4FE2384A721E}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4FD94697-13D8-55D8-1801-68BD61D261E7}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4FD94697-13D8-55D8-1801-68BD61D261E7}.debug|Win32.Build.0 = debug|Win32\r
+               {4FD94697-13D8-55D8-1801-68BD61D261E7}.release|Win32.ActiveCfg = release|Win32\r
+               {4FD94697-13D8-55D8-1801-68BD61D261E7}.release|Win32.Build.0 = release|Win32\r
+               {4FD94697-13D8-55D8-1801-68BD61D261E7}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4FD94697-13D8-55D8-1801-68BD61D261E7}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {50283641-1E9C-25C7-5EFF-58DF059D4F79}.debug|Win32.ActiveCfg = debug|Win32\r
+               {50283641-1E9C-25C7-5EFF-58DF059D4F79}.debug|Win32.Build.0 = debug|Win32\r
+               {50283641-1E9C-25C7-5EFF-58DF059D4F79}.release|Win32.ActiveCfg = release|Win32\r
+               {50283641-1E9C-25C7-5EFF-58DF059D4F79}.release|Win32.Build.0 = release|Win32\r
+               {50283641-1E9C-25C7-5EFF-58DF059D4F79}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {50283641-1E9C-25C7-5EFF-58DF059D4F79}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC}.debug|Win32.ActiveCfg = debug|Win32\r
+               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC}.debug|Win32.Build.0 = debug|Win32\r
+               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC}.release|Win32.ActiveCfg = release|Win32\r
+               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC}.release|Win32.Build.0 = release|Win32\r
+               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3}.debug|Win32.ActiveCfg = debug|Win32\r
+               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3}.debug|Win32.Build.0 = debug|Win32\r
+               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3}.release|Win32.ActiveCfg = release|Win32\r
+               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3}.release|Win32.Build.0 = release|Win32\r
+               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {51472505-1B6B-758B-38A1-1EAF33846138}.debug|Win32.ActiveCfg = debug|Win32\r
+               {51472505-1B6B-758B-38A1-1EAF33846138}.debug|Win32.Build.0 = debug|Win32\r
+               {51472505-1B6B-758B-38A1-1EAF33846138}.release|Win32.ActiveCfg = release|Win32\r
+               {51472505-1B6B-758B-38A1-1EAF33846138}.release|Win32.Build.0 = release|Win32\r
+               {51472505-1B6B-758B-38A1-1EAF33846138}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {51472505-1B6B-758B-38A1-1EAF33846138}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {519F12A4-7788-5F78-787F-3CD57BC82C7C}.debug|Win32.ActiveCfg = debug|Win32\r
+               {519F12A4-7788-5F78-787F-3CD57BC82C7C}.debug|Win32.Build.0 = debug|Win32\r
+               {519F12A4-7788-5F78-787F-3CD57BC82C7C}.release|Win32.ActiveCfg = release|Win32\r
+               {519F12A4-7788-5F78-787F-3CD57BC82C7C}.release|Win32.Build.0 = release|Win32\r
+               {519F12A4-7788-5F78-787F-3CD57BC82C7C}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {519F12A4-7788-5F78-787F-3CD57BC82C7C}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {51EE024D-024C-2F68-3F7C-2CF61F931A0D}.debug|Win32.ActiveCfg = debug|Win32\r
+               {51EE024D-024C-2F68-3F7C-2CF61F931A0D}.debug|Win32.Build.0 = debug|Win32\r
+               {51EE024D-024C-2F68-3F7C-2CF61F931A0D}.release|Win32.ActiveCfg = release|Win32\r
+               {51EE024D-024C-2F68-3F7C-2CF61F931A0D}.release|Win32.Build.0 = release|Win32\r
+               {51EE024D-024C-2F68-3F7C-2CF61F931A0D}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {51EE024D-024C-2F68-3F7C-2CF61F931A0D}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {524345F0-18A0-3B56-570F-3BC55BAF70C0}.debug|Win32.ActiveCfg = debug|Win32\r
+               {524345F0-18A0-3B56-570F-3BC55BAF70C0}.debug|Win32.Build.0 = debug|Win32\r
+               {524345F0-18A0-3B56-570F-3BC55BAF70C0}.release|Win32.ActiveCfg = release|Win32\r
+               {524345F0-18A0-3B56-570F-3BC55BAF70C0}.release|Win32.Build.0 = release|Win32\r
+               {524345F0-18A0-3B56-570F-3BC55BAF70C0}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {524345F0-18A0-3B56-570F-3BC55BAF70C0}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {529E5D8B-3A85-0343-3F37-6941301C3095}.debug|Win32.ActiveCfg = debug|Win32\r
+               {529E5D8B-3A85-0343-3F37-6941301C3095}.debug|Win32.Build.0 = debug|Win32\r
+               {529E5D8B-3A85-0343-3F37-6941301C3095}.release|Win32.ActiveCfg = release|Win32\r
+               {529E5D8B-3A85-0343-3F37-6941301C3095}.release|Win32.Build.0 = release|Win32\r
+               {529E5D8B-3A85-0343-3F37-6941301C3095}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {529E5D8B-3A85-0343-3F37-6941301C3095}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {52F07731-0B12-3132-2E80-68BA600F12B7}.debug|Win32.ActiveCfg = debug|Win32\r
+               {52F07731-0B12-3132-2E80-68BA600F12B7}.debug|Win32.Build.0 = debug|Win32\r
+               {52F07731-0B12-3132-2E80-68BA600F12B7}.release|Win32.ActiveCfg = release|Win32\r
+               {52F07731-0B12-3132-2E80-68BA600F12B7}.release|Win32.Build.0 = release|Win32\r
+               {52F07731-0B12-3132-2E80-68BA600F12B7}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {52F07731-0B12-3132-2E80-68BA600F12B7}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {534864D0-672E-1B1F-6E5D-06DF28535DFA}.debug|Win32.ActiveCfg = debug|Win32\r
+               {534864D0-672E-1B1F-6E5D-06DF28535DFA}.debug|Win32.Build.0 = debug|Win32\r
+               {534864D0-672E-1B1F-6E5D-06DF28535DFA}.release|Win32.ActiveCfg = release|Win32\r
+               {534864D0-672E-1B1F-6E5D-06DF28535DFA}.release|Win32.Build.0 = release|Win32\r
+               {534864D0-672E-1B1F-6E5D-06DF28535DFA}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {534864D0-672E-1B1F-6E5D-06DF28535DFA}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {53A37C6C-0913-630C-5685-345C7CC01DCF}.debug|Win32.ActiveCfg = debug|Win32\r
+               {53A37C6C-0913-630C-5685-345C7CC01DCF}.debug|Win32.Build.0 = debug|Win32\r
+               {53A37C6C-0913-630C-5685-345C7CC01DCF}.release|Win32.ActiveCfg = release|Win32\r
+               {53A37C6C-0913-630C-5685-345C7CC01DCF}.release|Win32.Build.0 = release|Win32\r
+               {53A37C6C-0913-630C-5685-345C7CC01DCF}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {53A37C6C-0913-630C-5685-345C7CC01DCF}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}.debug|Win32.ActiveCfg = debug|Win32\r
+               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}.debug|Win32.Build.0 = debug|Win32\r
+               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}.release|Win32.ActiveCfg = release|Win32\r
+               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}.release|Win32.Build.0 = release|Win32\r
+               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {54854D74-5807-38DD-329F-56BC43A708D1}.debug|Win32.ActiveCfg = debug|Win32\r
+               {54854D74-5807-38DD-329F-56BC43A708D1}.debug|Win32.Build.0 = debug|Win32\r
+               {54854D74-5807-38DD-329F-56BC43A708D1}.release|Win32.ActiveCfg = release|Win32\r
+               {54854D74-5807-38DD-329F-56BC43A708D1}.release|Win32.Build.0 = release|Win32\r
+               {54854D74-5807-38DD-329F-56BC43A708D1}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {54854D74-5807-38DD-329F-56BC43A708D1}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {54D33D1E-62CB-08CC-799D-46DE67727662}.debug|Win32.ActiveCfg = debug|Win32\r
+               {54D33D1E-62CB-08CC-799D-46DE67727662}.debug|Win32.Build.0 = debug|Win32\r
+               {54D33D1E-62CB-08CC-799D-46DE67727662}.release|Win32.ActiveCfg = release|Win32\r
+               {54D33D1E-62CB-08CC-799D-46DE67727662}.release|Win32.Build.0 = release|Win32\r
+               {54D33D1E-62CB-08CC-799D-46DE67727662}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {54D33D1E-62CB-08CC-799D-46DE67727662}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {552556C4-3357-36BB-68E5-465617655884}.debug|Win32.ActiveCfg = debug|Win32\r
+               {552556C4-3357-36BB-68E5-465617655884}.debug|Win32.Build.0 = debug|Win32\r
+               {552556C4-3357-36BB-68E5-465617655884}.release|Win32.ActiveCfg = release|Win32\r
+               {552556C4-3357-36BB-68E5-465617655884}.release|Win32.Build.0 = release|Win32\r
+               {552556C4-3357-36BB-68E5-465617655884}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {552556C4-3357-36BB-68E5-465617655884}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {59BC61B6-54D5-65C4-11C4-584D30474409}.debug|Win32.ActiveCfg = debug|Win32\r
+               {59BC61B6-54D5-65C4-11C4-584D30474409}.debug|Win32.Build.0 = debug|Win32\r
+               {59BC61B6-54D5-65C4-11C4-584D30474409}.release|Win32.ActiveCfg = release|Win32\r
+               {59BC61B6-54D5-65C4-11C4-584D30474409}.release|Win32.Build.0 = release|Win32\r
+               {59BC61B6-54D5-65C4-11C4-584D30474409}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {59BC61B6-54D5-65C4-11C4-584D30474409}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {5A144F55-30F2-4FB1-51A1-7672788B0F4D}.debug|Win32.ActiveCfg = debug|Win32\r
+               {5A144F55-30F2-4FB1-51A1-7672788B0F4D}.debug|Win32.Build.0 = debug|Win32\r
+               {5A144F55-30F2-4FB1-51A1-7672788B0F4D}.release|Win32.ActiveCfg = release|Win32\r
+               {5A144F55-30F2-4FB1-51A1-7672788B0F4D}.release|Win32.Build.0 = release|Win32\r
+               {5A144F55-30F2-4FB1-51A1-7672788B0F4D}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {5A144F55-30F2-4FB1-51A1-7672788B0F4D}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {5D5521C1-3355-7102-73EA-3DD714D62B76}.debug|Win32.ActiveCfg = debug|Win32\r
+               {5D5521C1-3355-7102-73EA-3DD714D62B76}.debug|Win32.Build.0 = debug|Win32\r
+               {5D5521C1-3355-7102-73EA-3DD714D62B76}.release|Win32.ActiveCfg = release|Win32\r
+               {5D5521C1-3355-7102-73EA-3DD714D62B76}.release|Win32.Build.0 = release|Win32\r
+               {5D5521C1-3355-7102-73EA-3DD714D62B76}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {5D5521C1-3355-7102-73EA-3DD714D62B76}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228}.debug|Win32.ActiveCfg = debug|Win32\r
+               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228}.debug|Win32.Build.0 = debug|Win32\r
+               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228}.release|Win32.ActiveCfg = release|Win32\r
+               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228}.release|Win32.Build.0 = release|Win32\r
+               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA}.debug|Win32.ActiveCfg = debug|Win32\r
+               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA}.debug|Win32.Build.0 = debug|Win32\r
+               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA}.release|Win32.ActiveCfg = release|Win32\r
+               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA}.release|Win32.Build.0 = release|Win32\r
+               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08}.debug|Win32.ActiveCfg = debug|Win32\r
+               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08}.debug|Win32.Build.0 = debug|Win32\r
+               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08}.release|Win32.ActiveCfg = release|Win32\r
+               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08}.release|Win32.Build.0 = release|Win32\r
+               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8}.debug|Win32.ActiveCfg = debug|Win32\r
+               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8}.debug|Win32.Build.0 = debug|Win32\r
+               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8}.release|Win32.ActiveCfg = release|Win32\r
+               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8}.release|Win32.Build.0 = release|Win32\r
+               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {5EC3002E-3AE8-10B5-148A-73C866892AC7}.debug|Win32.ActiveCfg = debug|Win32\r
+               {5EC3002E-3AE8-10B5-148A-73C866892AC7}.debug|Win32.Build.0 = debug|Win32\r
+               {5EC3002E-3AE8-10B5-148A-73C866892AC7}.release|Win32.ActiveCfg = release|Win32\r
+               {5EC3002E-3AE8-10B5-148A-73C866892AC7}.release|Win32.Build.0 = release|Win32\r
+               {5EC3002E-3AE8-10B5-148A-73C866892AC7}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {5EC3002E-3AE8-10B5-148A-73C866892AC7}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {5F1843D1-513D-1CA4-2C1D-029722A5017A}.debug|Win32.ActiveCfg = debug|Win32\r
+               {5F1843D1-513D-1CA4-2C1D-029722A5017A}.debug|Win32.Build.0 = debug|Win32\r
+               {5F1843D1-513D-1CA4-2C1D-029722A5017A}.release|Win32.ActiveCfg = release|Win32\r
+               {5F1843D1-513D-1CA4-2C1D-029722A5017A}.release|Win32.Build.0 = release|Win32\r
+               {5F1843D1-513D-1CA4-2C1D-029722A5017A}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {5F1843D1-513D-1CA4-2C1D-029722A5017A}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {5F605F82-5071-3095-2286-540B2E1F05EA}.debug|Win32.ActiveCfg = debug|Win32\r
+               {5F605F82-5071-3095-2286-540B2E1F05EA}.debug|Win32.Build.0 = debug|Win32\r
+               {5F605F82-5071-3095-2286-540B2E1F05EA}.release|Win32.ActiveCfg = release|Win32\r
+               {5F605F82-5071-3095-2286-540B2E1F05EA}.release|Win32.Build.0 = release|Win32\r
+               {5F605F82-5071-3095-2286-540B2E1F05EA}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {5F605F82-5071-3095-2286-540B2E1F05EA}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}.debug|Win32.ActiveCfg = debug|Win32\r
+               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}.debug|Win32.Build.0 = debug|Win32\r
+               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}.release|Win32.ActiveCfg = release|Win32\r
+               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}.release|Win32.Build.0 = release|Win32\r
+               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {5FFC3ED5-65F9-5074-3081-344E75B4610C}.debug|Win32.ActiveCfg = debug|Win32\r
+               {5FFC3ED5-65F9-5074-3081-344E75B4610C}.debug|Win32.Build.0 = debug|Win32\r
+               {5FFC3ED5-65F9-5074-3081-344E75B4610C}.release|Win32.ActiveCfg = release|Win32\r
+               {5FFC3ED5-65F9-5074-3081-344E75B4610C}.release|Win32.Build.0 = release|Win32\r
+               {5FFC3ED5-65F9-5074-3081-344E75B4610C}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {5FFC3ED5-65F9-5074-3081-344E75B4610C}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {60445A86-652D-6464-26EA-05C2012E657C}.debug|Win32.ActiveCfg = debug|Win32\r
+               {60445A86-652D-6464-26EA-05C2012E657C}.debug|Win32.Build.0 = debug|Win32\r
+               {60445A86-652D-6464-26EA-05C2012E657C}.release|Win32.ActiveCfg = release|Win32\r
+               {60445A86-652D-6464-26EA-05C2012E657C}.release|Win32.Build.0 = release|Win32\r
+               {60445A86-652D-6464-26EA-05C2012E657C}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {60445A86-652D-6464-26EA-05C2012E657C}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {6096742C-35B9-1253-1632-053B3121479F}.debug|Win32.ActiveCfg = debug|Win32\r
+               {6096742C-35B9-1253-1632-053B3121479F}.debug|Win32.Build.0 = debug|Win32\r
+               {6096742C-35B9-1253-1632-053B3121479F}.release|Win32.ActiveCfg = release|Win32\r
+               {6096742C-35B9-1253-1632-053B3121479F}.release|Win32.Build.0 = release|Win32\r
+               {6096742C-35B9-1253-1632-053B3121479F}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {6096742C-35B9-1253-1632-053B3121479F}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {60E80DD2-0645-4042-057B-04B3611529C1}.debug|Win32.ActiveCfg = debug|Win32\r
+               {60E80DD2-0645-4042-057B-04B3611529C1}.debug|Win32.Build.0 = debug|Win32\r
+               {60E80DD2-0645-4042-057B-04B3611529C1}.release|Win32.ActiveCfg = release|Win32\r
+               {60E80DD2-0645-4042-057B-04B3611529C1}.release|Win32.Build.0 = release|Win32\r
+               {60E80DD2-0645-4042-057B-04B3611529C1}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {60E80DD2-0645-4042-057B-04B3611529C1}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {61464F6A-6DF2-662E-15ED-418641AA5E26}.debug|Win32.ActiveCfg = debug|Win32\r
+               {61464F6A-6DF2-662E-15ED-418641AA5E26}.debug|Win32.Build.0 = debug|Win32\r
+               {61464F6A-6DF2-662E-15ED-418641AA5E26}.release|Win32.ActiveCfg = release|Win32\r
+               {61464F6A-6DF2-662E-15ED-418641AA5E26}.release|Win32.Build.0 = release|Win32\r
+               {61464F6A-6DF2-662E-15ED-418641AA5E26}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {61464F6A-6DF2-662E-15ED-418641AA5E26}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {61911518-32EE-581F-34A1-2251594C5726}.debug|Win32.ActiveCfg = debug|Win32\r
+               {61911518-32EE-581F-34A1-2251594C5726}.debug|Win32.Build.0 = debug|Win32\r
+               {61911518-32EE-581F-34A1-2251594C5726}.release|Win32.ActiveCfg = release|Win32\r
+               {61911518-32EE-581F-34A1-2251594C5726}.release|Win32.Build.0 = release|Win32\r
+               {61911518-32EE-581F-34A1-2251594C5726}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {61911518-32EE-581F-34A1-2251594C5726}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {61D930C8-3222-6C0F-2B09-73C564C65B96}.debug|Win32.ActiveCfg = debug|Win32\r
+               {61D930C8-3222-6C0F-2B09-73C564C65B96}.debug|Win32.Build.0 = debug|Win32\r
+               {61D930C8-3222-6C0F-2B09-73C564C65B96}.release|Win32.ActiveCfg = release|Win32\r
+               {61D930C8-3222-6C0F-2B09-73C564C65B96}.release|Win32.Build.0 = release|Win32\r
+               {61D930C8-3222-6C0F-2B09-73C564C65B96}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {61D930C8-3222-6C0F-2B09-73C564C65B96}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {621E227D-6B8E-2201-7927-35E264186B76}.debug|Win32.ActiveCfg = debug|Win32\r
+               {621E227D-6B8E-2201-7927-35E264186B76}.debug|Win32.Build.0 = debug|Win32\r
+               {621E227D-6B8E-2201-7927-35E264186B76}.release|Win32.ActiveCfg = release|Win32\r
+               {621E227D-6B8E-2201-7927-35E264186B76}.release|Win32.Build.0 = release|Win32\r
+               {621E227D-6B8E-2201-7927-35E264186B76}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {621E227D-6B8E-2201-7927-35E264186B76}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {62621432-24F9-57F3-4745-780063697B55}.debug|Win32.ActiveCfg = debug|Win32\r
+               {62621432-24F9-57F3-4745-780063697B55}.debug|Win32.Build.0 = debug|Win32\r
+               {62621432-24F9-57F3-4745-780063697B55}.release|Win32.ActiveCfg = release|Win32\r
+               {62621432-24F9-57F3-4745-780063697B55}.release|Win32.Build.0 = release|Win32\r
+               {62621432-24F9-57F3-4745-780063697B55}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {62621432-24F9-57F3-4745-780063697B55}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213}.debug|Win32.ActiveCfg = debug|Win32\r
+               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213}.debug|Win32.Build.0 = debug|Win32\r
+               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213}.release|Win32.ActiveCfg = release|Win32\r
+               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213}.release|Win32.Build.0 = release|Win32\r
+               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {62E279A5-4678-29D8-6AA2-4E363D933D61}.debug|Win32.ActiveCfg = debug|Win32\r
+               {62E279A5-4678-29D8-6AA2-4E363D933D61}.debug|Win32.Build.0 = debug|Win32\r
+               {62E279A5-4678-29D8-6AA2-4E363D933D61}.release|Win32.ActiveCfg = release|Win32\r
+               {62E279A5-4678-29D8-6AA2-4E363D933D61}.release|Win32.Build.0 = release|Win32\r
+               {62E279A5-4678-29D8-6AA2-4E363D933D61}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {62E279A5-4678-29D8-6AA2-4E363D933D61}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {45D8782C-23BC-5A59-47C8-5416580E1D6F}.debug|Win32.ActiveCfg = debug|Win32\r
+               {45D8782C-23BC-5A59-47C8-5416580E1D6F}.debug|Win32.Build.0 = debug|Win32\r
+               {45D8782C-23BC-5A59-47C8-5416580E1D6F}.release|Win32.ActiveCfg = release|Win32\r
+               {45D8782C-23BC-5A59-47C8-5416580E1D6F}.release|Win32.Build.0 = release|Win32\r
+               {45D8782C-23BC-5A59-47C8-5416580E1D6F}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {45D8782C-23BC-5A59-47C8-5416580E1D6F}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {46A97746-15C7-5A2D-5A6D-29C5622B419D}.debug|Win32.ActiveCfg = debug|Win32\r
+               {46A97746-15C7-5A2D-5A6D-29C5622B419D}.debug|Win32.Build.0 = debug|Win32\r
+               {46A97746-15C7-5A2D-5A6D-29C5622B419D}.release|Win32.ActiveCfg = release|Win32\r
+               {46A97746-15C7-5A2D-5A6D-29C5622B419D}.release|Win32.Build.0 = release|Win32\r
+               {46A97746-15C7-5A2D-5A6D-29C5622B419D}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {46A97746-15C7-5A2D-5A6D-29C5622B419D}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {473504AB-4E66-2410-1EF3-3D566CF655EC}.debug|Win32.ActiveCfg = debug|Win32\r
+               {473504AB-4E66-2410-1EF3-3D566CF655EC}.debug|Win32.Build.0 = debug|Win32\r
+               {473504AB-4E66-2410-1EF3-3D566CF655EC}.release|Win32.ActiveCfg = release|Win32\r
+               {473504AB-4E66-2410-1EF3-3D566CF655EC}.release|Win32.Build.0 = release|Win32\r
+               {473504AB-4E66-2410-1EF3-3D566CF655EC}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {473504AB-4E66-2410-1EF3-3D566CF655EC}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {47C21211-0705-6DF2-637A-50E777C26A3B}.debug|Win32.ActiveCfg = debug|Win32\r
+               {47C21211-0705-6DF2-637A-50E777C26A3B}.debug|Win32.Build.0 = debug|Win32\r
+               {47C21211-0705-6DF2-637A-50E777C26A3B}.release|Win32.ActiveCfg = release|Win32\r
+               {47C21211-0705-6DF2-637A-50E777C26A3B}.release|Win32.Build.0 = release|Win32\r
+               {47C21211-0705-6DF2-637A-50E777C26A3B}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {47C21211-0705-6DF2-637A-50E777C26A3B}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {482D7B9A-05D3-0BDC-1517-4B1508F970E3}.debug|Win32.ActiveCfg = debug|Win32\r
+               {482D7B9A-05D3-0BDC-1517-4B1508F970E3}.debug|Win32.Build.0 = debug|Win32\r
+               {482D7B9A-05D3-0BDC-1517-4B1508F970E3}.release|Win32.ActiveCfg = release|Win32\r
+               {482D7B9A-05D3-0BDC-1517-4B1508F970E3}.release|Win32.Build.0 = release|Win32\r
+               {482D7B9A-05D3-0BDC-1517-4B1508F970E3}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {482D7B9A-05D3-0BDC-1517-4B1508F970E3}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {48BA08FF-3E72-55BE-599E-5EA713C40532}.debug|Win32.ActiveCfg = debug|Win32\r
+               {48BA08FF-3E72-55BE-599E-5EA713C40532}.debug|Win32.Build.0 = debug|Win32\r
+               {48BA08FF-3E72-55BE-599E-5EA713C40532}.release|Win32.ActiveCfg = release|Win32\r
+               {48BA08FF-3E72-55BE-599E-5EA713C40532}.release|Win32.Build.0 = release|Win32\r
+               {48BA08FF-3E72-55BE-599E-5EA713C40532}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {48BA08FF-3E72-55BE-599E-5EA713C40532}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {490F4CA2-54C7-61AC-7131-6D764FE05BE5}.debug|Win32.ActiveCfg = debug|Win32\r
+               {490F4CA2-54C7-61AC-7131-6D764FE05BE5}.debug|Win32.Build.0 = debug|Win32\r
+               {490F4CA2-54C7-61AC-7131-6D764FE05BE5}.release|Win32.ActiveCfg = release|Win32\r
+               {490F4CA2-54C7-61AC-7131-6D764FE05BE5}.release|Win32.Build.0 = release|Win32\r
+               {490F4CA2-54C7-61AC-7131-6D764FE05BE5}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {490F4CA2-54C7-61AC-7131-6D764FE05BE5}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {497E6028-195D-5D95-4B18-76FB6D3F571E}.debug|Win32.ActiveCfg = debug|Win32\r
+               {497E6028-195D-5D95-4B18-76FB6D3F571E}.debug|Win32.Build.0 = debug|Win32\r
+               {497E6028-195D-5D95-4B18-76FB6D3F571E}.release|Win32.ActiveCfg = release|Win32\r
+               {497E6028-195D-5D95-4B18-76FB6D3F571E}.release|Win32.Build.0 = release|Win32\r
+               {497E6028-195D-5D95-4B18-76FB6D3F571E}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {497E6028-195D-5D95-4B18-76FB6D3F571E}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4A0D178A-17C4-0577-37E9-19E304335FFE}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4A0D178A-17C4-0577-37E9-19E304335FFE}.debug|Win32.Build.0 = debug|Win32\r
+               {4A0D178A-17C4-0577-37E9-19E304335FFE}.release|Win32.ActiveCfg = release|Win32\r
+               {4A0D178A-17C4-0577-37E9-19E304335FFE}.release|Win32.Build.0 = release|Win32\r
+               {4A0D178A-17C4-0577-37E9-19E304335FFE}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4A0D178A-17C4-0577-37E9-19E304335FFE}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4A732D1A-0B02-6761-18F1-75637D197D84}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4A732D1A-0B02-6761-18F1-75637D197D84}.debug|Win32.Build.0 = debug|Win32\r
+               {4A732D1A-0B02-6761-18F1-75637D197D84}.release|Win32.ActiveCfg = release|Win32\r
+               {4A732D1A-0B02-6761-18F1-75637D197D84}.release|Win32.Build.0 = release|Win32\r
+               {4A732D1A-0B02-6761-18F1-75637D197D84}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4A732D1A-0B02-6761-18F1-75637D197D84}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4ACB1AB9-671E-514F-58CF-1389455D48C8}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4ACB1AB9-671E-514F-58CF-1389455D48C8}.debug|Win32.Build.0 = debug|Win32\r
+               {4ACB1AB9-671E-514F-58CF-1389455D48C8}.release|Win32.ActiveCfg = release|Win32\r
+               {4ACB1AB9-671E-514F-58CF-1389455D48C8}.release|Win32.Build.0 = release|Win32\r
+               {4ACB1AB9-671E-514F-58CF-1389455D48C8}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4ACB1AB9-671E-514F-58CF-1389455D48C8}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4B230858-433B-3B3C-18AC-31AF0DA1140B}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4B230858-433B-3B3C-18AC-31AF0DA1140B}.debug|Win32.Build.0 = debug|Win32\r
+               {4B230858-433B-3B3C-18AC-31AF0DA1140B}.release|Win32.ActiveCfg = release|Win32\r
+               {4B230858-433B-3B3C-18AC-31AF0DA1140B}.release|Win32.Build.0 = release|Win32\r
+               {4B230858-433B-3B3C-18AC-31AF0DA1140B}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4B230858-433B-3B3C-18AC-31AF0DA1140B}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4B717802-4DFF-0B2C-5FAA-21D0316C019D}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4B717802-4DFF-0B2C-5FAA-21D0316C019D}.debug|Win32.Build.0 = debug|Win32\r
+               {4B717802-4DFF-0B2C-5FAA-21D0316C019D}.release|Win32.ActiveCfg = release|Win32\r
+               {4B717802-4DFF-0B2C-5FAA-21D0316C019D}.release|Win32.Build.0 = release|Win32\r
+               {4B717802-4DFF-0B2C-5FAA-21D0316C019D}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4B717802-4DFF-0B2C-5FAA-21D0316C019D}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}.debug|Win32.Build.0 = debug|Win32\r
+               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}.release|Win32.ActiveCfg = release|Win32\r
+               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}.release|Win32.Build.0 = release|Win32\r
+               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4C631AF8-79DC-36F9-0538-10E2351D3373}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4C631AF8-79DC-36F9-0538-10E2351D3373}.debug|Win32.Build.0 = debug|Win32\r
+               {4C631AF8-79DC-36F9-0538-10E2351D3373}.release|Win32.ActiveCfg = release|Win32\r
+               {4C631AF8-79DC-36F9-0538-10E2351D3373}.release|Win32.Build.0 = release|Win32\r
+               {4C631AF8-79DC-36F9-0538-10E2351D3373}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4C631AF8-79DC-36F9-0538-10E2351D3373}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4CB10AA2-04A0-06E9-4C36-010458E82104}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4CB10AA2-04A0-06E9-4C36-010458E82104}.debug|Win32.Build.0 = debug|Win32\r
+               {4CB10AA2-04A0-06E9-4C36-010458E82104}.release|Win32.ActiveCfg = release|Win32\r
+               {4CB10AA2-04A0-06E9-4C36-010458E82104}.release|Win32.Build.0 = release|Win32\r
+               {4CB10AA2-04A0-06E9-4C36-010458E82104}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4CB10AA2-04A0-06E9-4C36-010458E82104}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4D007A4C-0F64-56D8-1334-71257CB30E95}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4D007A4C-0F64-56D8-1334-71257CB30E95}.debug|Win32.Build.0 = debug|Win32\r
+               {4D007A4C-0F64-56D8-1334-71257CB30E95}.release|Win32.ActiveCfg = release|Win32\r
+               {4D007A4C-0F64-56D8-1334-71257CB30E95}.release|Win32.Build.0 = release|Win32\r
+               {4D007A4C-0F64-56D8-1334-71257CB30E95}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4D007A4C-0F64-56D8-1334-71257CB30E95}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4D446C00-48CF-0CCA-6152-33437C051E75}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4D446C00-48CF-0CCA-6152-33437C051E75}.debug|Win32.Build.0 = debug|Win32\r
+               {4D446C00-48CF-0CCA-6152-33437C051E75}.release|Win32.ActiveCfg = release|Win32\r
+               {4D446C00-48CF-0CCA-6152-33437C051E75}.release|Win32.Build.0 = release|Win32\r
+               {4D446C00-48CF-0CCA-6152-33437C051E75}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4D446C00-48CF-0CCA-6152-33437C051E75}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}.debug|Win32.Build.0 = debug|Win32\r
+               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}.release|Win32.ActiveCfg = release|Win32\r
+               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}.release|Win32.Build.0 = release|Win32\r
+               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4DF8713A-46D1-3EA4-0958-7EE518B5298C}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4DF8713A-46D1-3EA4-0958-7EE518B5298C}.debug|Win32.Build.0 = debug|Win32\r
+               {4DF8713A-46D1-3EA4-0958-7EE518B5298C}.release|Win32.ActiveCfg = release|Win32\r
+               {4DF8713A-46D1-3EA4-0958-7EE518B5298C}.release|Win32.Build.0 = release|Win32\r
+               {4DF8713A-46D1-3EA4-0958-7EE518B5298C}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4DF8713A-46D1-3EA4-0958-7EE518B5298C}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F}.debug|Win32.Build.0 = debug|Win32\r
+               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F}.release|Win32.ActiveCfg = release|Win32\r
+               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F}.release|Win32.Build.0 = release|Win32\r
+               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4EBC4863-21BB-467B-7AD2-173972307B78}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4EBC4863-21BB-467B-7AD2-173972307B78}.debug|Win32.Build.0 = debug|Win32\r
+               {4EBC4863-21BB-467B-7AD2-173972307B78}.release|Win32.ActiveCfg = release|Win32\r
+               {4EBC4863-21BB-467B-7AD2-173972307B78}.release|Win32.Build.0 = release|Win32\r
+               {4EBC4863-21BB-467B-7AD2-173972307B78}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4EBC4863-21BB-467B-7AD2-173972307B78}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4F3803DA-7D72-3A61-75E4-5E18403248F3}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4F3803DA-7D72-3A61-75E4-5E18403248F3}.debug|Win32.Build.0 = debug|Win32\r
+               {4F3803DA-7D72-3A61-75E4-5E18403248F3}.release|Win32.ActiveCfg = release|Win32\r
+               {4F3803DA-7D72-3A61-75E4-5E18403248F3}.release|Win32.Build.0 = release|Win32\r
+               {4F3803DA-7D72-3A61-75E4-5E18403248F3}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4F3803DA-7D72-3A61-75E4-5E18403248F3}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4F834988-426E-2C51-1497-3EE357D441F4}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4F834988-426E-2C51-1497-3EE357D441F4}.debug|Win32.Build.0 = debug|Win32\r
+               {4F834988-426E-2C51-1497-3EE357D441F4}.release|Win32.ActiveCfg = release|Win32\r
+               {4F834988-426E-2C51-1497-3EE357D441F4}.release|Win32.Build.0 = release|Win32\r
+               {4F834988-426E-2C51-1497-3EE357D441F4}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4F834988-426E-2C51-1497-3EE357D441F4}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8}.debug|Win32.ActiveCfg = debug|Win32\r
+               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8}.debug|Win32.Build.0 = debug|Win32\r
+               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8}.release|Win32.ActiveCfg = release|Win32\r
+               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8}.release|Win32.Build.0 = release|Win32\r
+               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {50404CB7-11C8-7829-357D-388918FE2ABE}.debug|Win32.ActiveCfg = debug|Win32\r
+               {50404CB7-11C8-7829-357D-388918FE2ABE}.debug|Win32.Build.0 = debug|Win32\r
+               {50404CB7-11C8-7829-357D-388918FE2ABE}.release|Win32.ActiveCfg = release|Win32\r
+               {50404CB7-11C8-7829-357D-388918FE2ABE}.release|Win32.Build.0 = release|Win32\r
+               {50404CB7-11C8-7829-357D-388918FE2ABE}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {50404CB7-11C8-7829-357D-388918FE2ABE}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {509F0E4F-7974-1E15-45EF-755D79935F23}.debug|Win32.ActiveCfg = debug|Win32\r
+               {509F0E4F-7974-1E15-45EF-755D79935F23}.debug|Win32.Build.0 = debug|Win32\r
+               {509F0E4F-7974-1E15-45EF-755D79935F23}.release|Win32.ActiveCfg = release|Win32\r
+               {509F0E4F-7974-1E15-45EF-755D79935F23}.release|Win32.Build.0 = release|Win32\r
+               {509F0E4F-7974-1E15-45EF-755D79935F23}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {509F0E4F-7974-1E15-45EF-755D79935F23}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}.debug|Win32.ActiveCfg = debug|Win32\r
+               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}.debug|Win32.Build.0 = debug|Win32\r
+               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}.release|Win32.ActiveCfg = release|Win32\r
+               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}.release|Win32.Build.0 = release|Win32\r
+               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {51466B98-6055-57F2-4CCA-03A465A217F8}.debug|Win32.ActiveCfg = debug|Win32\r
+               {51466B98-6055-57F2-4CCA-03A465A217F8}.debug|Win32.Build.0 = debug|Win32\r
+               {51466B98-6055-57F2-4CCA-03A465A217F8}.release|Win32.ActiveCfg = release|Win32\r
+               {51466B98-6055-57F2-4CCA-03A465A217F8}.release|Win32.Build.0 = release|Win32\r
+               {51466B98-6055-57F2-4CCA-03A465A217F8}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {51466B98-6055-57F2-4CCA-03A465A217F8}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {519B2F3A-76AA-63E0-645D-127321BE6EAB}.debug|Win32.ActiveCfg = debug|Win32\r
+               {519B2F3A-76AA-63E0-645D-127321BE6EAB}.debug|Win32.Build.0 = debug|Win32\r
+               {519B2F3A-76AA-63E0-645D-127321BE6EAB}.release|Win32.ActiveCfg = release|Win32\r
+               {519B2F3A-76AA-63E0-645D-127321BE6EAB}.release|Win32.Build.0 = release|Win32\r
+               {519B2F3A-76AA-63E0-645D-127321BE6EAB}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {519B2F3A-76AA-63E0-645D-127321BE6EAB}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {52C745F0-0A99-2BA1-5F2A-159E004752AE}.debug|Win32.ActiveCfg = debug|Win32\r
+               {52C745F0-0A99-2BA1-5F2A-159E004752AE}.debug|Win32.Build.0 = debug|Win32\r
+               {52C745F0-0A99-2BA1-5F2A-159E004752AE}.release|Win32.ActiveCfg = release|Win32\r
+               {52C745F0-0A99-2BA1-5F2A-159E004752AE}.release|Win32.Build.0 = release|Win32\r
+               {52C745F0-0A99-2BA1-5F2A-159E004752AE}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {52C745F0-0A99-2BA1-5F2A-159E004752AE}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {53293184-380F-2F8D-17E8-61C86D057BA4}.debug|Win32.ActiveCfg = debug|Win32\r
+               {53293184-380F-2F8D-17E8-61C86D057BA4}.debug|Win32.Build.0 = debug|Win32\r
+               {53293184-380F-2F8D-17E8-61C86D057BA4}.release|Win32.ActiveCfg = release|Win32\r
+               {53293184-380F-2F8D-17E8-61C86D057BA4}.release|Win32.Build.0 = release|Win32\r
+               {53293184-380F-2F8D-17E8-61C86D057BA4}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {53293184-380F-2F8D-17E8-61C86D057BA4}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {534D7F5C-37A8-3985-531C-0A8272C27DDC}.debug|Win32.ActiveCfg = debug|Win32\r
+               {534D7F5C-37A8-3985-531C-0A8272C27DDC}.debug|Win32.Build.0 = debug|Win32\r
+               {534D7F5C-37A8-3985-531C-0A8272C27DDC}.release|Win32.ActiveCfg = release|Win32\r
+               {534D7F5C-37A8-3985-531C-0A8272C27DDC}.release|Win32.Build.0 = release|Win32\r
+               {534D7F5C-37A8-3985-531C-0A8272C27DDC}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {534D7F5C-37A8-3985-531C-0A8272C27DDC}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C}.debug|Win32.ActiveCfg = debug|Win32\r
+               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C}.debug|Win32.Build.0 = debug|Win32\r
+               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C}.release|Win32.ActiveCfg = release|Win32\r
+               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C}.release|Win32.Build.0 = release|Win32\r
+               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {54327A61-4C64-6D55-5780-3C3945D15D6E}.debug|Win32.ActiveCfg = debug|Win32\r
+               {54327A61-4C64-6D55-5780-3C3945D15D6E}.debug|Win32.Build.0 = debug|Win32\r
+               {54327A61-4C64-6D55-5780-3C3945D15D6E}.release|Win32.ActiveCfg = release|Win32\r
+               {54327A61-4C64-6D55-5780-3C3945D15D6E}.release|Win32.Build.0 = release|Win32\r
+               {54327A61-4C64-6D55-5780-3C3945D15D6E}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {54327A61-4C64-6D55-5780-3C3945D15D6E}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {54903BF9-3411-1341-67F3-790C266711D3}.debug|Win32.ActiveCfg = debug|Win32\r
+               {54903BF9-3411-1341-67F3-790C266711D3}.debug|Win32.Build.0 = debug|Win32\r
+               {54903BF9-3411-1341-67F3-790C266711D3}.release|Win32.ActiveCfg = release|Win32\r
+               {54903BF9-3411-1341-67F3-790C266711D3}.release|Win32.Build.0 = release|Win32\r
+               {54903BF9-3411-1341-67F3-790C266711D3}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {54903BF9-3411-1341-67F3-790C266711D3}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65}.debug|Win32.ActiveCfg = debug|Win32\r
+               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65}.debug|Win32.Build.0 = debug|Win32\r
+               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65}.release|Win32.ActiveCfg = release|Win32\r
+               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65}.release|Win32.Build.0 = release|Win32\r
+               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {55304548-0F62-1120-1E39-68A67A256187}.debug|Win32.ActiveCfg = debug|Win32\r
+               {55304548-0F62-1120-1E39-68A67A256187}.debug|Win32.Build.0 = debug|Win32\r
+               {55304548-0F62-1120-1E39-68A67A256187}.release|Win32.ActiveCfg = release|Win32\r
+               {55304548-0F62-1120-1E39-68A67A256187}.release|Win32.Build.0 = release|Win32\r
+               {55304548-0F62-1120-1E39-68A67A256187}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {55304548-0F62-1120-1E39-68A67A256187}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {557F34F2-1A26-610F-6537-58C71DEF4F18}.debug|Win32.ActiveCfg = debug|Win32\r
+               {557F34F2-1A26-610F-6537-58C71DEF4F18}.debug|Win32.Build.0 = debug|Win32\r
+               {557F34F2-1A26-610F-6537-58C71DEF4F18}.release|Win32.ActiveCfg = release|Win32\r
+               {557F34F2-1A26-610F-6537-58C71DEF4F18}.release|Win32.Build.0 = release|Win32\r
+               {557F34F2-1A26-610F-6537-58C71DEF4F18}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {557F34F2-1A26-610F-6537-58C71DEF4F18}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {55BD52AE-4801-5B02-62C0-7C3704F075D6}.debug|Win32.ActiveCfg = debug|Win32\r
+               {55BD52AE-4801-5B02-62C0-7C3704F075D6}.debug|Win32.Build.0 = debug|Win32\r
+               {55BD52AE-4801-5B02-62C0-7C3704F075D6}.release|Win32.ActiveCfg = release|Win32\r
+               {55BD52AE-4801-5B02-62C0-7C3704F075D6}.release|Win32.Build.0 = release|Win32\r
+               {55BD52AE-4801-5B02-62C0-7C3704F075D6}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {55BD52AE-4801-5B02-62C0-7C3704F075D6}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {56186A49-69E6-22EF-4AE8-29B4595D35AA}.debug|Win32.ActiveCfg = debug|Win32\r
+               {56186A49-69E6-22EF-4AE8-29B4595D35AA}.debug|Win32.Build.0 = debug|Win32\r
+               {56186A49-69E6-22EF-4AE8-29B4595D35AA}.release|Win32.ActiveCfg = release|Win32\r
+               {56186A49-69E6-22EF-4AE8-29B4595D35AA}.release|Win32.Build.0 = release|Win32\r
+               {56186A49-69E6-22EF-4AE8-29B4595D35AA}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {56186A49-69E6-22EF-4AE8-29B4595D35AA}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {567401E5-0BCB-6ADC-3310-57302DC9757F}.debug|Win32.ActiveCfg = debug|Win32\r
+               {567401E5-0BCB-6ADC-3310-57302DC9757F}.debug|Win32.Build.0 = debug|Win32\r
+               {567401E5-0BCB-6ADC-3310-57302DC9757F}.release|Win32.ActiveCfg = release|Win32\r
+               {567401E5-0BCB-6ADC-3310-57302DC9757F}.release|Win32.Build.0 = release|Win32\r
+               {567401E5-0BCB-6ADC-3310-57302DC9757F}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {567401E5-0BCB-6ADC-3310-57302DC9757F}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {56D2437D-7378-10C8-4382-14030E5E29E4}.debug|Win32.ActiveCfg = debug|Win32\r
+               {56D2437D-7378-10C8-4382-14030E5E29E4}.debug|Win32.Build.0 = debug|Win32\r
+               {56D2437D-7378-10C8-4382-14030E5E29E4}.release|Win32.ActiveCfg = release|Win32\r
+               {56D2437D-7378-10C8-4382-14030E5E29E4}.release|Win32.Build.0 = release|Win32\r
+               {56D2437D-7378-10C8-4382-14030E5E29E4}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {56D2437D-7378-10C8-4382-14030E5E29E4}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {576524DB-37A8-16A9-589E-4642317B2754}.debug|Win32.ActiveCfg = debug|Win32\r
+               {576524DB-37A8-16A9-589E-4642317B2754}.debug|Win32.Build.0 = debug|Win32\r
+               {576524DB-37A8-16A9-589E-4642317B2754}.release|Win32.ActiveCfg = release|Win32\r
+               {576524DB-37A8-16A9-589E-4642317B2754}.release|Win32.Build.0 = release|Win32\r
+               {576524DB-37A8-16A9-589E-4642317B2754}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {576524DB-37A8-16A9-589E-4642317B2754}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {57BA687D-4DFC-2297-7031-55116D967E07}.debug|Win32.ActiveCfg = debug|Win32\r
+               {57BA687D-4DFC-2297-7031-55116D967E07}.debug|Win32.Build.0 = debug|Win32\r
+               {57BA687D-4DFC-2297-7031-55116D967E07}.release|Win32.ActiveCfg = release|Win32\r
+               {57BA687D-4DFC-2297-7031-55116D967E07}.release|Win32.Build.0 = release|Win32\r
+               {57BA687D-4DFC-2297-7031-55116D967E07}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {57BA687D-4DFC-2297-7031-55116D967E07}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {581C5412-7B71-2682-28EE-213B5A5426FD}.debug|Win32.ActiveCfg = debug|Win32\r
+               {581C5412-7B71-2682-28EE-213B5A5426FD}.debug|Win32.Build.0 = debug|Win32\r
+               {581C5412-7B71-2682-28EE-213B5A5426FD}.release|Win32.ActiveCfg = release|Win32\r
+               {581C5412-7B71-2682-28EE-213B5A5426FD}.release|Win32.Build.0 = release|Win32\r
+               {581C5412-7B71-2682-28EE-213B5A5426FD}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {581C5412-7B71-2682-28EE-213B5A5426FD}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3}.debug|Win32.ActiveCfg = debug|Win32\r
+               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3}.debug|Win32.Build.0 = debug|Win32\r
+               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3}.release|Win32.ActiveCfg = release|Win32\r
+               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3}.release|Win32.Build.0 = release|Win32\r
+               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {58C3315A-6252-605F-2FCA-2F8246635FD2}.debug|Win32.ActiveCfg = debug|Win32\r
+               {58C3315A-6252-605F-2FCA-2F8246635FD2}.debug|Win32.Build.0 = debug|Win32\r
+               {58C3315A-6252-605F-2FCA-2F8246635FD2}.release|Win32.ActiveCfg = release|Win32\r
+               {58C3315A-6252-605F-2FCA-2F8246635FD2}.release|Win32.Build.0 = release|Win32\r
+               {58C3315A-6252-605F-2FCA-2F8246635FD2}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {58C3315A-6252-605F-2FCA-2F8246635FD2}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {590A4D0B-6186-7450-2632-00F651DD6442}.debug|Win32.ActiveCfg = debug|Win32\r
+               {590A4D0B-6186-7450-2632-00F651DD6442}.debug|Win32.Build.0 = debug|Win32\r
+               {590A4D0B-6186-7450-2632-00F651DD6442}.release|Win32.ActiveCfg = release|Win32\r
+               {590A4D0B-6186-7450-2632-00F651DD6442}.release|Win32.Build.0 = release|Win32\r
+               {590A4D0B-6186-7450-2632-00F651DD6442}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {590A4D0B-6186-7450-2632-00F651DD6442}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {594F3EC0-1AF1-2A42-7450-4314512E7421}.debug|Win32.ActiveCfg = debug|Win32\r
+               {594F3EC0-1AF1-2A42-7450-4314512E7421}.debug|Win32.Build.0 = debug|Win32\r
+               {594F3EC0-1AF1-2A42-7450-4314512E7421}.release|Win32.ActiveCfg = release|Win32\r
+               {594F3EC0-1AF1-2A42-7450-4314512E7421}.release|Win32.Build.0 = release|Win32\r
+               {594F3EC0-1AF1-2A42-7450-4314512E7421}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {594F3EC0-1AF1-2A42-7450-4314512E7421}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {59A72C5F-770E-142F-342E-613919723F65}.debug|Win32.ActiveCfg = debug|Win32\r
+               {59A72C5F-770E-142F-342E-613919723F65}.debug|Win32.Build.0 = debug|Win32\r
+               {59A72C5F-770E-142F-342E-613919723F65}.release|Win32.ActiveCfg = release|Win32\r
+               {59A72C5F-770E-142F-342E-613919723F65}.release|Win32.Build.0 = release|Win32\r
+               {59A72C5F-770E-142F-342E-613919723F65}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {59A72C5F-770E-142F-342E-613919723F65}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {59EF4810-7642-2820-2A97-32AD24EC43D5}.debug|Win32.ActiveCfg = debug|Win32\r
+               {59EF4810-7642-2820-2A97-32AD24EC43D5}.debug|Win32.Build.0 = debug|Win32\r
+               {59EF4810-7642-2820-2A97-32AD24EC43D5}.release|Win32.ActiveCfg = release|Win32\r
+               {59EF4810-7642-2820-2A97-32AD24EC43D5}.release|Win32.Build.0 = release|Win32\r
+               {59EF4810-7642-2820-2A97-32AD24EC43D5}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {59EF4810-7642-2820-2A97-32AD24EC43D5}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012}.debug|Win32.ActiveCfg = debug|Win32\r
+               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012}.debug|Win32.Build.0 = debug|Win32\r
+               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012}.release|Win32.ActiveCfg = release|Win32\r
+               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012}.release|Win32.Build.0 = release|Win32\r
+               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {13A81B5C-3126-7689-29CB-7EB809060F4C}.debug|Win32.ActiveCfg = debug|Win32\r
+               {13A81B5C-3126-7689-29CB-7EB809060F4C}.debug|Win32.Build.0 = debug|Win32\r
+               {13A81B5C-3126-7689-29CB-7EB809060F4C}.release|Win32.ActiveCfg = release|Win32\r
+               {13A81B5C-3126-7689-29CB-7EB809060F4C}.release|Win32.Build.0 = release|Win32\r
+               {13A81B5C-3126-7689-29CB-7EB809060F4C}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {13A81B5C-3126-7689-29CB-7EB809060F4C}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {38B340E0-373D-22A8-4354-0D386DC50BA2}.debug|Win32.ActiveCfg = debug|Win32\r
+               {38B340E0-373D-22A8-4354-0D386DC50BA2}.debug|Win32.Build.0 = debug|Win32\r
+               {38B340E0-373D-22A8-4354-0D386DC50BA2}.release|Win32.ActiveCfg = release|Win32\r
+               {38B340E0-373D-22A8-4354-0D386DC50BA2}.release|Win32.Build.0 = release|Win32\r
+               {38B340E0-373D-22A8-4354-0D386DC50BA2}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {38B340E0-373D-22A8-4354-0D386DC50BA2}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {3C557EE0-6716-47E4-1E5A-20C676CE50C1}.debug|Win32.ActiveCfg = debug|Win32\r
+               {3C557EE0-6716-47E4-1E5A-20C676CE50C1}.debug|Win32.Build.0 = debug|Win32\r
+               {3C557EE0-6716-47E4-1E5A-20C676CE50C1}.release|Win32.ActiveCfg = release|Win32\r
+               {3C557EE0-6716-47E4-1E5A-20C676CE50C1}.release|Win32.Build.0 = release|Win32\r
+               {3C557EE0-6716-47E4-1E5A-20C676CE50C1}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {3C557EE0-6716-47E4-1E5A-20C676CE50C1}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A}.debug|Win32.ActiveCfg = debug|Win32\r
+               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A}.debug|Win32.Build.0 = debug|Win32\r
+               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A}.release|Win32.ActiveCfg = release|Win32\r
+               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A}.release|Win32.Build.0 = release|Win32\r
+               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A}.release-assert|Win32.Build.0 = release-assert|Win32\r
+               {3CB44078-4EC3-6DD0-2ECC-5D9957630526}.debug|Win32.ActiveCfg = debug|Win32\r
+               {3CB44078-4EC3-6DD0-2ECC-5D9957630526}.debug|Win32.Build.0 = debug|Win32\r
+               {3CB44078-4EC3-6DD0-2ECC-5D9957630526}.release|Win32.ActiveCfg = release|Win32\r
+               {3CB44078-4EC3-6DD0-2ECC-5D9957630526}.release|Win32.Build.0 = release|Win32\r
+               {3CB44078-4EC3-6DD0-2ECC-5D9957630526}.release-assert|Win32.ActiveCfg = release-assert|Win32\r
+               {3CB44078-4EC3-6DD0-2ECC-5D9957630526}.release-assert|Win32.Build.0 = release-assert|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+       GlobalSection(NestedProjects) = preSolution\r
+               {58495107-524D-262A-14F9-75054C6228FA} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {67A8721D-4983-18EF-3C00-284306CA5634} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {497D4873-6EE2-5C14-53AC-4D47257B5B42} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {49010CFB-132B-682E-589B-0668577A0DC6} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4B0B4ABC-3047-27C0-0737-1C9C70C2683A} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4B9B021E-2EAE-4FA2-7408-3F8407B6711A} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {41D50804-0184-4ECA-1FDB-0F69302A789A} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {42F476C8-7E53-1E8E-797E-55395E120A5A} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {42C954F7-7328-5896-6DB5-0DD240041F01} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {42751154-5CD4-4CA8-5622-7F0303E8484E} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {47161A3C-4FAA-15AF-77E0-3EFE41441185} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {477E59C9-08B0-5599-0133-29D54652239C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {47F44147-58D6-0D81-2BAF-52077C0307F6} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {486354CD-1D6C-0969-0597-5B8C1962032F} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {48BF6C69-3F51-5156-6DBF-09096DCF4303} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {499D1374-487C-4927-218E-1C12288D3975} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {49F50113-2499-3315-616B-3A3870D104B8} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4A6E128E-3A87-48FB-3433-71C132AA5DA3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4AC25631-50DC-54EA-4BC6-00906EC63456} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4B790568-14A5-64C3-1C16-5B89179F33FE} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4BCB1F0E-6531-12B2-0B5E-5B0147921621} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4C2062B0-7B86-1EA0-22F1-69D003AE6CD3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4C7F2448-6333-448C-3364-26A364432138} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4CDA3BE4-0518-0C79-1B8C-542038B0610D} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4D282B8D-0FDC-5C69-628A-44415C7B4E9E} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4D81192C-6BF8-4656-2267-626724BF19E2} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4E341E67-69FA-7830-4A6D-2E09417024FA} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4E830E10-74BE-4820-116A-1E2A653A128B} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4EE823A1-67FB-2A0B-7272-79AB5E203011} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4F670915-097A-7BF0-15CF-4FE2384A721E} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4FD94697-13D8-55D8-1801-68BD61D261E7} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {50283641-1E9C-25C7-5EFF-58DF059D4F79} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {508023E0-7AB9-0FB5-1EDC-77044DE11ABC} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {50E8636D-33BE-4F9F-282E-61DC52EF2CD3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {51472505-1B6B-758B-38A1-1EAF33846138} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {519F12A4-7788-5F78-787F-3CD57BC82C7C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {51EE024D-024C-2F68-3F7C-2CF61F931A0D} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {524345F0-18A0-3B56-570F-3BC55BAF70C0} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {529E5D8B-3A85-0343-3F37-6941301C3095} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {52F07731-0B12-3132-2E80-68BA600F12B7} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {534864D0-672E-1B1F-6E5D-06DF28535DFA} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {53A37C6C-0913-630C-5685-345C7CC01DCF} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {540C3BF9-4218-22F6-5FD8-1F3301CE2FE6} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {54854D74-5807-38DD-329F-56BC43A708D1} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {54D33D1E-62CB-08CC-799D-46DE67727662} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {552556C4-3357-36BB-68E5-465617655884} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {59BC61B6-54D5-65C4-11C4-584D30474409} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {5A144F55-30F2-4FB1-51A1-7672788B0F4D} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {5D5521C1-3355-7102-73EA-3DD714D62B76} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {5DAA6563-49AA-7CF0-0B7D-4CA650F20228} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {5DF8550D-546E-4CE0-527B-3CC774BD6FBA} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {5E3A1CC5-4811-24D2-784E-6F8E67E60B08} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {5E7E0E7A-017D-5AC4-466C-31AB67371AE8} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {5EC3002E-3AE8-10B5-148A-73C866892AC7} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {5F1843D1-513D-1CA4-2C1D-029722A5017A} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {5F605F82-5071-3095-2286-540B2E1F05EA} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {5FB52324-66C5-3C83-3A19-62DA6A3A5C9C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {5FFC3ED5-65F9-5074-3081-344E75B4610C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {60445A86-652D-6464-26EA-05C2012E657C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {6096742C-35B9-1253-1632-053B3121479F} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {60E80DD2-0645-4042-057B-04B3611529C1} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {61464F6A-6DF2-662E-15ED-418641AA5E26} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {61911518-32EE-581F-34A1-2251594C5726} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {61D930C8-3222-6C0F-2B09-73C564C65B96} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {621E227D-6B8E-2201-7927-35E264186B76} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {62621432-24F9-57F3-4745-780063697B55} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {62A031ED-52D4-51E6-44CE-1B6F4A6A2213} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {62E279A5-4678-29D8-6AA2-4E363D933D61} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {45D8782C-23BC-5A59-47C8-5416580E1D6F} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {46A97746-15C7-5A2D-5A6D-29C5622B419D} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {473504AB-4E66-2410-1EF3-3D566CF655EC} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {47C21211-0705-6DF2-637A-50E777C26A3B} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {482D7B9A-05D3-0BDC-1517-4B1508F970E3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {48BA08FF-3E72-55BE-599E-5EA713C40532} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {490F4CA2-54C7-61AC-7131-6D764FE05BE5} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {497E6028-195D-5D95-4B18-76FB6D3F571E} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4A0D178A-17C4-0577-37E9-19E304335FFE} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4A732D1A-0B02-6761-18F1-75637D197D84} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4ACB1AB9-671E-514F-58CF-1389455D48C8} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4B230858-433B-3B3C-18AC-31AF0DA1140B} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4B717802-4DFF-0B2C-5FAA-21D0316C019D} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4BCD0F9D-6FE4-5319-47D2-4F4D05D94171} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4C631AF8-79DC-36F9-0538-10E2351D3373} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4CB10AA2-04A0-06E9-4C36-010458E82104} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4D007A4C-0F64-56D8-1334-71257CB30E95} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4D446C00-48CF-0CCA-6152-33437C051E75} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4DF8713A-46D1-3EA4-0958-7EE518B5298C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4E4D34DD-5D25-4A92-20EB-0DB454D1003F} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4EBC4863-21BB-467B-7AD2-173972307B78} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4F3803DA-7D72-3A61-75E4-5E18403248F3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4F834988-426E-2C51-1497-3EE357D441F4} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {4FDF6123-6452-743E-7CBF-6C5F2C4101C8} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {50404CB7-11C8-7829-357D-388918FE2ABE} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {509F0E4F-7974-1E15-45EF-755D79935F23} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {50EE7DF9-0439-6E05-0CED-657E1D5E4CB5} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {51466B98-6055-57F2-4CCA-03A465A217F8} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {519B2F3A-76AA-63E0-645D-127321BE6EAB} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {52C745F0-0A99-2BA1-5F2A-159E004752AE} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {53293184-380F-2F8D-17E8-61C86D057BA4} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {534D7F5C-37A8-3985-531C-0A8272C27DDC} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {53E060BB-7BD8-3F66-6838-3CC115DE7B4C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {54327A61-4C64-6D55-5780-3C3945D15D6E} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {54903BF9-3411-1341-67F3-790C266711D3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {54DF2BA2-3ED6-6331-2EF0-692E4A317F65} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {55304548-0F62-1120-1E39-68A67A256187} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {557F34F2-1A26-610F-6537-58C71DEF4F18} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {55BD52AE-4801-5B02-62C0-7C3704F075D6} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {56186A49-69E6-22EF-4AE8-29B4595D35AA} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {567401E5-0BCB-6ADC-3310-57302DC9757F} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {56D2437D-7378-10C8-4382-14030E5E29E4} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {576524DB-37A8-16A9-589E-4642317B2754} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {57BA687D-4DFC-2297-7031-55116D967E07} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {581C5412-7B71-2682-28EE-213B5A5426FD} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {587E3FA6-28E6-2A6E-61AC-6D6547114FF3} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {58C3315A-6252-605F-2FCA-2F8246635FD2} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {590A4D0B-6186-7450-2632-00F651DD6442} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {594F3EC0-1AF1-2A42-7450-4314512E7421} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {59A72C5F-770E-142F-342E-613919723F65} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {59EF4810-7642-2820-2A97-32AD24EC43D5} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {6BC86B3D-16DE-2AEA-2B2B-31AA13143012} = {8A2F8A70-0694-40C4-B46F-FEFC0A59D8AF}\r
+               {13A81B5C-3126-7689-29CB-7EB809060F4C} = {18042314-9FA1-4A9A-9F77-FE933CF94D50}\r
+               {38B340E0-373D-22A8-4354-0D386DC50BA2} = {C8EF795B-16A1-4410-B1B3-5CF3F6832317}\r
+               {3C557EE0-6716-47E4-1E5A-20C676CE50C1} = {C8EF795B-16A1-4410-B1B3-5CF3F6832317}\r
+               {3C8020B1-7240-0DDB-2A23-682D14DC3C1A} = {C8EF795B-16A1-4410-B1B3-5CF3F6832317}\r
+               {3CB44078-4EC3-6DD0-2ECC-5D9957630526} = {C8EF795B-16A1-4410-B1B3-5CF3F6832317}\r
+               {1D4E71E5-F63F-4611-9F38-5177D49CEA91} = {C1F6B1DF-3D6E-4AA2-81D2-A9CDB3C6E0CF}\r
+               {461FE07F-A59B-421D-AAD6-48B41368EDE2} = {C1F6B1DF-3D6E-4AA2-81D2-A9CDB3C6E0CF}\r
+               {3492B32A-CA32-4B64-B0D3-FF6AF6B83DEE} = {C1F6B1DF-3D6E-4AA2-81D2-A9CDB3C6E0CF}\r
+       EndGlobalSection\r
+EndGlobal\r
index a2511d25a31b46ad8c8a88049d30db15aafef438..c7f219c72a020944f1497ea306c2c14899e92ba1 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\access_m_fail1.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\access_m_fail1.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4B600E5F-469B-33AF-1EC9-2B6B2CDE3EED}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 9a5da49ffe3b8d828a82bb58f5d042070ac4a080..d1a3fbaa688c8b87ea45dda06275e36a11cd7393 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\access_m_fail1.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4F5525C6-7CD8-68E3-0FB2-5E655D1E43EC}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{3C450BE1-7648-61D2-3BA4-42C971BA5139}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\access_m_fail1.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4F5525C6-7CD8-68E3-0FB2-5E655D1E43EC}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{3C450BE1-7648-61D2-3BA4-42C971BA5139}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 8da6e115b9a39893636e6070604ee5095828ddd1..017ec01eb33598b550e28f961660687056afe69e 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\access_m_fail2.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4B9B021E-2EAE-4FA2-7408-3F8407B6711A}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\access_m_fail2.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4B9B021E-2EAE-4FA2-7408-3F8407B6711A}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 3e3a6e68f3eab2159e23e86820f3e125147f56d5..93df79b47c93e93bd973fca18f3118550cb75aaf 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\access_m_fail2.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4F6577B4-59C1-3EDF-5926-2B1619E80ABF}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{7EC313CC-7364-62AF-6C0B-05F5232B23DC}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\access_m_fail2.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4F6577B4-59C1-3EDF-5926-2B1619E80ABF}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{7EC313CC-7364-62AF-6C0B-05F5232B23DC}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 5166e80cb7f7d3976a137eb2791fdc254515b604..04be2ca4f65cdda0a2b897d65e7a76d0b982e21d 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\access_m_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4B0B4ABC-3047-27C0-0737-1C9C70C2683A}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\access_m_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4B0B4ABC-3047-27C0-0737-1C9C70C2683A}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 5da2ae693fc6a7192e836b3ddda0aebac4773392..7ca08717f53c486e28b9297fa3d26c6826de6f3e 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\access_m_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4F721FA6-70E1-36DD-7A51-68714A8A5D02}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{00C133BC-7115-635F-45F6-087E7DEB32C4}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\access_m_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4F721FA6-70E1-36DD-7A51-68714A8A5D02}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{00C133BC-7115-635F-45F6-087E7DEB32C4}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 38f1ab4fb8913d441515e5f8a3c1a4ba076b2d0a..1000cac7b203e9876ff19ba88d116be3be427fb8 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\access_q_fail.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\access_q_fail.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{3E2F2008-0BE3-4B8E-1C8B-6C841AF93EEB}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index ff998fd405eb139ae524111f195bc661185ef35f..2168341bcbada79502c2a663c429ade455e4c785 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\access_q_fail.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4F487DD4-65B7-70E6-6E87-210A2C7C71A9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{3A466BF1-7897-6122-61B9-404016F94251}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\access_q_fail.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4F487DD4-65B7-70E6-6E87-210A2C7C71A9}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{3A466BF1-7897-6122-61B9-404016F94251}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index d0d8c1b299b1ec2d697ffa8a7cf06483e47bde80..a7afad5a3a07400c4b34da91961b2b203ed34c63 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\access_q_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{41D50804-0184-4ECA-1FDB-0F69302A789A}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\access_q_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{41D50804-0184-4ECA-1FDB-0F69302A789A}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index e304b36667e52da0e525b62dcf11d54d6a562ef4..8f6e05ce57e7ef23f9e2e09a427a29f28bdc5a3b 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\access_q_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4F372BE6-08CE-1AE9-2512-54586FB22AD5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{77C86405-7B7B-6046-3152-7D1465886FAE}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\access_q_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4F372BE6-08CE-1AE9-2512-54586FB22AD5}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{77C86405-7B7B-6046-3152-7D1465886FAE}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 182bdd7b34b7466c75dc36c877a456ce2b19269b..eafd2a0406a60451ac8fe948be99e7b5db67fa43 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\access_v_fail1.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{42C954F7-7328-5896-6DB5-0DD240041F01}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\access_v_fail1.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{42C954F7-7328-5896-6DB5-0DD240041F01}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 2c34039dee87c2e4403323f43b467254d9439dfc..682812e68824be72e22429459f4e4b609f6ba469 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\access_v_fail1.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4F1A3207-14C5-4CEF-3A73-4A4B024611BF}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{334C3C2A-00AE-5EB9-2700-375F59570E23}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\access_v_fail1.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4F1A3207-14C5-4CEF-3A73-4A4B024611BF}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{334C3C2A-00AE-5EB9-2700-375F59570E23}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 19206dbab1c5daaeeccc9bc4dbbf479a93e3f6a8..9c7b671dfe06043f6c4348f6fe0a5709098efc8c 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\access_v_fail2.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{42F476C8-7E53-1E8E-797E-55395E120A5A}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\access_v_fail2.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{42F476C8-7E53-1E8E-797E-55395E120A5A}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 110c36ed309a7f59e40f66111584adc3633fd11d..39256a549fbfb2e200415f7e67fdb9e6bd3fd228 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\access_v_fail2.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4F2A03F5-71AD-22EC-03E8-16FD3F105892}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{75CA4416-7DCA-5F96-5767-7A8B0AC860C6}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\access_v_fail2.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4F2A03F5-71AD-22EC-03E8-16FD3F105892}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{75CA4416-7DCA-5F96-5767-7A8B0AC860C6}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 064708d59ad3e004f1cbde09f3d849864020e9ca..4e750ccfb9d75adf488ad0d02fee54d30e86845f 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\access_v_fail3.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-<ProjectGuid>{431844A1-7DED-2886-34B2-7DF363CF0C92}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;_DEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\vcxproj.bat msvc-12.0 $(SolutionName) $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-FC -GL -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\vcxproj.bat msvc-12.0 $(SolutionName) $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\vcxproj.bat msvc-12.0 $(SolutionName) $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\access_v_fail3.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+<ProjectGuid>{431844A1-7DED-2886-34B2-7DF363CF0C92}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;_DEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\vcxproj.bat msvc-12.0 $(SolutionName) $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-FC -GL -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\vcxproj.bat msvc-12.0 $(SolutionName) $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\vcxproj.bat msvc-12.0 $(SolutionName) $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>\r
index 24e8630a9c1e40bfec53d3d0a6b035675b215362..46457b650dced7a06ec6e959841358342cc5fa02 100644 (file)
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\access_v_fail3.cpp">
-        <Filter>lib\qvm\libs\qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="lib">
-      <UniqueIdentifier>{5D474062-611F-5B6D-66E9-657116530FF3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\qvm">
-      <UniqueIdentifier>{09310A4C-22E8-1DF9-5409-1A4233C77258}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\qvm\libs">
-      <UniqueIdentifier>{66374915-3D7A-4000-353D-4B4D23341AE9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\qvm\libs\qvm">
-      <UniqueIdentifier>{0C7D68D2-4F11-3F4D-07A1-1DBA1F9E5915}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\qvm\libs\qvm\test">
-      <UniqueIdentifier>{0C3A3D60-4E9C-5F91-06A7-4BB63501596B}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\access_v_fail3.cpp">\r
+        <Filter>lib\qvm\libs\qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="lib">\r
+      <UniqueIdentifier>{5D474062-611F-5B6D-66E9-657116530FF3}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="lib\qvm">\r
+      <UniqueIdentifier>{09310A4C-22E8-1DF9-5409-1A4233C77258}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="lib\qvm\libs">\r
+      <UniqueIdentifier>{66374915-3D7A-4000-353D-4B4D23341AE9}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="lib\qvm\libs\qvm">\r
+      <UniqueIdentifier>{0C7D68D2-4F11-3F4D-07A1-1DBA1F9E5915}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="lib\qvm\libs\qvm\test">\r
+      <UniqueIdentifier>{0C3A3D60-4E9C-5F91-06A7-4BB63501596B}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index be0597c113738656b74d9a2878d4af46e4ba91d2..72f14cbd34991980f05777c6ce9b97ee6d729250 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\access_v_fail4.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-<ProjectGuid>{433C1279-7D86-327E-6FE7-26AD698C0ECA}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;_DEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\vcxproj.bat msvc-12.0 $(SolutionName) $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-FC -GL -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\vcxproj.bat msvc-12.0 $(SolutionName) $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\vcxproj.bat msvc-12.0 $(SolutionName) $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\access_v_fail4.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+<ProjectGuid>{433C1279-7D86-327E-6FE7-26AD698C0ECA}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;_DEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\vcxproj.bat msvc-12.0 $(SolutionName) $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-FC -GL -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\vcxproj.bat msvc-12.0 $(SolutionName) $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\bld.bat msvc-12.0 $(Configuration) $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(ProjectDir)..\..\test &amp;&amp; $(SolutionDir)..\..\..\..\..\munch\ide\vcxproj.bat msvc-12.0 $(SolutionName) $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>\r
index c078b115ed0ee7836ca6513555c2630efac6dd65..a5528aa3e6d10452fd39548d5934441dc3bc5b44 100644 (file)
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\access_v_fail4.cpp">
-        <Filter>lib\qvm\libs\qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="lib">
-      <UniqueIdentifier>{5D3A1871-49FE-636F-45BF-281665B13DB0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\qvm">
-      <UniqueIdentifier>{07326A5C-2538-1D48-7A1E-17B959076370}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\qvm\libs">
-      <UniqueIdentifier>{432F2930-20DF-506D-02DF-596A38982D4F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\qvm\libs\qvm">
-      <UniqueIdentifier>{28513C07-021F-3DDE-6B7D-5F3670BB0ED2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\qvm\libs\qvm\test">
-      <UniqueIdentifier>{328E2B83-3994-7442-6688-75F16D754C5F}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\access_v_fail4.cpp">\r
+        <Filter>lib\qvm\libs\qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="lib">\r
+      <UniqueIdentifier>{5D3A1871-49FE-636F-45BF-281665B13DB0}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="lib\qvm">\r
+      <UniqueIdentifier>{07326A5C-2538-1D48-7A1E-17B959076370}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="lib\qvm\libs">\r
+      <UniqueIdentifier>{432F2930-20DF-506D-02DF-596A38982D4F}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="lib\qvm\libs\qvm">\r
+      <UniqueIdentifier>{28513C07-021F-3DDE-6B7D-5F3670BB0ED2}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="lib\qvm\libs\qvm\test">\r
+      <UniqueIdentifier>{328E2B83-3994-7442-6688-75F16D754C5F}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 3d17e4c24bb94a505c1ebaab713ed5f40cafb3db..1c392838f41f9b2b2f7570e0d1b82b05830e2c4a 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\access_v_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{42751154-5CD4-4CA8-5622-7F0303E8484E}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\access_v_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{42751154-5CD4-4CA8-5622-7F0303E8484E}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 2a3bcfa7382fa87178db11285cf030cfdac0f2f5..5f380a86102cc0928750a241f5bf60b712cd4d04 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\access_v_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4F0D0A15-7DA4-54F2-1949-0CF051A43F7C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{314E1C3A-02FE-5E09-4D15-34D67E967F3B}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\access_v_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4F0D0A15-7DA4-54F2-1949-0CF051A43F7C}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{314E1C3A-02FE-5E09-4D15-34D67E967F3B}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 3cf761daceec01aeda412add04b05532c55ce513..f033a088275da6e29c5ac81a78362046b41ae85a 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{58495107-524D-262A-14F9-75054C6228FA}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>
-    </NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>
-    </NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>
-    </NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{58495107-524D-262A-14F9-75054C6228FA}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>\r
+    </NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>\r
+    </NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>\r
+    </NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index d05f65a0450049da3a3e43cb9f2323ef134e87ab..667c03816b061e334d91e16095c2709f76a65198 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\assign_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{47161A3C-4FAA-15AF-77E0-3EFE41441185}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\assign_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{47161A3C-4FAA-15AF-77E0-3EFE41441185}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 150a581ff69749a772d763ecd7446d0eea6ee2b9..bf7f564bca655f5618e9e15ecb4570e76d047ba5 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\assign_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4EFD3827-20BB-7EF5-4FD4-403F14DA78A8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{6ED0144F-05E1-5D2D-1CAF-71AA4D252C99}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\assign_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4EFD3827-20BB-7EF5-4FD4-403F14DA78A8}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{6ED0144F-05E1-5D2D-1CAF-71AA4D252C99}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 51c93a88ef384ae8a2c0ba1b433b0fafe32cb769..a9bf5414a1ee4634246878d149e7fa69551ab144 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\cmp_mm_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4EE823A1-67FB-2A0B-7272-79AB5E203011}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\cmp_mm_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4EE823A1-67FB-2A0B-7272-79AB5E203011}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>\r
index 6297298e04861430c3ed2ca3dc010f9cad26e207..b0f001242b6d4efe37ffd74d75411292df6935c9 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\cmp_mm_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{5BED2017-595E-6DA7-3C1E-0BB3153A5443}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{7700572C-65AB-5497-024E-6CA36A613565}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\cmp_mm_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{5BED2017-595E-6DA7-3C1E-0BB3153A5443}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{7700572C-65AB-5497-024E-6CA36A613565}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 8b31166b9cefc71d6faf9f7a9521e72d436e783f..2638bae2149a28210ff342fd40c5de3b18b196bd 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\cmp_qq_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{59BC61B6-54D5-65C4-11C4-584D30474409}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\cmp_qq_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{59BC61B6-54D5-65C4-11C4-584D30474409}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 0233c66e1693bb2bcb1362f10c91ab6479fa794e..a84a7263d72a5e6ae39b30373508d1bc10e1e04b 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\cmp_qq_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4CA40ABC-78DB-6F74-5A3A-39E957C730A3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{131B573B-7030-3D84-745D-7CFE7E887ED8}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\cmp_qq_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4CA40ABC-78DB-6F74-5A3A-39E957C730A3}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{131B573B-7030-3D84-745D-7CFE7E887ED8}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index d114acad40f73c4f53c4d07b73b9ec54e48b41c9..acc3f747010ca5fa9767fcd0d40836113a45042f 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\cmp_vv_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{47F44147-58D6-0D81-2BAF-52077C0307F6}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\cmp_vv_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{47F44147-58D6-0D81-2BAF-52077C0307F6}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 6056ba5e0a449bd34c0b91073ec9bf027a19019f..7490edcf9b8cc60d88e24d0551f2b59ab93a4da4 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\cmp_vv_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4EDF3E47-2CB1-30FC-6535-3632276E5F92}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{2A546C73-0B14-5BA1-125D-2BF540F44B0E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\cmp_vv_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4EDF3E47-2CB1-30FC-6535-3632276E5F92}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{2A546C73-0B14-5BA1-125D-2BF540F44B0E}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 0cf69ab3a8f649a638cf98e54e027a99aa0275b4..e114ad7293c2bda12e65cfdbfadfbab81399c607 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\col_mat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4CB10AA2-04A0-06E9-4C36-010458E82104}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\col_mat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4CB10AA2-04A0-06E9-4C36-010458E82104}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index ab6c194d95b2d4745dbd3e9d76e462ce462cae95..8e76dab2170a71aed6cd995a962e6794a77753fb 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\col_mat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4A6C012E-0ACE-0BEB-778A-4CF614487645}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{3C6329FF-54B8-1F94-2CD9-0EAA12CB765C}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\col_mat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4A6C012E-0ACE-0BEB-778A-4CF614487645}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{3C6329FF-54B8-1F94-2CD9-0EAA12CB765C}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 06f79fba7a04a0eea2a27643d07b250ddc19c9a9..986d2abde433c2b96ff48abb904311e90e2269c2 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\col_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4C631AF8-79DC-36F9-0538-10E2351D3373}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\col_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4C631AF8-79DC-36F9-0538-10E2351D3373}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index fbc582062a23bd21095ee2d66de8c721f0f305ca..9219be908864a78ee97dff6179a98f69c4814cc5 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\col_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4A79291F-21EE-03E8-18B5-0A5044EA4887}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{3E6149EF-5268-2045-06C5-11336D8C0544}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\col_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4A79291F-21EE-03E8-18B5-0A5044EA4887}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{3E6149EF-5268-2045-06C5-11336D8C0544}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 4f183bb1822eaafadef79877e69eabffa05ea422..2fd391e11459195c0a2c052006ece093c975ce71 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\conjugate_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5A144F55-30F2-4FB1-51A1-7672788B0F4D}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\conjugate_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5A144F55-30F2-4FB1-51A1-7672788B0F4D}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 9d34bc6317a78c7fb10dc8d3a21214ed4d69233d..c9fe2de9dfd73618a4747b0504cfdcccedfa99ba 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\conjugate_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4C9338CE-1BF3-1977-10C6-6D371AFC69CF}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{509D4F4F-7313-3CA8-43F7-39D34D172C35}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\conjugate_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4C9338CE-1BF3-1977-10C6-6D371AFC69CF}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{509D4F4F-7313-3CA8-43F7-39D34D172C35}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index fa2a0c25508cc741a5e1d0af5f2e13becd612058..c672e9318fcbd482a7f1cfd9965740dbb07d2b74 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\convert_to_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{45D8782C-23BC-5A59-47C8-5416580E1D6F}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\convert_to_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{45D8782C-23BC-5A59-47C8-5416580E1D6F}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 4dcdf2ddfeb2ad137f08994f6d9011fa7342461e..72548b08cc2a4556b83a8b2866d340ff043225d5 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\convert_to_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4B4D5236-59C1-61BC-53A4-6F565B2F6147}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{1EC630E6-2CDA-2B74-7BF8-7A6A70473784}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\convert_to_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4B4D5236-59C1-61BC-53A4-6F565B2F6147}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{1EC630E6-2CDA-2B74-7BF8-7A6A70473784}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index ba458d0b830dc0adc8aa0b40bd8b1a244b2bc438..ed178607d500ae817ab6db326142aa4a918dbaf3 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\cross_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{486354CD-1D6C-0969-0597-5B8C1962032F}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\cross_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{486354CD-1D6C-0969-0597-5B8C1962032F}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 9d60238c0b51dda48902ae5dfae2b2ee9cf7d54b..1b05848cffd050e349f8fe9bc90799abedd45722 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\cross_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4ED21656-1591-38FE-440B-78D776CC0D4F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{28554C83-0D64-5AF0-3871-296C66333C25}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\cross_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4ED21656-1591-38FE-440B-78D776CC0D4F}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{28554C83-0D64-5AF0-3871-296C66333C25}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 325ff427323a4f356a768b3ff4a87e6624c041db..9ca6f844a36ef7f0160639094d39266d94c58652 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\deduce_matrix_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{587E3FA6-28E6-2A6E-61AC-6D6547114FF3}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\deduce_matrix_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{587E3FA6-28E6-2A6E-61AC-6D6547114FF3}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 68f73eb671ca53e21c9a4319f6e6d44460af5d82..91df1bcf2fe7531a95832d345b9c770a37071129 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\deduce_matrix_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{48851145-6D4C-5651-0423-5F7B00BD1E09}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{3220245D-2ACE-05F1-5755-702F1E430B0D}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\deduce_matrix_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{48851145-6D4C-5651-0423-5F7B00BD1E09}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{3220245D-2ACE-05F1-5755-702F1E430B0D}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index a152e7b11b0ea4589a727c968e3e41c2071b2453..8a723addea0518778fb8359fa79b47d240688533 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\deduce_scalar_fail1.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{576524DB-37A8-16A9-589E-4642317B2754}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\deduce_scalar_fail1.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{576524DB-37A8-16A9-589E-4642317B2754}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 815b33968268949c79a4ff5ccdedb6548049d500..3b39b242ded9923874f803453b1937fc463ecded 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\deduce_scalar_fail1.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{48B35D13-3E3E-7A48-3837-36392AF37DF3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{391A5424-22B7-085A-120D-79105BE53F3A}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\deduce_scalar_fail1.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{48B35D13-3E3E-7A48-3837-36392AF37DF3}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{391A5424-22B7-085A-120D-79105BE53F3A}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index b78fc713018415ef6cf64b4e9df0009813d7b79c..68381169151850b10b4620e161e8a837f36f5390 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\deduce_scalar_fail2.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{57BA687D-4DFC-2297-7031-55116D967E07}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\deduce_scalar_fail2.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{57BA687D-4DFC-2297-7031-55116D967E07}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 482df1632c0d85a2761f396e95c8372af97fca2e..fe03c335be455b07d2c96e2747e6f0fddebc3b2c 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\deduce_scalar_fail2.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{48A63521-271E-024A-170D-78DE7A512BB0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{371B3434-2507-07AA-3821-768601253051}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\deduce_scalar_fail2.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{48A63521-271E-024A-170D-78DE7A512BB0}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{371B3434-2507-07AA-3821-768601253051}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index ea6d8660815ff1d7bba21304b75831d585d5931a..eb7b4fa1040cc8c36c51680a1ca84c2ac251c63c 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\deduce_scalar_fail3.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{581C5412-7B71-2682-28EE-213B5A5426FD}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\deduce_scalar_fail3.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{581C5412-7B71-2682-28EE-213B5A5426FD}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 038d6b3ef40a6e01e227b204d55cb8ce6d88b561..57f16bea253a0d652858f905053180bb840b521c 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\deduce_scalar_fail3.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{48956333-4A35-2C4E-4D98-2C2C3D8764DC}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{749E2C49-27EA-06CE-07BB-335B4FB45DAF}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\deduce_scalar_fail3.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{48956333-4A35-2C4E-4D98-2C2C3D8764DC}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{749E2C49-27EA-06CE-07BB-335B4FB45DAF}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 17e6934d698b668f64badbd467d63a6e62a04740..3bedacf8dd8572a5920b53cd6c8c8a2a5760e73f 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\deduce_scalar_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{56D2437D-7378-10C8-4382-14030E5E29E4}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\deduce_scalar_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{56D2437D-7378-10C8-4382-14030E5E29E4}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index f1be449958f704a4a497c75de5dc907b0712d7a3..22c23145c32651ca09eef1e6a1773c752a74b4b0 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\deduce_scalar_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{48C32F01-1B27-5044-01AC-02EB67BE44C6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{7B985C10-1FD3-0936-4273-3C3B0D5611DC}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\deduce_scalar_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{48C32F01-1B27-5044-01AC-02EB67BE44C6}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{7B985C10-1FD3-0936-4273-3C3B0D5611DC}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 275b9e2df10aee459d75cccb77c7f61d843284b0..91137b2dd78054540f66131235685c5d42eaea8e 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\deduce_vector_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{58C3315A-6252-605F-2FCA-2F8246635FD2}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\deduce_vector_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{58C3315A-6252-605F-2FCA-2F8246635FD2}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index fec1e096ff0406c4c06e946bd0585c3fb585daec..fa4fa58806bb73802dda6fc403f9a99587ac829b 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\deduce_vector_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{48786953-562B-5E54-62F9-2220501B4BC6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{3021046D-2D1D-0541-7D69-6DA643827C24}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\deduce_vector_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{48786953-562B-5E54-62F9-2220501B4BC6}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{3021046D-2D1D-0541-7D69-6DA643827C24}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index b8d0dc9fc11b61548446c2c4ede4282f4af3d9fb..3599775bdded6150c7f5e89e6e1915fcdd9d2784 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\del_col_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\del_col_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4DAD2B8D-01D5-4CB4-6AA5-1E1A0113308C}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index c483e721bd30e85ed0b3e8b007d6c23108cbaf17..fe9bd0e4d3dfb055a67c41de4a40dc89f63d0d63 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\del_col_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4A3E3560-39DB-67F5-4376-76376A12165A}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{35687A38-5CCE-1D2C-7221-05C95529422F}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\del_col_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4A3E3560-39DB-67F5-4376-76376A12165A}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{35687A38-5CCE-1D2C-7221-05C95529422F}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index f9f0148997c1894b6ca4ded88f24b4bda69d6144..8ad8c61e1ba6c9c35d3beb9f58d2e8fcdfdbf77d 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\del_row_col_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4E4D34DD-5D25-4A92-20EB-0DB454D1003F}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\del_row_col_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4E4D34DD-5D25-4A92-20EB-0DB454D1003F}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index f5298507d9f993956ede98255a04266ebe88561e..8b8cca0cbb13c62e6959dee53d26700301303ced 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\del_row_col_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4A1D1184-000A-3BFB-308D-5CD4707D08B3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{306C6A60-6295-1B73-1154-7F7272471CEA}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\del_row_col_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4A1D1184-000A-3BFB-308D-5CD4707D08B3}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{306C6A60-6295-1B73-1154-7F7272471CEA}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 06214b423649d90d6e52318e6ba46ec40267b24b..c1cfa39b7fa7fba8f5ce68899ed3c5531c6cae25 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\del_row_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4DF8713A-46D1-3EA4-0958-7EE518B5298C}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\del_row_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4DF8713A-46D1-3EA4-0958-7EE518B5298C}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index ab43f0fe659ae3980d4fabe1c1a686ee00bf6c29..6202c5f3de38de784a52475503427b96fb59348d 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\del_row_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4A2E6372-5CF2-11F8-7A02-29862D484F87}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{72EA724C-5FB2-1C4F-41BA-429D23B86F8C}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\del_row_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4A2E6372-5CF2-11F8-7A02-29862D484F87}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{72EA724C-5FB2-1C4F-41BA-429D23B86F8C}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index ada523025185877b9083915f088a33369ad8f2d6..8d1666981862d3421f2f7cfd7233257cb9c2c06d 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\determinant_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4F670915-097A-7BF0-15CF-4FE2384A721E}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\determinant_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4F670915-097A-7BF0-15CF-4FE2384A721E}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index cb93dd6bb6c6928dfed0e30b87a4ed780830a11e..37827c7b052122ab9b032914e266457c628b8537 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\determinant_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4DB32792-18C2-693B-6A68-330748E47B8F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{7C790DE9-403C-4BCC-7E34-719F19A5742D}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\determinant_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4DB32792-18C2-693B-6A68-330748E47B8F}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{7C790DE9-403C-4BCC-7E34-719F19A5742D}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index a1742fd96957b4c855df5a864656ce4758d8ded1..3b07171b3db19692e289b9d7297ff684ea736946 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\diag_mat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4FDF6123-6452-743E-7CBF-6C5F2C4101C8}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\diag_mat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4FDF6123-6452-743E-7CBF-6C5F2C4101C8}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index e32c8a7a2dfced7f52d3094917c4a57c13db6913..6588c3f6d17d9da61116818ae3ebdc4741e275b3 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\diag_mat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{49E21DC5-17F6-2008-5B4E-48BB15A55686}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{27741AAA-6CFC-185A-7CB0-740859E559D4}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\diag_mat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{49E21DC5-17F6-2008-5B4E-48BB15A55686}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{27741AAA-6CFC-185A-7CB0-740859E559D4}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 3bbbfdf4af0c296c61ae7a5df7e64d7f63c1659e..30ac073598b1fec601fee2fbba132b20f6ecc07b 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\diag_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4F834988-426E-2C51-1497-3EE357D441F4}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\diag_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4F834988-426E-2C51-1497-3EE357D441F4}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 9ea02df5779fb9a45e9605f7de3bc6e510af3be4..abbb7ffd45a8172dd2b21efa72bbe67f479a2795 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\diag_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{49EF45B6-2F17-1805-7C79-0616464728C9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{29723A99-6AAC-190B-569C-769134A568BD}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\diag_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{49EF45B6-2F17-1805-7C79-0616464728C9}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{29723A99-6AAC-190B-569C-769134A568BD}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index d199f5069af73ee2f101c96f0906ae58255d2ad9..57c55dd93bf9618a4a2a6bbb518e11adff865402 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\div_eq_ms_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4FD94697-13D8-55D8-1801-68BD61D261E7}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\div_eq_ms_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4FD94697-13D8-55D8-1801-68BD61D261E7}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 4811d009ac615d6588f3b835359f9bdf93558fc7..a037c2b41b55c4e21c78f646b1f4d6c9b20af56d 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\div_eq_ms_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4DA67FA0-01A1-713D-493E-75AC1842294C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{7A7B6DFA-428B-4B1C-2449-6F163EE46545}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\div_eq_ms_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4DA67FA0-01A1-713D-493E-75AC1842294C}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{7A7B6DFA-428B-4B1C-2449-6F163EE46545}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 63b9f1641077511a3f71f6b4a3d47b591d4e88f7..c2c079f390e78dbeee4023bf4f0882140ef2f999 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\div_eq_qs_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5DAA6563-49AA-7CF0-0B7D-4CA650F20228}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\div_eq_qs_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5DAA6563-49AA-7CF0-0B7D-4CA650F20228}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 13623648cd31d8ffd487d08c4d6d356c0fd10d5a..164587c35da4001f94bfc10599babe0cd976ff7e 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\div_eq_qs_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4C706AF6-1C59-0F7F-5591-447D153F6797}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{0B22577C-796E-3AC4-0CAF-72D913854336}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\div_eq_qs_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4C706AF6-1C59-0F7F-5591-447D153F6797}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{0B22577C-796E-3AC4-0CAF-72D913854336}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index ccbae9c6b0deeb342525c632b5d81ad8edb77dcb..49d0508602729f70091eea82cf826a8b1b236bd1 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\div_eq_vs_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{48BF6C69-3F51-5156-6DBF-09096DCF4303}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\div_eq_vs_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{48BF6C69-3F51-5156-6DBF-09096DCF4303}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index ce48ced16294537e36782a669751f24799aaf019..1c0a43204ce255da6b0d5bdc69e7f439d9107abf 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\div_eq_vs_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4EC24468-38A8-6302-7A96-2C263A01467B}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{65D74498-1047-5A14-080B-664134C36983}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\div_eq_vs_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4EC24468-38A8-6302-7A96-2C263A01467B}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{65D74498-1047-5A14-080B-664134C36983}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 9b40f560293160c7ff7e867deef9847e6ff0c3e1..1c63d323b6ec69902973a76d35de1eeae6f9d43e 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\div_ms_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{50283641-1E9C-25C7-5EFF-58DF059D4F79}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\div_ms_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{50283641-1E9C-25C7-5EFF-58DF059D4F79}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 0c1ee54087f16aaa4cf49e09c406af3ea76670d5..53f5b67bd9aa1b43d92afb1bd20b7f21b7dfac79 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\div_ms_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4D952DB2-24B8-1B41-7FC9-28FB5B786278}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{37FD660E-456F-4A40-73E2-2BEB0D7412A3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\div_ms_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4D952DB2-24B8-1B41-7FC9-28FB5B786278}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{37FD660E-456F-4A40-73E2-2BEB0D7412A3}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index ca60a5808cce693ea0ba13bacaa0ec4a60b70920..68e320f67b9fa5ca9bf241aa2973cb585ea5ef62 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\div_qs_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5DF8550D-546E-4CE0-527B-3CC774BD6FBA}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\div_qs_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5DF8550D-546E-4CE0-527B-3CC774BD6FBA}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 1224529a14721de123bd19c8e5a000408aa91766..40a2d0480dd480496bd1ce779556651bfbfa8ace 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\div_qs_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4C5F1908-3F70-3982-0C1C-77CB587520C4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{48A44F90-7C52-39E7-5C49-2FAE62147094}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\div_qs_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4C5F1908-3F70-3982-0C1C-77CB587520C4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{48A44F90-7C52-39E7-5C49-2FAE62147094}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 5f367ee1fd9b232634f680c8a7296d9bb8e7f67e..b9dbe9e817648a28f25e714cd675e180ae01da5e 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\div_vs_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\div_vs_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{492E7FEF-03E6-4D3F-47A6-128D0B2E3E3C}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 18396b4f2b3d465e1934ecfb7d04e52ff552d342..814e615a990216ad4546967cef1acb4633617ca6 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\div_vs_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4EB51C76-2187-6B04-596B-6ECB09607438}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{63D924A8-1297-5964-2E1F-63B75A025A9B}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\div_vs_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4EB51C76-2187-6B04-596B-6ECB09607438}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{63D924A8-1297-5964-2E1F-63B75A025A9B}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index b9e5a9c29edb44e64639b0b8f206e065de5fbb0b..15690fe083f8f4715213bdff0870d4d489cf868a 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\dot_qq_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5E3A1CC5-4811-24D2-784E-6F8E67E60B08}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\dot_qq_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5E3A1CC5-4811-24D2-784E-6F8E67E60B08}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 839145a5e17c50b03c637cb2b6744c088161d9a1..e0c59cdba135f9596c18a22aa70a1c09d9c430a2 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\dot_qq_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4C527116-284F-4185-6AF2-3A7027D34E81}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{46A52FA1-7EA2-3937-025E-2D24075461AC}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\dot_qq_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4C527116-284F-4185-6AF2-3A7027D34E81}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{46A52FA1-7EA2-3937-025E-2D24075461AC}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 74eac8b6557eb76f9c93e265a7728d2901306b28..369e7dc6857766469c5e4ecd06af110a14d764cd 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\dot_vv_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{499D1374-487C-4927-218E-1C12288D3975}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\dot_vv_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{499D1374-487C-4927-218E-1C12288D3975}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index ac50ff4e37b24b6160036f971b74d8383591f58b..bb89ef2b2777ef62d9bce6b2705551129b266c61 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\dot_vv_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4EA44A88-449E-1508-0FF7-22194C952D65}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{215B1CBC-157B-5888-7DB9-208C289107F8}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\dot_vv_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4EA44A88-449E-1508-0FF7-22194C952D65}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{215B1CBC-157B-5888-7DB9-208C289107F8}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index ad25e3276ec5bebd1e3cfc3260ca26528c489975..5e6e5101e7966a5ae8a5a09e475e3f2661b57a4a 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\eq_mm_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{508023E0-7AB9-0FB5-1EDC-77044DE11ABC}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\eq_mm_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{508023E0-7AB9-0FB5-1EDC-77044DE11ABC}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index a21d280e4fc4e6d0bf87de8059d6a6f7694cd89b..f33d5dc9a4f02313d9d9b4acfce8b29e39ce0fbe 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\eq_mm_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4D855BC4-47CF-4544-3654-5C491EAE1BA5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{757F5E22-4852-4964-437C-68BF5C034000}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\eq_mm_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4D855BC4-47CF-4544-3654-5C491EAE1BA5}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{757F5E22-4852-4964-437C-68BF5C034000}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index b384c57a9e0d7241a7be80e19c8183298fc6a7a6..bb90806bcfdfc42af3eb3820bc6d093d30acb10f 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\eq_qq_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5E7E0E7A-017D-5AC4-466C-31AB67371AE8}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\eq_qq_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5E7E0E7A-017D-5AC4-466C-31AB67371AE8}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index ca82df54b5226e0583ec793bd85d5352130de6ce..6f7363d2834d5fcb594ceca7b45a0e76e1ddd581 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\eq_qq_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4C421F28-4B66-6B88-217D-6DBF6B0907AD}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{042827B5-0185-385B-51F7-69F955E30F09}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\eq_qq_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4C421F28-4B66-6B88-217D-6DBF6B0907AD}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{042827B5-0185-385B-51F7-69F955E30F09}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 0a768966d76a4486cbb86941f05839124f8f7eb0..e8458b5a7fbc18fadcd829aedd126793b968a6e6 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\eq_vv_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{49F50113-2499-3315-616B-3A3870D104B8}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\eq_vv_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{49F50113-2499-3315-616B-3A3870D104B8}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index e496387adc9c2c98b8d86797d48ac9182eb44184..ea37df02e461f379808bae2737bd6723fbe28456 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\eq_vv_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4E94789A-67B6-3F0B-4682-55670FCB6691}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{5EDD14D1-185E-57AC-4D53-5D6077203556}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\eq_vv_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4E94789A-67B6-3F0B-4682-55670FCB6691}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{5EDD14D1-185E-57AC-4D53-5D6077203556}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 8aaf79dbac58dd6240e38f7d031213edb9185146..471cba4136b21ad5ed5fa19a7363f1e68920188a 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\identity_mat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4B717802-4DFF-0B2C-5FAA-21D0316C019D}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\identity_mat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4B717802-4DFF-0B2C-5FAA-21D0316C019D}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 9c9726b8f02d88051eb05e707f1a3882ef1c57e8..52fb894c0c53c56ec4be4e6595ee0d40c9228f01 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\identity_mat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4A994CFB-5BC0-2FE1-2B9E-23B43E7E562F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{435D59C6-4CA1-21FD-6791-178A506E2A89}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\identity_mat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4A994CFB-5BC0-2FE1-2B9E-23B43E7E562F}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{435D59C6-4CA1-21FD-6791-178A506E2A89}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 0a5c5af587574afcaeb2d9bd7d937306f8706ecf..7c986150011e23a50d04bc40c4d782f32454a3cb 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\identity_quat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\identity_quat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4BCD0F9D-6FE4-5319-47D2-4F4D05D94171}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 0e3863d13fe1a3481efe36a8149c7f09361d1d97..fde093f50bffbbaec989a9375864f2f2f1d76acf 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\identity_quat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4A897B0D-7ED7-59E5-622A-570201B40F5B}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{00DF51DA-4F84-2121-372B-545F1EFD57E7}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\identity_quat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4A897B0D-7ED7-59E5-622A-570201B40F5B}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{00DF51DA-4F84-2121-372B-545F1EFD57E7}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index c9c16b3a9bce54760bacc8da5a0f66076653f826..a0005a81c40f80208d83b30da35965ed1d975f39 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\interop_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{590A4D0B-6186-7450-2632-00F651DD6442}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\interop_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{590A4D0B-6186-7450-2632-00F651DD6442}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 405bf76f48e776989f4b1b6729d38b603aafde05..af6dab4ebd1dc9fe705eef37787ac2560149b2f6 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\interop_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{48681765-7943-0857-1984-556E135104F2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{6DA37C82-3001-0465-4D03-2A7A12122982}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\interop_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{48681765-7943-0857-1984-556E135104F2}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{6DA37C82-3001-0465-4D03-2A7A12122982}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 5d95a7c52dc72f3e270753a2296e751c83063972..fb1854045a287ef21e3c5880977b6e7a86694721 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\inverse_m_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{53A37C6C-0913-630C-5685-345C7CC01DCF}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\inverse_m_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{53A37C6C-0913-630C-5685-345C7CC01DCF}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 41145a8d697412efa1c08d88b04b6dd68863a598..94ab937865fe6fd89e9614ffd30147fc9a79acac 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\inverse_m_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4CF27A66-03A0-3F63-2138-2A0A7B911E34}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{1F1116D9-6252-41A6-0FE2-0C361F0C584A}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\inverse_m_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4CF27A66-03A0-3F63-2138-2A0A7B911E34}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{1F1116D9-6252-41A6-0FE2-0C361F0C584A}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 35c3a97e1b6f0de312eec8c12e879f6d432774c1..f8cc30a57c23e827e4e1fec86ae70fb909b460e5 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\inverse_q_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5EC3002E-3AE8-10B5-148A-73C866892AC7}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\inverse_q_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5EC3002E-3AE8-10B5-148A-73C866892AC7}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 3b40473b988a733ed8afe1a5c14c8c5653430bb4..139b9347bd190d8573a475bae0cd788d93a27d15 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\inverse_q_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4C314D3A-6E7D-158C-5808-210D2E3F40D9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{41AA1FC9-0469-377F-2191-26CD24723C67}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\inverse_q_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4C314D3A-6E7D-158C-5808-210D2E3F40D9}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{41AA1FC9-0469-377F-2191-26CD24723C67}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index cf010f2f5b1bcf34ee73ebc847bc46601351029e..08f7e9835aafc8499de4f893b7b7f1516f659dee 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mag_q_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5F1843D1-513D-1CA4-2C1D-029722A5017A}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mag_q_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5F1843D1-513D-1CA4-2C1D-029722A5017A}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index f6e3272c3ba7a05a50a27907a299b6cb7a228379..5c76d83954121f0e443e85fa8526b814df3d6d7f 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mag_q_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4C242548-575D-1D8E-36DE-63B27D9D6E96}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{3FAB7FDA-06B8-36CF-47A5-244449B12D7E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mag_q_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4C242548-575D-1D8E-36DE-63B27D9D6E96}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{3FAB7FDA-06B8-36CF-47A5-244449B12D7E}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 1f8c38cc5737e63f04468986abd1fd33561a588e..c13a39a1914f283321deed628171e02e394489cc 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mag_sqr_q_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5F605F82-5071-3095-2286-540B2E1F05EA}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mag_sqr_q_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5F605F82-5071-3095-2286-540B2E1F05EA}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 236324f810da8fd5794adc3cfa70d2fa72f0bec1..2a758faeed5f6964a960663a720bd37b051acb8c 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mag_sqr_q_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4C14535A-7A74-4792-6D69-170040D327C3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{7D2D77EE-099C-35F2-173F-611818405ADC}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mag_sqr_q_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4C14535A-7A74-4792-6D69-170040D327C3}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{7D2D77EE-099C-35F2-173F-611818405ADC}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index c707953a87323409a8a51ca0a08ca6bb62d7ac72..e9a2ce7563fcef73ef7b7b7dcaef5ad2bf8f25c6 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mag_sqr_v_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4AC25631-50DC-54EA-4BC6-00906EC63456}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mag_sqr_v_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4AC25631-50DC-54EA-4BC6-00906EC63456}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 55ca99f8b746ee9b0c7d0334f0504a368edc4043..e74220f55c3de05910a62bc61eeed721928cb63e 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mag_sqr_v_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4E777EBA-73AC-7111-5BE3-4B5B225F4D7A}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{1A616CF5-1D91-561F-4301-17AB6AEF53CB}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mag_sqr_v_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4E777EBA-73AC-7111-5BE3-4B5B225F4D7A}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{1A616CF5-1D91-561F-4301-17AB6AEF53CB}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index f129e570fc7e1b6602418807f6cbd7f41dad1c65..003fd880987f39c17e76ac1fbe4fdd3cf2651c1f 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mag_v_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4A6E128E-3A87-48FB-3433-71C132AA5DA3}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mag_v_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4A6E128E-3A87-48FB-3433-71C132AA5DA3}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 19470accf049e9f09fc12c6ab5b6c28b8aaf1887..1225dd2f6f6077aea2bc4227845d9c207a2bded7 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mag_v_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4E8750A8-5095-470E-2557-180D5F29144E}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{5CDF74E1-1AAE-56FB-7367-5AD71C60266D}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mag_v_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4E8750A8-5095-470E-2557-180D5F29144E}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{5CDF74E1-1AAE-56FB-7367-5AD71C60266D}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 5734e1866cc6d8b0bf1436c55cbbabab1bfd01ca..92ca4e47813608971e1624397f47e3b8e64b9b95 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mat_index_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{552556C4-3357-36BB-68E5-465617655884}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mat_index_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{552556C4-3357-36BB-68E5-465617655884}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index da096fec48e9df05a9f67bb5732d1de9b999f143..a6fb16f8857b0c912e313831d4ed61d911cb18aa 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mat_index_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4CB132AE-0FFC-6771-7B65-7743086802E6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{151A772B-6DE0-3E35-4E49-7F8859480DC0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mat_index_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4CB132AE-0FFC-6771-7B65-7743086802E6}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{151A772B-6DE0-3E35-4E49-7F8859480DC0}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index e87a7bf9b05a9c15e8ea10062491034daab8606b..dc404dc8123365838bd06d989c4e9a1b141af55a 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mat_traits_array_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{67A8721D-4983-18EF-3C00-284306CA5634}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mat_traits_array_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{67A8721D-4983-18EF-3C00-284306CA5634}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 81d0d665738cddbae1609905e5368fe63b577f5b..f5444efea8d548d034869408e6e5e18870501d20 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mat_traits_array_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4F9D4177-7C0B-7CD4-061A-2FD96898485C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{473C7B87-6992-659B-2A33-50BC64DD2337}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mat_traits_array_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4F9D4177-7C0B-7CD4-061A-2FD96898485C}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{473C7B87-6992-659B-2A33-50BC64DD2337}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 672aaf63bddee817f1ea9bfb675e8381e5d5cded..c50da25f40385096a4ab18b01d92c6f37b40365f 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\minus_eq_mm_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{51472505-1B6B-758B-38A1-1EAF33846138}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\minus_eq_mm_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{51472505-1B6B-758B-38A1-1EAF33846138}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 0460074a100d36cc2d3a895ffa72fac195adadf1..065c403e66e2dfcd74d2863e4e1a846ff6a14c28 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\minus_eq_mm_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4D6437E8-0DFE-194B-236A-42E625190DFE}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{70834E4B-4E19-47AB-62AF-626879211ABB}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\minus_eq_mm_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4D6437E8-0DFE-194B-236A-42E625190DFE}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{70834E4B-4E19-47AB-62AF-626879211ABB}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 1465ab943094faaf54e05f5206f1a0e15735a146..256b6598c5efb2ce225c79055930cdb0d586b3ce 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\minus_eq_qq_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5FFC3ED5-65F9-5074-3081-344E75B4610C}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\minus_eq_qq_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5FFC3ED5-65F9-5074-3081-344E75B4610C}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index d05121e6392bbf3e60ad2113baed4f87f697fa61..700c0343859b9050f27e642c9215997b34bd68d4 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\minus_eq_qq_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4BF32F7E-40A2-1B99-5A7F-7D9D473E1A1C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{78316817-0F63-343A-3672-5AC1355F3597}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\minus_eq_qq_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4BF32F7E-40A2-1B99-5A7F-7D9D473E1A1C}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{78316817-0F63-343A-3672-5AC1355F3597}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index a1d30649475dbb95f2fde3e31d9385cde26cf57d..ef6f71257060adb974cdd65270ac9b091585b266 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\minus_eq_vv_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4B790568-14A5-64C3-1C16-5B89179F33FE}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\minus_eq_vv_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4B790568-14A5-64C3-1C16-5B89179F33FE}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 8d5a26eac3616261470a96434fa5156ad4afeae0..d759edc91dbe266ba4f41d704e583d4559405975 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\minus_eq_vv_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4E5904DB-7FA2-2318-7143-414E34F33464}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{55E4451A-22C4-5493-38AF-51F65EBD7240}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\minus_eq_vv_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4E5904DB-7FA2-2318-7143-414E34F33464}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{55E4451A-22C4-5493-38AF-51F65EBD7240}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 728380fb08ba5314f2fe5ccdc5a13da46fc8c787..27c0a94798d427a15e71fdca19ec7dce89885761 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\minus_m_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{50E8636D-33BE-4F9F-282E-61DC52EF2CD3}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\minus_m_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{50E8636D-33BE-4F9F-282E-61DC52EF2CD3}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 064c91fe8278f2fda1c651f8ff4c91f68b238ceb..d69852f14fa70676f0d5620a2e7f2cb0bbb39f13 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\minus_m_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4D7509D6-6AE6-6F48-6CDF-0F9761E354D1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{33015637-4B36-4887-1316-25932A926D5E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\minus_m_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4D7509D6-6AE6-6F48-6CDF-0F9761E354D1}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{33015637-4B36-4887-1316-25932A926D5E}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index c24fe0d912482b0c8b64b5e14cb61794a098d40e..5a84bdf9e766721358a9365e81509322115ddfb4 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\minus_mm_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{519F12A4-7788-5F78-787F-3CD57BC82C7C}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\minus_mm_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{519F12A4-7788-5F78-787F-3CD57BC82C7C}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index d62e46d1615a6d9e7c2c190a0655411b2f2e2c68..430fa607300adb2e8c0168e53692ed45dc3141a1 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\minus_mm_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4D5465FA-3115-434F-59F5-7634684F472A}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{2E05465F-50FD-46CF-3249-1F3C47B04819}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\minus_mm_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4D5465FA-3115-434F-59F5-7634684F472A}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{2E05465F-50FD-46CF-3249-1F3C47B04819}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 3a70252df2ae38ecdccdd311da2aed9e8d531218..cf06646756500764ec4f8f5a79b3b45425b7fc86 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\minus_q_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\minus_q_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5FB52324-66C5-3C83-3A19-62DA6A3A5C9C}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index fa505079ced3783f06f45285ea48e92f5cebac07..570896d5904fd5664fa73f27d98e6a42678ca033 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\minus_q_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4C04016C-1D8B-7195-23F4-4A4F040960EF}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{3AAF7002-0C7F-3516-66D9-1DEC66D00839}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\minus_q_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4C04016C-1D8B-7195-23F4-4A4F040960EF}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{3AAF7002-0C7F-3516-66D9-1DEC66D00839}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index cd98fbf6e1903a9260377915344128859fae5c04..97a87f4d5bbabc2da248cbe042a88e210fb58708 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\minus_qq_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{60445A86-652D-6464-26EA-05C2012E657C}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\minus_qq_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{60445A86-652D-6464-26EA-05C2012E657C}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 8aac93970ca8140cca9bf28713aba31e16a66f9d..a339e9122f582bff4305024ad45247c074540306 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\minus_qq_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4BE35D90-63B9-459C-110A-30EB0A745348}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{35B3602B-1246-335E-060C-179503EE62F5}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\minus_qq_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4BE35D90-63B9-459C-110A-30EB0A745348}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{35B3602B-1246-335E-060C-179503EE62F5}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index dba57c4b585790ed9abf7a719b1935c281ca6ffb..0732ba965689c5500fdf915539a199064fc5bcbe 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\minus_v_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\minus_v_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4B1E6DCC-72C0-1CD6-33EE-2E0C4332742A}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index c92f0fba7828db02745fa9ad7d772c38b6010d1b..2efc58522da172854d8ab7a6e714874e6269ac68 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\minus_v_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4E6A56C9-5C8B-7914-3AB8-0E0071BD7B38}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{18624D06-1FE1-556F-6915-1522102E44E3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\minus_v_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4E6A56C9-5C8B-7914-3AB8-0E0071BD7B38}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{18624D06-1FE1-556F-6915-1522102E44E3}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 52483dcd68f6bc091054c6dd3edeaa9563a9dbce..7adf7e97dc9e10d6486d09b1eb9f6358181f4cf9 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\minus_vv_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4BCB1F0E-6531-12B2-0B5E-5B0147921621}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\minus_vv_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4BCB1F0E-6531-12B2-0B5E-5B0147921621}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 26f19cb3b3698e39ccd7e1b46865bf7bd0da385d..2eda20e4992c3e4b493e1405faaf8d8adc2bc0f7 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\minus_vv_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4E4C5CE9-6882-2B1A-5019-03F304516221}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{53E6252A-2514-53E3-5EC3-4F6D03FD6358}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\minus_vv_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4E4C5CE9-6882-2B1A-5019-03F304516221}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{53E6252A-2514-53E3-5EC3-4F6D03FD6358}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 2a2ac4ddbd174a080c4ff726c7e2a5abc359edd9..fcba4b5c634b5c17c3e458eb796358c93b7457ac 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_eq_mm_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{51EE024D-024C-2F68-3F7C-2CF61F931A0D}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_eq_mm_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{51EE024D-024C-2F68-3F7C-2CF61F931A0D}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 64cbb24a69c947017e7b9e4f41b34a4338205113..421edbde770c5ca6ec3e45140045f60685ec5102 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_eq_mm_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4D44140C-542C-6D52-1081-29822B850056}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{6B873E74-53E0-45F3-01E2-5C1016407576}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_eq_mm_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4D44140C-542C-6D52-1081-29822B850056}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{6B873E74-53E0-45F3-01E2-5C1016407576}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 359f2fd4ee4a19d23a1a8ebb69136902b5a31c5d..25d603de30c860ba375f3378627f5feefedd7c39 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_eq_ms_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{524345F0-18A0-3B56-570F-3BC55BAF70C0}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_eq_ms_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{524345F0-18A0-3B56-570F-3BC55BAF70C0}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index d3b88e5be708c2f4626b426c989b34a7577c24a1..fdb9ed2666d94d4cba5ecfb88e9534772ab11ec4 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_eq_ms_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4D33421E-7743-1755-470C-5CD16EBA3983}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{29093688-56C4-4517-517C-18E564CF22D4}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_eq_ms_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4D33421E-7743-1755-470C-5CD16EBA3983}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{29093688-56C4-4517-517C-18E564CF22D4}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 7bd4eb512332898c8146d50ff4d9cea2ab6c0fc0..ec959324c75bebfec0d0b4569c7a8a05cce17ee4 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_eq_qq_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{61D930C8-3222-6C0F-2B09-73C564C65B96}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_eq_qq_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{61D930C8-3222-6C0F-2B09-73C564C65B96}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 59de912137697d513fd0f2e3dc5fa3738d147632..faaf19cd2c13bb281fc3216aada17d69a6a35abd 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_eq_qq_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4B9817E3-1EBD-53AC-7257-502172D25A47}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{6A3D0889-1F90-2F69-4102-49003A1A4D3C}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_eq_qq_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4B9817E3-1EBD-53AC-7257-502172D25A47}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{6A3D0889-1F90-2F69-4102-49003A1A4D3C}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index edf3eba24dc3e81df030e14d20d9d6bb333db731..fd2031214e4983de770c73f982d2ae508c211b4f 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_eq_qs_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6096742C-35B9-1253-1632-053B3121479F}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_eq_qs_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{6096742C-35B9-1253-1632-053B3121479F}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 34a5258ae14e280eab69fc6221cae471a7d5b7ef..08698081535815e8756f156ec6389ab60e44f437 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_eq_qs_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4BD6359F-4C99-4D9F-6FE0-739159D20105}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{33B5403B-1496-32AE-2C20-150C292D540C}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_eq_qs_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4BD6359F-4C99-4D9F-6FE0-739159D20105}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{33B5403B-1496-32AE-2C20-150C292D540C}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 6591e3cd936af809ab938d15aa6fbbd4982095e0..2174e10dc71390d896c597b3d0776acea7cc494e 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_eq_vs_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_eq_vs_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4C2062B0-7B86-1EA0-22F1-69D003AE6CD3}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 98fe13962920bd81ec9c94dc20230811eb5293fc..6f22457003645a0f87b56b68192b52bc0297f2dc 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_eq_vs_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4E3C0AFB-0B99-551E-06A4-374247871B4D}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{11681D3F-27F8-5306-2E5D-0C41528C10B5}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_eq_vs_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4E3C0AFB-0B99-551E-06A4-374247871B4D}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{11681D3F-27F8-5306-2E5D-0C41528C10B5}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 3ba024b14549b100cb5f6da03559bbcde74b4eb9..df57357e297d226fe1baf5b4587a33cb445959b6 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_mm_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{529E5D8B-3A85-0343-3F37-6941301C3095}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_mm_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{529E5D8B-3A85-0343-3F37-6941301C3095}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 891818db36f4afaadaa8f6f803347dd47d83edf8..5c9476458e2599be9ae395075d40b82523036726 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_mm_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4D237030-1A5A-4159-7D97-101F31F072AF}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{668B2E9C-59A8-443A-2116-55B9335E5031}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_mm_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4D237030-1A5A-4159-7D97-101F31F072AF}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{668B2E9C-59A8-443A-2116-55B9335E5031}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 5f527f95fc81db49cd9e064b32e1e25772627e4b..a111b00f067c8c5a12cf3426252c6d2a7d2f0442 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_ms_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{52F07731-0B12-3132-2E80-68BA600F12B7}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_ms_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{52F07731-0B12-3132-2E80-68BA600F12B7}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 17bb53184b95c66aa5ba296f6e15e2f0aef71dc8..859b329705d8e1432934142f0a210415bde3b2d3 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_ms_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4D131E42-3D71-6B5C-3422-436D75262BDB}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{240D26B1-5C8B-435E-70AF-128E01ED7D8F}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_ms_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4D131E42-3D71-6B5C-3422-436D75262BDB}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{240D26B1-5C8B-435E-70AF-128E01ED7D8F}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index b0404d2b03f2e858599be6b8843f79e8200a34ce..276581e0d00385eb8b0e6b608aaad724ea261c30 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_mv_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{534864D0-672E-1B1F-6E5D-06DF28535DFA}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_mv_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{534864D0-672E-1B1F-6E5D-06DF28535DFA}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index c9bd160898dac228b3c7cb3ad82e611a05064d9d..c42f4a19e4ffe46f0a98fd559cff7bfa262f2234 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_mv_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4D024C54-6088-1560-6AAD-76BC385C6508}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{618F1EC5-5F6F-4282-4049-4F62507C2AED}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_mv_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4D024C54-6088-1560-6AAD-76BC385C6508}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{618F1EC5-5F6F-4282-4049-4F62507C2AED}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 0368a189056fa84046e8d700a947e7efa7b67595..8316b89419a4b74c337b193d2c656acd2b78fac3 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_qq_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{61911518-32EE-581F-34A1-2251594C5726}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_qq_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{61911518-32EE-581F-34A1-2251594C5726}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index fa3aa615280d54aec43908ff9cbb08345cf89649..f8be9fd157a6d69633fecdd3d0065efd61df844c 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_qq_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4BA869D1-7BA6-29A8-3BCC-1CD22F9C211B}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{2CBB1074-1CAD-3045-7168-0C2B6B8B1FDF}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_qq_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4BA869D1-7BA6-29A8-3BCC-1CD22F9C211B}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{2CBB1074-1CAD-3045-7168-0C2B6B8B1FDF}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 2c556566dc5b08745f83799a206b4be6a6a7d1ad..3880d7c1bcc4c1a8338f761f897b651df6ea4d93 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_qs_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{60E80DD2-0645-4042-057B-04B3611529C1}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_qs_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{60E80DD2-0645-4042-057B-04B3611529C1}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 17fbaca1fbc4eda7c9455d65347c81a8799268b2..70cdfd2bdecac6df9ce5463ef422cfacc38accdd 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_qs_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4BC663B1-6FB0-77A2-266B-26DF1D083A31}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{71373850-177A-31D1-7BBA-51E077BD016A}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_qs_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4BC663B1-6FB0-77A2-266B-26DF1D083A31}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{71373850-177A-31D1-7BBA-51E077BD016A}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index bd42393365508c74341a1fb30a68299961b69df8..3205b4bff1412d4cc371e744484860a577e71a6b 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_qv_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{61464F6A-6DF2-662E-15ED-418641AA5E26}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_qv_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{61464F6A-6DF2-662E-15ED-418641AA5E26}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 5821eb5b1a7342d932a71edd86d9fe658f76ba2f..d97ce932b304dc9b3f26689e43a2a5ac86a37958 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_qv_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4BB511C3-12C7-21A6-5CF6-5A2D603E735E}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{2EB93064-1A5D-30F5-4B54-0EB5464C2EC7}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_qv_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4BB511C3-12C7-21A6-5CF6-5A2D603E735E}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{2EB93064-1A5D-30F5-4B54-0EB5464C2EC7}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 4dfcde467994b98b6c7bfc5f0bb7e2152a9d8703..066b318832dccbcaa21b3a09a345ae42fd0911c1 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_vm_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4CDA3BE4-0518-0C79-1B8C-542038B0610D}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_vm_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4CDA3BE4-0518-0C79-1B8C-542038B0610D}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index d6ad5a418691efc6c1ccf4f071737071598fecaf..978a5269dd4de4725ace7f7fc48785a55d7716ae 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_vm_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4E1F111B-178F-0724-1C05-2D355A1B0237}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{4CEC7563-2D2B-517A-240B-468C465A2F2A}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_vm_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4E1F111B-178F-0724-1C05-2D355A1B0237}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{4CEC7563-2D2B-517A-240B-468C465A2F2A}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index ac0f0118cde6fdf2f8ac9d38310b6fa72536b465..5ca8037275b4914b0e630b75fd80c1dbd489002f 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\mul_vs_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4C7F2448-6333-448C-3364-26A364432138}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\mul_vs_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4C7F2448-6333-448C-3364-26A364432138}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index bb7fd16b2eb3d0458c8689d88bfc36bdb4e8e388..fe4d70c7c320b07068780324662a0e16642d1da0 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\mul_vs_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4E2F6309-7478-5D21-657A-79E716E5490A}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{0F6A7D4F-2A47-5256-5471-09B877CB01CD}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\mul_vs_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4E2F6309-7478-5D21-657A-79E716E5490A}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{0F6A7D4F-2A47-5256-5471-09B877CB01CD}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 96022feeeddc891c36ee54ff725024432e26733b..25808db78ef23a744a664665661d9e68616eab17 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\neg_col_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4D007A4C-0F64-56D8-1334-71257CB30E95}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\neg_col_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4D007A4C-0F64-56D8-1334-71257CB30E95}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 96dab4726eb4024a66a14ec139da7bf9a3f8e423..55e196d36b6ee69c90e425129099ae89a7c82c44 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\neg_col_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4A5B2F40-2DE5-35EE-2E16-0044577E2F71}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{79E52213-579B-1EB8-7C73-4B7E615B23BA}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\neg_col_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4A5B2F40-2DE5-35EE-2E16-0044577E2F71}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{79E52213-579B-1EB8-7C73-4B7E615B23BA}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 3e75c9f310d733b97c4830870d27489e2f1524a4..e68a7bf777fed6c7bfc07cf05222f6360218d9b1 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\neg_row_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4D446C00-48CF-0CCA-6152-33437C051E75}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\neg_row_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4D446C00-48CF-0CCA-6152-33437C051E75}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index f9b1a560d24045aaa38d686c0b4676d0dfde001b..b5338d0eb04ac26baec37421e2934344872661c1 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\neg_row_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4A4B5D52-50FC-5FF2-64A1-33921AB4689D}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{37671A28-5A7F-1DDC-4C0C-08522FEA5117}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\neg_row_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4A4B5D52-50FC-5FF2-64A1-33921AB4689D}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{37671A28-5A7F-1DDC-4C0C-08522FEA5117}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index bc10ad5a66a7624d22d31ceed861501b82d97175..62f6e5d3aea0990974686c3a32346cf85f45b789 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\normalize_q_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5D5521C1-3355-7102-73EA-3DD714D62B76}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\normalize_q_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5D5521C1-3355-7102-73EA-3DD714D62B76}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 018d4e10303b0a8d4ce1cccbd2f05c85b5246605..4f59897187ff718b7b910bc179e4a4d691878c04 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\normalize_q_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4C803CE4-7942-657B-1F06-112F520A2E6B}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{4DA05F68-768B-3BA0-3D16-360544F615D9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\normalize_q_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4C803CE4-7942-657B-1F06-112F520A2E6B}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{4DA05F68-768B-3BA0-3D16-360544F615D9}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index cd2e363d0ba34c4e9d819a5dc0ef5906371d17ea..a8fa4fc3e9bfe55c8e3791dcbb44f46c7549d91d 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\normalize_v_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4D282B8D-0FDC-5C69-628A-44415C7B4E9E}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\normalize_v_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4D282B8D-0FDC-5C69-628A-44415C7B4E9E}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 57b0d95e47d8164898dc47cadb68c7fd1c9f3151..9629dce612cff95effc4390f7828685f4956535f 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\normalize_v_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4E12692A-006F-0F27-7ADB-6FDA29792FF4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{4AED5573-2F7A-50CA-4A20-44036B9A2042}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\normalize_v_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4E12692A-006F-0F27-7ADB-6FDA29792FF4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{4AED5573-2F7A-50CA-4A20-44036B9A2042}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 2a4b5406126388d9ef881c2a2bdd4479ab045efd..6df9cd600b70f2c17b4a36f7ba25aff527e2c43d 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\plus_eq_mm_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\plus_eq_mm_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{540C3BF9-4218-22F6-5FD8-1F3301CE2FE6}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 28f98d80dd36fa2a5c581e8481072f917c2a5f58..c1c5d8012305ef3f0c2a89e5fa27f530dd34012b 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\plus_eq_mm_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4CE55274-6C7F-4766-000E-6CAF4AF04BF1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{1D1376EA-64A2-40F5-35F7-09AD444B4962}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\plus_eq_mm_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4CE55274-6C7F-4766-000E-6CAF4AF04BF1}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{1D1376EA-64A2-40F5-35F7-09AD444B4962}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 7dcde2aec6dde34c1bb7fd47080e459206041cd7..72a5a43139bef2a58a2624abd92cf39bddec95e2 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\plus_eq_qq_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{621E227D-6B8E-2201-7927-35E264186B76}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\plus_eq_qq_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{621E227D-6B8E-2201-7927-35E264186B76}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index d98cf55dcd95009b5ce4a2354dab91cf00c800ac..1e5072ebc2e21e2260d161d18476a87069f7beee 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\plus_eq_qq_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4B8845F5-41D5-7DAF-28E2-036F36071374}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{27BF009D-2274-2E8C-109B-05D408A97A9A}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\plus_eq_qq_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4B8845F5-41D5-7DAF-28E2-036F36071374}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{27BF009D-2274-2E8C-109B-05D408A97A9A}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 9a5f4270e477aa1f90d9aece47e916e188e67bde..46e403c000f6dc84a25199af6a0a19653bae2a06 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\plus_eq_vv_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4D81192C-6BF8-4656-2267-626724BF19E2}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\plus_eq_vv_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4D81192C-6BF8-4656-2267-626724BF19E2}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index dc640bd4533f6b7a0e81d660e8189dc4fa543c77..d228da6667a8299cb18c9a98a3899b7478434191 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\plus_eq_vv_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4E01173C-2386-392A-3166-23296CAF6920}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{086F4D88-325E-4FED-19B9-00D73A294DA0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\plus_eq_vv_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4E01173C-2386-392A-3166-23296CAF6920}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{086F4D88-325E-4FED-19B9-00D73A294DA0}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index bb44e43c1426ae7212659ec3e8f9432fb6abb04f..7ca9d0e1aa5a3281cd57da6c58b43e850e4a832f 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\plus_mm_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{54854D74-5807-38DD-329F-56BC43A708D1}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\plus_mm_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{54854D74-5807-38DD-329F-56BC43A708D1}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index a14f90b4bab433dd1d025e819007a524879d66e8..70c3493a18b2d4cbdbdd25d3aa997c37f70d47ff 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\plus_mm_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4CD1568A-49CE-136A-0E4E-10A701FD108D}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{1A150702-6819-3FED-2F16-05DF3C2A3305}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\plus_mm_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4CD1568A-49CE-136A-0E4E-10A701FD108D}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{1A150702-6819-3FED-2F16-05DF3C2A3305}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index b6650a0c46b0b471967912fcd406a9acf38a27e7..193055e2ac8b0aab5a8c6728ae33a698eb12e671 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\plus_qq_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{62621432-24F9-57F3-4745-780063697B55}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\plus_qq_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{62621432-24F9-57F3-4745-780063697B55}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index d5cff9834b96c7036f9a4520c05fdb6a630b0b20..5a010599750dff1ec673de45e8ce18a9edcd3160 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\plus_qq_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4B7B1E03-2AB4-05B2-07B8-461405664131}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{25C160AD-24C3-2DDC-36B0-034B2DE96BB2}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\plus_qq_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4B7B1E03-2AB4-05B2-07B8-461405664131}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{25C160AD-24C3-2DDC-36B0-034B2DE96BB2}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index c90cfb23773d81dd151b80cd2b09a64af493418c..45dc4bb56c7802c16bdd46d7656ab7988625f19f 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\plus_vv_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\plus_vv_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4DDC30C8-0DDD-0E43-0A8F-0FE3792B59B6}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 1370047631ca8d68218fb6c918579faff8d23912..a4f48201035e3e7102f50a32fdaf0be48aa99551 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\plus_vv_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4DF46F4A-0C65-412D-103C-65CE3C0D16DD}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{06712D98-34AE-4F3D-3FCE-7E4E5F683EB7}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\plus_vv_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4DF46F4A-0C65-412D-103C-65CE3C0D16DD}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{06712D98-34AE-4F3D-3FCE-7E4E5F683EB7}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 675346a5ddd55b80f5c0d6fc3923ea03a033cf9f..89ea268980bc530cc8f61ebb5a12d17aaa14cfb3 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\projection_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{59A72C5F-770E-142F-342E-613919723F65}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\projection_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{59A72C5F-770E-142F-342E-613919723F65}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 25566ba45887d7865fa3d8bf04b83dd109c43304..eb2eb438f7b9b56ce770e773f24f033d15c29263 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\projection_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{48477389-3F71-5C5E-069A-3C0B19BC774B}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{68A76CAA-35C8-02AD-6C36-24232F30043D}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\projection_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{48477389-3F71-5C5E-069A-3C0B19BC774B}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{68A76CAA-35C8-02AD-6C36-24232F30043D}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index cfc3bf16d7c513f4c217b9d3a2c3590443fc52d7..7ced020e46cb02145fbe8c4ffd72f6010e156034 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\quat_traits_array_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{497D4873-6EE2-5C14-53AC-4D47257B5B42}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\quat_traits_array_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{497D4873-6EE2-5C14-53AC-4D47257B5B42}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index a4011e68782051d0c1e13be3620c006e35d6b854..d82dc23c7179c129730bd04d833f97643bb91b1f 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\quat_traits_array_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4F901985-64EB-04D6-64F0-727E37F67619}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{453D5B98-6BE1-64EB-5048-4E330A1D144F}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\quat_traits_array_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4F901985-64EB-04D6-64F0-727E37F67619}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{453D5B98-6BE1-64EB-5048-4E330A1D144F}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 1eacb40a59ec435467a54a93f410bfc46763f1e3..8d35548950d625df1813c06ab1a00541a5ef3489 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\rot_mat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{46A97746-15C7-5A2D-5A6D-29C5622B419D}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\rot_mat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{46A97746-15C7-5A2D-5A6D-29C5622B419D}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index ac28cc1267cb4f67ea1b3052c912c6588e4369aa..17c70e34439418fac2fba69276c77d5169f132ce 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\rot_mat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4B3D0048-7CD9-0BBF-0A2F-22A41E651A73}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{5C4828FA-2FBE-2A97-4B91-373F3ED664E2}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\rot_mat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4B3D0048-7CD9-0BBF-0A2F-22A41E651A73}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{5C4828FA-2FBE-2A97-4B91-373F3ED664E2}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 0366a1127c3eadd006925f0cf0485b174a4488f7..3eecb939637dfa0fcc81a68e689dedbb093dc5c2 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\rot_quat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{473504AB-4E66-2410-1EF3-3D566CF655EC}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\rot_quat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{473504AB-4E66-2410-1EF3-3D566CF655EC}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 5480a681c2d884f653efe4e53aed87fcdd9f0e22..f5de19b2799ce160e24f8788367a29989e2ab5f3 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\rot_quat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4B2F5856-65B8-13C2-6905-65496DC34830}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{5A4A090B-320D-29E7-71A6-34B5641555FA}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\rot_quat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4B2F5856-65B8-13C2-6905-65496DC34830}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{5A4A090B-320D-29E7-71A6-34B5641555FA}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 680bd473d86508092fef320dd59c7ec0a601e665..85126d879e399ae02b206f1947560110ba62e928 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\rotx_mat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{47C21211-0705-6DF2-637A-50E777C26A3B}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\rotx_mat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{47C21211-0705-6DF2-637A-50E777C26A3B}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 0738944ba9d11114d2c5c82ec2c646eede981ff3..739e1400e125baaab721b51590f10ab1aa5ef70c 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\rotx_mat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4B1F0668-08CF-3DC5-1F90-189830F9015C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{17CC011F-34F1-290B-413F-718A32A40357}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\rotx_mat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4B1F0668-08CF-3DC5-1F90-189830F9015C}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{17CC011F-34F1-290B-413F-718A32A40357}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index ad35c79bbe3fe20e9420ebafb3171782d57ca405..e9a3f4b2697f5e311bf4f6b5b23f6c1ed67604a3 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\rotx_quat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{482D7B9A-05D3-0BDC-1517-4B1508F970E3}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\rotx_quat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{482D7B9A-05D3-0BDC-1517-4B1508F970E3}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index d3827b3f7cd412de780d6a7c31a1b362ce3d4140..bbc4326971e3c15fa60b041e9338fcbf0b89376c 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\rotx_quat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4B125E76-71AE-45C8-7E66-5B3D00572F1A}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{15CE612F-3740-285B-6754-6F0057E4746F}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\rotx_quat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4B125E76-71AE-45C8-7E66-5B3D00572F1A}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{15CE612F-3740-285B-6754-6F0057E4746F}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 2a2de064c0223fea1e71737189b1d7eaee49ee55..43599fffad84bcd16a088d7fc2668bd6c3c266c4 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\roty_mat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{48BA08FF-3E72-55BE-599E-5EA713C40532}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\roty_mat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{48BA08FF-3E72-55BE-599E-5EA713C40532}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 4d1657a4e6794de4ce76a7d1d179315668747f0d..cfb91f3d2b3caf2e453b4658fdc8f8bef2d42b86 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\roty_mat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4B020C88-14C6-6FCB-34F1-0E8B438D6846}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{53505944-3A24-277E-36ED-2BD5267321CC}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\roty_mat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4B020C88-14C6-6FCB-34F1-0E8B438D6846}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{53505944-3A24-277E-36ED-2BD5267321CC}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index d7ba1862bf3d1d93faa3ecb03c01c296a06aeea7..63084ac2cbd813738b50dad23484dcc3f582e804 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\roty_quat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{490F4CA2-54C7-61AC-7131-6D764FE05BE5}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\roty_quat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{490F4CA2-54C7-61AC-7131-6D764FE05BE5}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 6985abcf794edcace6d59d83a355e133eda5bf89..3a88f5cb1f3c1ae18e15a735151e6ec507e4f1f7 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\roty_quat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4AF13A9A-37DD-19CF-6B7C-41D906C32172}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{10D25158-3D07-26A2-0687-68A975024F2A}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\roty_quat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4AF13A9A-37DD-19CF-6B7C-41D906C32172}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{10D25158-3D07-26A2-0687-68A975024F2A}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index e5619e1b3aee826b16346142893f77ca189039c2..94995d623c88551fc2e23909e668d3afd458706e 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\rotz_mat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{497E6028-195D-5D95-4B18-76FB6D3F571E}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\rotz_mat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{497E6028-195D-5D95-4B18-76FB6D3F571E}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index e68797427b99cea0f2c9c744c5a8fe7f1c602864..63ec19a2647bbf6755d1fedd381b5a1f489fe1c1 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\rotz_mat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4AE412A9-20BC-21D2-4A52-047F56214F2F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{0ED33168-3F57-25F2-2C9B-66201A414041}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\rotz_mat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4AE412A9-20BC-21D2-4A52-047F56214F2F}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{0ED33168-3F57-25F2-2C9B-66201A414041}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index c0c3ec45186e8c3f95033336bd99a419163740fc..e02e8f090c84754abc9f68f4bb9a10a1208a4dda 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\rotz_quat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4A0D178A-17C4-0577-37E9-19E304335FFE}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\rotz_quat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4A0D178A-17C4-0577-37E9-19E304335FFE}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index b8d32fac9256f5aa0593c8ef8c1738f8545f5ced..edd7668ae06bb1312f70e79dc4a3d11139b0a0e7 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\rotz_quat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4AD440BB-43D3-4BD5-00DD-37CD1957085C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{4C55297D-423B-2516-7C35-22F468D16D9F}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\rotz_quat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4AD440BB-43D3-4BD5-00DD-37CD1957085C}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{4C55297D-423B-2516-7C35-22F468D16D9F}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 613464f471e333df000a856f55cb5f499e85fea0..27e29cca58336bc02252666037a44626f4022488 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\row_mat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{509F0E4F-7974-1E15-45EF-755D79935F23}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\row_mat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{509F0E4F-7974-1E15-45EF-755D79935F23}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 6ce70c63d4a0a83674f5085345675334644ba342..7ab72ba10d50fd01ae5d02cbe6afceca9fcc4edf 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\row_mat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{49C279E8-5E25-740F-4865-2F581C1148DF}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{22780AD2-72C3-16A2-1BE4-6DB17703348F}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\row_mat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{49C279E8-5E25-740F-4865-2F581C1148DF}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{22780AD2-72C3-16A2-1BE4-6DB17703348F}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index c8b1388e955eaf6f5011e6b131faf9b5ca832d5f..63cabe19950e0ec2cf326ffe07bda318de077b92 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\row_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{50404CB7-11C8-7829-357D-388918FE2ABE}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\row_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{50404CB7-11C8-7829-357D-388918FE2ABE}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 22afb08c8e0ef5c4fe667fc1bf290ef1424976c0..745a3587233c0db2c90f8558fbd9c474425200f5 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\row_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{49D24BD7-3B0E-4A0B-11D9-7C0958DB0FB3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{64F612BE-6FDF-177E-4C4A-30DC28740732}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\row_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{49D24BD7-3B0E-4A0B-11D9-7C0958DB0FB3}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{64F612BE-6FDF-177E-4C4A-30DC28740732}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 632d1ff29ae617be137350e5877053ca2e753863..25dbcbe47cb2608f802342b4d9b9a7feba1a2510 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\scalar_cast_m_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{54D33D1E-62CB-08CC-799D-46DE67727662}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\scalar_cast_m_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{54D33D1E-62CB-08CC-799D-46DE67727662}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 0af749e668f1d69ce3d7547fb0c545c7da0835f6..5db3ba95c818d635615aa8510fc0ae02955320d4 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\scalar_cast_m_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4CC1049C-6CE5-3D6D-44DA-43F5453349B9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{57987F16-6AFD-3F11-7EAF-42B30AB96063}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\scalar_cast_m_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4CC1049C-6CE5-3D6D-44DA-43F5453349B9}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{57987F16-6AFD-3F11-7EAF-42B30AB96063}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 0de7948615853930d65f7c20ab401ccb49f64c97..1969d5c465ed0ed56df59c8541381e39f5b317c8 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\scalar_cast_q_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{62A031ED-52D4-51E6-44CE-1B6F4A6A2213}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\scalar_cast_q_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{62A031ED-52D4-51E6-44CE-1B6F4A6A2213}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 987268a49bb8267d6ef5331102911fb03c2a9613..650b6f2bd524bdde4c4e0c3a0a92f02617789898 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\scalar_cast_q_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4B6A4C15-4DCB-2FB5-3E43-7962489B7A5D}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{634358C2-27A7-2D00-0649-401F7C78190F}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\scalar_cast_q_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4B6A4C15-4DCB-2FB5-3E43-7962489B7A5D}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{634358C2-27A7-2D00-0649-401F7C78190F}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 6360826f7ad013ac0680b471e46f0bd80f1d1f9f..6a6aef78fb1e6aac48be578b284da92ebacffe17 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\scalar_cast_v_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4E341E67-69FA-7830-4A6D-2E09417024FA}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\scalar_cast_v_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4E341E67-69FA-7830-4A6D-2E09417024FA}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 99d5aacf2bbf70e8027b78c0b08d1fc66e770f0a..cd81627d78873941481bdd281eb8f862b32a1931 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\scalar_cast_v_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4DE17360-69B4-0D31-1E7C-09C5731A5B79}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{03733DB0-3825-4E35-38EC-7A805747285B}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\scalar_cast_v_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4DE17360-69B4-0D31-1E7C-09C5731A5B79}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{03733DB0-3825-4E35-38EC-7A805747285B}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index a24f36b4d3bbd731e1d093f51998d18823a2732d..fa97b8be95590a9586de76997b90b497bffc5259 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\scalar_traits_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{59EF4810-7642-2820-2A97-32AD24EC43D5}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\scalar_traits_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{59EF4810-7642-2820-2A97-32AD24EC43D5}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 219f3af624fcca02caeea7c8af3c18038c43efcc..5c6a7d9e969f126c271da31768dd5c8f8067ba5a 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\scalar_traits_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4837219B-6288-0662-3D25-6F595CF23077}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{262964BF-38AB-01D0-3BD0-60F77DBF319A}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\scalar_traits_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4837219B-6288-0662-3D25-6F595CF23077}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{262964BF-38AB-01D0-3BD0-60F77DBF319A}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 5c9f758521ba8c7b4854ae473c367ffcefbd25e9..a6bf6709b8226496b06d60cf1fb558f7a1d8b729 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\slerp_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{62E279A5-4678-29D8-6AA2-4E363D933D61}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\slerp_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{62E279A5-4678-29D8-6AA2-4E363D933D61}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index b4a75c07bb3f43723568d0634998a8e17bbfde2a..e589f98ebf5bfe6a52b52d61010cb3b3f573fc45 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\slerp_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4B5D2424-36AA-37B8-1D19-3C0817FA281A}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{614438D2-29F7-2C50-2C5E-3D9621B70A27}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\slerp_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4B5D2424-36AA-37B8-1D19-3C0817FA281A}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{614438D2-29F7-2C50-2C5E-3D9621B70A27}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index de7887c2a94d4d60131c0097aa4ed5c3e9934d80..6cc15cc579114e290abadb1f949586297c483f3c 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\swap_cols_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4EBC4863-21BB-467B-7AD2-173972307B78}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\swap_cols_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4EBC4863-21BB-467B-7AD2-173972307B78}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 309c4b1a22469d652ec3b3337263273f8e96431e..8ca08e5da5d9fac940b57875cb83b47fea39db32 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\swap_cols_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4A106992-68E9-43FE-0F62-1F793FDC3670}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{2E6E4A71-64E5-1AC3-3769-7CE917870E02}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\swap_cols_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4A106992-68E9-43FE-0F62-1F793FDC3670}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{2E6E4A71-64E5-1AC3-3769-7CE917870E02}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 2c74117e3c9b886314b8ebbc253c382bbdd6eb31..63427b36656e70c82b6fae3cdd6533883784074e 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\swap_rows_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4F3803DA-7D72-3A61-75E4-5E18403248F3}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\swap_rows_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4F3803DA-7D72-3A61-75E4-5E18403248F3}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 8192d67ae6d81b0e02296952c9367d7d9125fe0a..5ccf9f417ec26bf1be60911964115d5ad1f3ad3a 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\swap_rows_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4A0017A4-0C00-6E02-45ED-52C703116F9D}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{6BF04285-67C8-19E7-0702-39BD66163B5F}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\swap_rows_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4A0017A4-0C00-6E02-45ED-52C703116F9D}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{6BF04285-67C8-19E7-0702-39BD66163B5F}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 3532315be776686b1e19c364faacebb85462dd61..848f41620c456397fffe8ac262ea703d3ac47be4 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{52C745F0-0A99-2BA1-5F2A-159E004752AE}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{52C745F0-0A99-2BA1-5F2A-159E004752AE}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 835afc6da882482038d85974f08256b348b71571..1b3c38347ae34f5ac870efa4322f7bc45d5a6737 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+</Project>\r
index d771030ec3b5a1a65688d3c2155d9c17b28b3a64..b918b5f2fc89080b456679869ae616defc85b45d 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{53293184-380F-2F8D-17E8-61C86D057BA4}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{53293184-380F-2F8D-17E8-61C86D057BA4}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 835afc6da882482038d85974f08256b348b71571..1b3c38347ae34f5ac870efa4322f7bc45d5a6737 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+</Project>\r
index fdc6e227aba341f3659a8813d0e52656b090c016..b55539b9afcabf5753cd6b518993b677d34d9bb9 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{534D7F5C-37A8-3985-531C-0A8272C27DDC}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{534D7F5C-37A8-3985-531C-0A8272C27DDC}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 835afc6da882482038d85974f08256b348b71571..1b3c38347ae34f5ac870efa4322f7bc45d5a6737 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+</Project>\r
index 3c99f9dece97b9e28702ab9418532181cf10e6d7..04b1f801909b58b3e1e11d343587e0dffff0a301 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\swizzle2_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{53E060BB-7BD8-3F66-6838-3CC115DE7B4C}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\swizzle2_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{53E060BB-7BD8-3F66-6838-3CC115DE7B4C}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index e2cc1e808fa2b05ecdcbf0dac46a68ed920dc8ba..747efbee6ab48d0ff4d8fe3a1ee4a1fe2ae6392a 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\swizzle2_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{49536663-198F-7826-6E7D-25D37EB14DA6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{11863B5D-0668-10C8-1F92-5822739D35D8}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\swizzle2_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{49536663-198F-7826-6E7D-25D37EB14DA6}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{11863B5D-0668-10C8-1F92-5822739D35D8}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 4f8539088fbeb2805e3359adf33125a6db5a332f..ff496571d647ad2902f4b3e7135e8d33e9652718 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{54327A61-4C64-6D55-5780-3C3945D15D6E}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{54327A61-4C64-6D55-5780-3C3945D15D6E}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 835afc6da882482038d85974f08256b348b71571..1b3c38347ae34f5ac870efa4322f7bc45d5a6737 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+</Project>\r
index 02ef7bffda97e0f3beb4fd04ea169044210bc001..2749b00d067697a22d2dc1b824650d67a41f19e4 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{54903BF9-3411-1341-67F3-790C266711D3}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{54903BF9-3411-1341-67F3-790C266711D3}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 835afc6da882482038d85974f08256b348b71571..1b3c38347ae34f5ac870efa4322f7bc45d5a6737 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+</Project>\r
index 21877a6b9940bd1cddd2f16f20d509b18cafa537..5c1fb614c5060bce756414a4002d31b954c6ca17 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{54DF2BA2-3ED6-6331-2EF0-692E4A317F65}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{54DF2BA2-3ED6-6331-2EF0-692E4A317F65}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 835afc6da882482038d85974f08256b348b71571..1b3c38347ae34f5ac870efa4322f7bc45d5a6737 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+</Project>\r
index e0eb40c4bd80a3e465ab64669ea2f42d942f5965..9bc9c8cfd0e9045248adcc26b28fecfe93ed9264 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\swizzle3_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{55304548-0F62-1120-1E39-68A67A256187}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\swizzle3_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{55304548-0F62-1120-1E39-68A67A256187}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 13e25285edc00ecff22556aca318c4e5c26bacaa..96cf6f0380ae20601c38bf2620d2b1111038e19a 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\swizzle3_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{49111EAB-25EB-2034-48AA-730C0B883258}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{078E1BAE-11F6-0D57-5DF8-4B732DDA6B4E}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\swizzle3_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{49111EAB-25EB-2034-48AA-730C0B883258}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{078E1BAE-11F6-0D57-5DF8-4B732DDA6B4E}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index fb57a839afd2868a749bb85ff81994859ad4a817..e6be4298c5f285bded0f5795715096c1c3fe33b8 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{557F34F2-1A26-610F-6537-58C71DEF4F18}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{557F34F2-1A26-610F-6537-58C71DEF4F18}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 835afc6da882482038d85974f08256b348b71571..1b3c38347ae34f5ac870efa4322f7bc45d5a6737 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+</Project>\r
index 92c1582b63691c1454b0c064a8383481c5ca5155..85a326d7723623a6c89cd5a8e93e7be5a9cf79f9 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{55BD52AE-4801-5B02-62C0-7C3704F075D6}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{55BD52AE-4801-5B02-62C0-7C3704F075D6}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 835afc6da882482038d85974f08256b348b71571..1b3c38347ae34f5ac870efa4322f7bc45d5a6737 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+</Project>\r
index 22db968164ac2272dfaa552fa799bcbde3782778..f4398a5106ffda62bf36e3813c1441531e7e3317 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{56186A49-69E6-22EF-4AE8-29B4595D35AA}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>
-    </NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>
-    </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{56186A49-69E6-22EF-4AE8-29B4595D35AA}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>\r
+    </NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>\r
+    </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 835afc6da882482038d85974f08256b348b71571..1b3c38347ae34f5ac870efa4322f7bc45d5a6737 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+  </ItemGroup>\r
+</Project>\r
index 0aae0102f451c3e2ceb6660fb8118de667e8b5e6..1c9d6ebd4a1e33d84759018a58e57ac31c77bb58 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\swizzle4_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{567401E5-0BCB-6ADC-3310-57302DC9757F}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\swizzle4_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{567401E5-0BCB-6ADC-3310-57302DC9757F}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 07a85b6da148762d0990b499895c245234484652..0aee4b28bf6645026425e86e47cdfa4de0b9a433 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\swizzle4_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{48D056F2-3248-4841-22D6-4046185F1709}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{7D967BFF-1D84-09E6-1C5F-3EC5681720C5}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\swizzle4_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{48D056F2-3248-4841-22D6-4046185F1709}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{7D967BFF-1D84-09E6-1C5F-3EC5681720C5}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 68391e1804701ff21fc50c869277367efe077140..7c40365704108eaab538409d5363d5b17346124c 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\swizzle_const_fail.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{13A81B5C-3126-7689-29CB-7EB809060F4C}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\swizzle_const_fail.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{13A81B5C-3126-7689-29CB-7EB809060F4C}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 149bdf51da44aaf3a9ce7f2cb19881f5c55ac014..25a43ff4009739fa7ff44b166b525196439e7b98 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\swizzle_const_fail.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{481927BC-6E7E-3868-5286-654D6F861761}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{61AD3CE3-3DDE-0044-317E-1B42718E5010}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\swizzle_const_fail.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{481927BC-6E7E-3868-5286-654D6F861761}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{61AD3CE3-3DDE-0044-317E-1B42718E5010}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index c4833044ea9aba80ffd97b90352ff56771483e35..8d6e4059d2d1ede5121134eda8da5216d1f6b043 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\to_string_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{477E59C9-08B0-5599-0133-29D54652239C}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\to_string_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{477E59C9-08B0-5599-0133-29D54652239C}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 1d3ea390c755e9efa366b1d4dab3397157be67aa..f3938bdb7d1033b43c02877fd17ac0ff35271e1a 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\to_string_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4EF01035-099A-06F8-2EAA-02E464382665}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{6CD1745F-0831-5C7D-42C3-6F2172651DB0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\to_string_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4EF01035-099A-06F8-2EAA-02E464382665}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{6CD1745F-0831-5C7D-42C3-6F2172651DB0}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 7e1676538a781d99cc2c5ec5776c6e9346d5868b..111e15b65677053b0258f2f17069b1b5ac1ff297 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\transform_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{594F3EC0-1AF1-2A42-7450-4314512E7421}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\transform_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{594F3EC0-1AF1-2A42-7450-4314512E7421}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index d42852af68848ece50c53c70099972388ccbafcf..f791b98e8c1ad56d0e6a57a0d2a1488ecde6d25b 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\transform_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{48574577-1C5A-325B-500F-08BD56873E1E}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{2B257496-32E4-0389-1C9C-674F60A156DF}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\transform_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{48574577-1C5A-325B-500F-08BD56873E1E}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{2B257496-32E4-0389-1C9C-674F60A156DF}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index c251306619c63133db09068ba80f04d4dce4e4e7..c0e9c89ac7d14953924e2dd713cf8f945dda6a49 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\translation_mat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{519B2F3A-76AA-63E0-645D-127321BE6EAB}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\translation_mat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{519B2F3A-76AA-63E0-645D-127321BE6EAB}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 72a808711841f1596f6a48521e6738cef5355c3e..e08aabb11352855a757dc2abe25f9b43b653639e 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\translation_mat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{49975817-52FA-2E18-3C9B-67F07E035D85}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{5BFD4307-7A45-1465-37A6-25721011441C}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\translation_mat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{49975817-52FA-2E18-3C9B-67F07E035D85}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{5BFD4307-7A45-1465-37A6-25721011441C}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index bc6a853e566deb1e049a9c7a681134205f1724b3..247c67aa4f34cb0a28965afafeb6c828331f7538 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\translation_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{51466B98-6055-57F2-4CCA-03A465A217F8}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\translation_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{51466B98-6055-57F2-4CCA-03A465A217F8}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 5e4a61e217c66db20baf0078ca525bcf6418c80c..f986a09c19bf39a941dd802625bb9f6dae95fa08 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\translation_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{49A40009-6A1B-2615-5DC5-254B2EA52FC8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{5DFC62F7-77F6-1515-1192-27FC6AD15305}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\translation_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{49A40009-6A1B-2615-5DC5-254B2EA52FC8}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{5DFC62F7-77F6-1515-1192-27FC6AD15305}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 2cd68925c656d0a27e296f622df857edad9dcfae..84b50386a3bd8e5ac13a1e3cda827f65acb22318 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\transpose_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\transpose_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{50EE7DF9-0439-6E05-0CED-657E1D5E4CB5}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 134f7e95ade66cf605ff9f8d318b76ffd8e63dd0..af7d2c1274088e91499c995b09cde36ebc8acf79 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\transpose_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{49B551F7-4704-7C11-273A-71FD6B6F769C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{20796AE3-7512-15F2-41F8-6B271C4225A7}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\transpose_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{49B551F7-4704-7C11-273A-71FD6B6F769C}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{20796AE3-7512-15F2-41F8-6B271C4225A7}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index a276700fc2aa5afea476245ac8950d480a926847..dad3dc8fcacbfdf1a5c1369feb81cd1e1e96b5e2 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\vec_index_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4E830E10-74BE-4820-116A-1E2A653A128B}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\vec_index_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4E830E10-74BE-4820-116A-1E2A653A128B}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 33a23ba0be8886846f2f19815f53c81a6c238f20..ca7deb7592e21567bf6a325d04a33f0262fc2e95 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\vec_index_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4DD34B6E-5293-1534-7D52-4C6A42790936}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{01751DC1-3A75-4D85-5F01-77F77C871972}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\vec_index_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4DD34B6E-5293-1534-7D52-4C6A42790936}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{01751DC1-3A75-4D85-5F01-77F77C871972}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 4116013e6898ac942e2b359a8d209212fc56167d..389a452a63c7627b99da6220b5fce5a84e69a930 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\vec_traits_array_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{49010CFB-132B-682E-589B-0668577A0DC6}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\vec_traits_array_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{49010CFB-132B-682E-589B-0668577A0DC6}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index dc2031dc2443107f809764cdb4e2e1a513883cb3..ddbbefb31bc87b11db5bc4789705d13328f84b58 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\vec_traits_array_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4F837194-4DCA-0CD9-43C6-3523075423D6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{433F3BA8-6E31-643B-765C-4BAA2F5C0566}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\vec_traits_array_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4F837194-4DCA-0CD9-43C6-3523075423D6}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{433F3BA8-6E31-643B-765C-4BAA2F5C0566}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 28a0e331586f048af556d7f72b00b19c7f6ebdfa..8cafc38ebc3eafc54de1a2c4ebed4311e1a9c830 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\zero_mat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4ACB1AB9-671E-514F-58CF-1389455D48C8}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\zero_mat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4ACB1AB9-671E-514F-58CF-1389455D48C8}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 813a0924e5668bc71d14817de5376568a50d069a..f2c26eb2aa94191ef98c6efeb08e6fae7ece9726 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\zero_mat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4AB746DB-4FCA-7DDB-163E-2DC02BEB6F45}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{07D901A1-476E-2389-71E3-5D3F5C9F0C14}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\zero_mat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4AB746DB-4FCA-7DDB-163E-2DC02BEB6F45}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{07D901A1-476E-2389-71E3-5D3F5C9F0C14}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index 116abec18fdb306897120d61256fe33ad3372bdf..8c8c9e56845d8bfb0052b73000deb457aa30fa3e 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\zero_quat_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4B230858-433B-3B3C-18AC-31AF0DA1140B}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\zero_quat_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4B230858-433B-3B3C-18AC-31AF0DA1140B}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 783cc8560dd90678d83be2d7c315d3d515a382f7..068fca77a581728cbb2d67fe6a97456e049a7faa 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\zero_quat_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4AA674ED-72E1-27DF-4CC9-610F6F202872}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{455B79B6-4A51-22AD-417D-1A142B2E3972}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\zero_quat_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4AA674ED-72E1-27DF-4CC9-610F6F202872}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{455B79B6-4A51-22AD-417D-1A142B2E3972}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index ec0a814ea3c4a300fa10497f8328cfb590447312..085ecc205c4d81cc3275f417c385dfcce425b7a3 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|Win32">
-      <Configuration>debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-assert|Win32">
-      <Configuration>release-assert</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- reverge_begin cpps -->
-    <ClInclude Include="..\..\test\zero_vec_test.cpp" />
-    <!-- reverge_end cpps -->
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4A732D1A-0B02-6761-18F1-75637D197D84}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <!-- reverge_begin defines(debug) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(debug) -->
-    <!-- reverge_begin includes(debug) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(debug) -->
-    <!-- reverge_begin options(debug) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(debug) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <!-- reverge_begin defines(release) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release) -->
-    <!-- reverge_begin includes(release) -->
-    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release) -->
-    <!-- reverge_begin options(release) -->
-    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">
-    <!-- reverge_begin defines(release-assert) -->
-    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>
-    <!-- reverge_end defines(release-assert) -->
-    <!-- reverge_begin includes(release-assert) -->
-    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>
-    <!-- reverge_end includes(release-assert) -->
-    <!-- reverge_begin options(release-assert) -->
-    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>
-    <!-- reverge_end options(release-assert) -->
-    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>
-    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>
-    <ExecutablePath>$(PATH)</ExecutablePath>
-    <IncludePath />
-    <ReferencePath />
-    <LibraryPath />
-    <LibraryWPath />
-    <SourcePath />
-    <ExcludePath />
-    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="debug|Win32">\r
+      <Configuration>debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release|Win32">\r
+      <Configuration>release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="release-assert|Win32">\r
+      <Configuration>release-assert</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup>\r
+    <BaseIntermediateOutputPath>$(SolutionDir)..\..\..\..\..\bld\msvc\lib\$(SolutionName)\$(ProjectName)</BaseIntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <!-- reverge_begin cpps -->\r
+    <ClInclude Include="..\..\test\zero_vec_test.cpp" />\r
+    <!-- reverge_end cpps -->\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4A732D1A-0B02-6761-18F1-75637D197D84}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">\r
+    <!-- reverge_begin defines(debug) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(debug) -->\r
+    <!-- reverge_begin includes(debug) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(debug) -->\r
+    <!-- reverge_begin options(debug) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MDd /Ob0 /Od /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(debug) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">\r
+    <!-- reverge_begin defines(release) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;NDEBUG;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release) -->\r
+    <!-- reverge_begin includes(release) -->\r
+    <NMakeIncludeSearchPath>;$(ProjectDir)..\..\..\..</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release) -->\r
+    <!-- reverge_begin options(release) -->\r
+    <AdditionalOptions>-TP -c /EHs /GR /MD /O2 /Ob2 /W3 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-assert|Win32'">\r
+    <!-- reverge_begin defines(release-assert) -->\r
+    <NMakePreprocessorDefinitions>BOOST_ALL_NO_LIB=1;</NMakePreprocessorDefinitions>\r
+    <!-- reverge_end defines(release-assert) -->\r
+    <!-- reverge_begin includes(release-assert) -->\r
+    <NMakeIncludeSearchPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt;$(ProjectDir)..\..\..\..\..\boost_1_60_0;$(ProjectDir)..\..\include</NMakeIncludeSearchPath>\r
+    <!-- reverge_end includes(release-assert) -->\r
+    <!-- reverge_begin options(release-assert) -->\r
+    <AdditionalOptions>-FC -TP -c -wd4018 -wd4180 -wd4244 -wd4267 -wd4355 -wd4512 -wd4624 -wd4800 -wd4996 /EHs /GR /MD /O2 /Ob2 /W3 /Z7 /Zc:forScope /Zc:wchar_t /favor:blend /wd4675 </AdditionalOptions>\r
+    <!-- reverge_end options(release-assert) -->\r
+    <OutDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</OutDir>\r
+    <IntDir>$(SolutionDir)..\..\..\..\..\bld\lib\$(SolutionName)\libs\$(SolutionName)\test\$(ProjectName).test\msvc-12.0\$(Configuration)\address-model-64\link-static\threading-multi\</IntDir>\r
+    <ExecutablePath>$(PATH)</ExecutablePath>\r
+    <IncludePath />\r
+    <ReferencePath />\r
+    <LibraryPath />\r
+    <LibraryWPath />\r
+    <SourcePath />\r
+    <ExcludePath />\r
+    <NMakeBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName)</NMakeBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)..\..\..\b2 address-model=64 variant=$(configuration) toolset=msvc-14.0 $(ProjectName) -a</NMakeReBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd $(SolutionDir)..\test &amp;&amp; $(SolutionDir)vcxproj.bat msvc-14.0 $(ProjectPath)</NMakeCleanCommandLine>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
 </Project>
\ No newline at end of file
index 68cfdfb68f5b7f5752d32d3ddf52d8de1180116b..20060cff0753f841dc5a39cb1d23413133cc09de 100644 (file)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\test\zero_vec_test.cpp">
-        <Filter>qvm\test</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="qvm">
-      <UniqueIdentifier>{4AC46ECD-66EA-75D8-3768-6B1B5C8C4188}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="qvm\test">
-      <UniqueIdentifier>{09D72191-451E-243A-4BCF-5FC837601AFD}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\test\zero_vec_test.cpp">\r
+        <Filter>qvm\test</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="qvm">\r
+      <UniqueIdentifier>{4AC46ECD-66EA-75D8-3768-6B1B5C8C4188}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="qvm\test">\r
+      <UniqueIdentifier>{09D72191-451E-243A-4BCF-5FC837601AFD}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+</Project>\r
index c48f8d7d538bd40e8915315242860246a9cf623d..00676cc8bf941229d06194a3238c304ece03c694 100644 (file)
@@ -1,15 +1,15 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv=refresh content="0; URL=doc/index.html">
-<title>Automatic redirection</title>
-</head>
-<body>
-Automatic redirection failed, please go to
-<a href="doc/index.html">index.html</a>.&nbsp;<hr>
-<p>© Copyright Beman Dawes, 2001</p>
-<p>Distributed under the Boost Software License, Version 1.0. (See accompanying 
-file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy 
-at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">\r
+<html>\r
+<head>\r
+<meta http-equiv=refresh content="0; URL=doc/index.html">\r
+<title>Automatic redirection</title>\r
+</head>\r
+<body>\r
+Automatic redirection failed, please go to\r
+<a href="doc/index.html">index.html</a>.&nbsp;<hr>\r
+<p>© Copyright Beman Dawes, 2001</p>\r
+<p>Distributed under the Boost Software License, Version 1.0. (See accompanying \r
+file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy \r
+at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>\r
+</body>\r
 </html>
\ No newline at end of file
index 6a164b79723dc1bb2a56877ba9014c4bb660e599..aa91d3c15b06e9f2403190de8913f5b812af5903 100644 (file)
@@ -1,17 +1,17 @@
-{
-    "key": "qvm",
-    "name": "QVM",
-    "authors": [
-        "Emil Dotchevski"
-    ],
-    "description": "Boost QVM is a generic library for working with quaternions, vectors and matrices of static size with the emphasis on 2, 3 and 4-dimensional operations needed in graphics, video games and simulation applications.",
-    "documentation": "doc/index.html",
-    "category": [
-               "Generic",
-               "Math",
-        "Algorithms"
-    ],
-    "maintainers": [
-        "Emil Dotchevski <emil@revergestudios.com>"
-    ]
-}
+{\r
+    "key": "qvm",\r
+    "name": "QVM",\r
+    "authors": [\r
+        "Emil Dotchevski"\r
+    ],\r
+    "description": "Boost QVM is a generic library for working with quaternions, vectors and matrices of static size with the emphasis on 2, 3 and 4-dimensional operations needed in graphics, video games and simulation applications.",\r
+    "documentation": "doc/index.html",\r
+    "category": [\r
+               "Generic",\r
+               "Math",\r
+        "Algorithms"\r
+    ],\r
+    "maintainers": [\r
+        "Emil Dotchevski <emil@revergestudios.com>"\r
+    ]\r
+}\r
index f3d0d71523220d74832fea6a7e3e3b9c35f4c6b6..dce27cec697f380b6e0511e342ba277b0498d2fa 100644 (file)
@@ -1,36 +1,36 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_access.hpp>
-
-template <int R,int C> struct my_mat { };
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        template <int R,int C>
-        struct
-        mat_traits< my_mat<R,C> >
-            {
-            typedef int scalar_type;
-            static int const rows=R;
-            static int const cols=C;
-            template <int Row,int Col> static int read_element( my_mat<R,C> const & );
-            template <int Row,int Col> static int & write_element( my_mat<R,C> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    my_mat<1,1> const m=my_mat<1,1>();
-    A11(m);
-    return 1;
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_access.hpp>\r
+\r
+template <int R,int C> struct my_mat { };\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        template <int R,int C>\r
+        struct\r
+        mat_traits< my_mat<R,C> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const rows=R;\r
+            static int const cols=C;\r
+            template <int Row,int Col> static int read_element( my_mat<R,C> const & );\r
+            template <int Row,int Col> static int & write_element( my_mat<R,C> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    my_mat<1,1> const m=my_mat<1,1>();\r
+    A11(m);\r
+    return 1;\r
+    }\r
index 855b2d76d1ef9ebfb695320fde73e52aedd34f2e..00ee189419191e2983b64efccbf29342b22e8892 100644 (file)
@@ -1,36 +1,36 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_access.hpp>
-
-template <int R,int C> struct my_mat { };
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        template <int R,int C>
-        struct
-        mat_traits< my_mat<R,C> >
-            {
-            typedef int scalar_type;
-            static int const rows=R;
-            static int const cols=C;
-            template <int Row,int Col> static int read_element( my_mat<R,C> const & );
-            template <int Row,int Col> static int & write_element( my_mat<R,C> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    my_mat<1,1> m;
-    A11(m);
-    return 1;
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_access.hpp>\r
+\r
+template <int R,int C> struct my_mat { };\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        template <int R,int C>\r
+        struct\r
+        mat_traits< my_mat<R,C> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const rows=R;\r
+            static int const cols=C;\r
+            template <int Row,int Col> static int read_element( my_mat<R,C> const & );\r
+            template <int Row,int Col> static int & write_element( my_mat<R,C> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    my_mat<1,1> m;\r
+    A11(m);\r
+    return 1;\r
+    }\r
index 3e8f0df64be20723050c56289933c7dd973c973d..efb54b42040a4ec85496947b272975cb25a86243 100644 (file)
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_access.hpp>
-#include "test_qvm_matrix.hpp"
-
-using namespace boost::qvm;
-
-template <int R,int C>
-void
-check_idx( test_qvm::matrix<M1,10,10> & m, float & (*f)( test_qvm::matrix<M1,10,10> & ) )
-    {
-    BOOST_TEST((&A<R,C>(m)==&m.a[R][C]));
-    BOOST_TEST((&f(m)==&m.a[R][C]));
-    }
-
-int
-main()
-    {       
-    test_qvm::matrix<M1,10,10> m;
-#define CHECK_A(i,j) check_idx<i,j>(m,A##i##j);
-    CHECK_A(0,0);
-    CHECK_A(0,1);
-    CHECK_A(0,2);
-    CHECK_A(0,3);
-    CHECK_A(0,4);
-    CHECK_A(0,5);
-    CHECK_A(0,6);
-    CHECK_A(0,7);
-    CHECK_A(0,8);
-    CHECK_A(0,9);
-    CHECK_A(1,0);
-    CHECK_A(1,1);
-    CHECK_A(1,2);
-    CHECK_A(1,3);
-    CHECK_A(1,4);
-    CHECK_A(1,5);
-    CHECK_A(1,6);
-    CHECK_A(1,7);
-    CHECK_A(1,8);
-    CHECK_A(1,9);
-    CHECK_A(2,0);
-    CHECK_A(2,1);
-    CHECK_A(2,2);
-    CHECK_A(2,3);
-    CHECK_A(2,4);
-    CHECK_A(2,5);
-    CHECK_A(2,6);
-    CHECK_A(2,7);
-    CHECK_A(2,8);
-    CHECK_A(2,9);
-    CHECK_A(3,0);
-    CHECK_A(3,1);
-    CHECK_A(3,2);
-    CHECK_A(3,3);
-    CHECK_A(3,4);
-    CHECK_A(3,5);
-    CHECK_A(3,6);
-    CHECK_A(3,7);
-    CHECK_A(3,8);
-    CHECK_A(3,9);
-    CHECK_A(4,0);
-    CHECK_A(4,1);
-    CHECK_A(4,2);
-    CHECK_A(4,3);
-    CHECK_A(4,4);
-    CHECK_A(4,5);
-    CHECK_A(4,6);
-    CHECK_A(4,7);
-    CHECK_A(4,8);
-    CHECK_A(4,9);
-    CHECK_A(5,0);
-    CHECK_A(5,1);
-    CHECK_A(5,2);
-    CHECK_A(5,3);
-    CHECK_A(5,4);
-    CHECK_A(5,5);
-    CHECK_A(5,6);
-    CHECK_A(5,7);
-    CHECK_A(5,8);
-    CHECK_A(5,9);
-    CHECK_A(6,0);
-    CHECK_A(6,1);
-    CHECK_A(6,2);
-    CHECK_A(6,3);
-    CHECK_A(6,4);
-    CHECK_A(6,5);
-    CHECK_A(6,6);
-    CHECK_A(6,7);
-    CHECK_A(6,8);
-    CHECK_A(6,9);
-    CHECK_A(7,0);
-    CHECK_A(7,1);
-    CHECK_A(7,2);
-    CHECK_A(7,3);
-    CHECK_A(7,4);
-    CHECK_A(7,5);
-    CHECK_A(7,6);
-    CHECK_A(7,7);
-    CHECK_A(7,8);
-    CHECK_A(7,9);
-    CHECK_A(8,0);
-    CHECK_A(8,1);
-    CHECK_A(8,2);
-    CHECK_A(8,3);
-    CHECK_A(8,4);
-    CHECK_A(8,5);
-    CHECK_A(8,6);
-    CHECK_A(8,7);
-    CHECK_A(8,8);
-    CHECK_A(8,9);
-    CHECK_A(9,0);
-    CHECK_A(9,1);
-    CHECK_A(9,2);
-    CHECK_A(9,3);
-    CHECK_A(9,4);
-    CHECK_A(9,5);
-    CHECK_A(9,6);
-    CHECK_A(9,7);
-    CHECK_A(9,8);
-    CHECK_A(9,9);
-#undef CHECK_A
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_access.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+\r
+using namespace boost::qvm;\r
+\r
+template <int R,int C>\r
+void\r
+check_idx( test_qvm::matrix<M1,10,10> & m, float & (*f)( test_qvm::matrix<M1,10,10> & ) )\r
+    {\r
+    BOOST_TEST((&A<R,C>(m)==&m.a[R][C]));\r
+    BOOST_TEST((&f(m)==&m.a[R][C]));\r
+    }\r
+\r
+int\r
+main()\r
+    {       \r
+    test_qvm::matrix<M1,10,10> m;\r
+#define CHECK_A(i,j) check_idx<i,j>(m,A##i##j);\r
+    CHECK_A(0,0);\r
+    CHECK_A(0,1);\r
+    CHECK_A(0,2);\r
+    CHECK_A(0,3);\r
+    CHECK_A(0,4);\r
+    CHECK_A(0,5);\r
+    CHECK_A(0,6);\r
+    CHECK_A(0,7);\r
+    CHECK_A(0,8);\r
+    CHECK_A(0,9);\r
+    CHECK_A(1,0);\r
+    CHECK_A(1,1);\r
+    CHECK_A(1,2);\r
+    CHECK_A(1,3);\r
+    CHECK_A(1,4);\r
+    CHECK_A(1,5);\r
+    CHECK_A(1,6);\r
+    CHECK_A(1,7);\r
+    CHECK_A(1,8);\r
+    CHECK_A(1,9);\r
+    CHECK_A(2,0);\r
+    CHECK_A(2,1);\r
+    CHECK_A(2,2);\r
+    CHECK_A(2,3);\r
+    CHECK_A(2,4);\r
+    CHECK_A(2,5);\r
+    CHECK_A(2,6);\r
+    CHECK_A(2,7);\r
+    CHECK_A(2,8);\r
+    CHECK_A(2,9);\r
+    CHECK_A(3,0);\r
+    CHECK_A(3,1);\r
+    CHECK_A(3,2);\r
+    CHECK_A(3,3);\r
+    CHECK_A(3,4);\r
+    CHECK_A(3,5);\r
+    CHECK_A(3,6);\r
+    CHECK_A(3,7);\r
+    CHECK_A(3,8);\r
+    CHECK_A(3,9);\r
+    CHECK_A(4,0);\r
+    CHECK_A(4,1);\r
+    CHECK_A(4,2);\r
+    CHECK_A(4,3);\r
+    CHECK_A(4,4);\r
+    CHECK_A(4,5);\r
+    CHECK_A(4,6);\r
+    CHECK_A(4,7);\r
+    CHECK_A(4,8);\r
+    CHECK_A(4,9);\r
+    CHECK_A(5,0);\r
+    CHECK_A(5,1);\r
+    CHECK_A(5,2);\r
+    CHECK_A(5,3);\r
+    CHECK_A(5,4);\r
+    CHECK_A(5,5);\r
+    CHECK_A(5,6);\r
+    CHECK_A(5,7);\r
+    CHECK_A(5,8);\r
+    CHECK_A(5,9);\r
+    CHECK_A(6,0);\r
+    CHECK_A(6,1);\r
+    CHECK_A(6,2);\r
+    CHECK_A(6,3);\r
+    CHECK_A(6,4);\r
+    CHECK_A(6,5);\r
+    CHECK_A(6,6);\r
+    CHECK_A(6,7);\r
+    CHECK_A(6,8);\r
+    CHECK_A(6,9);\r
+    CHECK_A(7,0);\r
+    CHECK_A(7,1);\r
+    CHECK_A(7,2);\r
+    CHECK_A(7,3);\r
+    CHECK_A(7,4);\r
+    CHECK_A(7,5);\r
+    CHECK_A(7,6);\r
+    CHECK_A(7,7);\r
+    CHECK_A(7,8);\r
+    CHECK_A(7,9);\r
+    CHECK_A(8,0);\r
+    CHECK_A(8,1);\r
+    CHECK_A(8,2);\r
+    CHECK_A(8,3);\r
+    CHECK_A(8,4);\r
+    CHECK_A(8,5);\r
+    CHECK_A(8,6);\r
+    CHECK_A(8,7);\r
+    CHECK_A(8,8);\r
+    CHECK_A(8,9);\r
+    CHECK_A(9,0);\r
+    CHECK_A(9,1);\r
+    CHECK_A(9,2);\r
+    CHECK_A(9,3);\r
+    CHECK_A(9,4);\r
+    CHECK_A(9,5);\r
+    CHECK_A(9,6);\r
+    CHECK_A(9,7);\r
+    CHECK_A(9,8);\r
+    CHECK_A(9,9);\r
+#undef CHECK_A\r
+    return boost::report_errors();\r
+    }\r
index fdeb7efc649ae44f9debad61a3392db2a74db0d5..8a3849534266a27fe027aafc11a4fd432c7a6655 100644 (file)
@@ -1,35 +1,35 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_access.hpp>
-#include <boost/qvm/vec_access.hpp>
-
-struct my_quat { };
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        template <>
-        struct
-        quat_traits<my_quat>
-            {
-            typedef int scalar_type;
-            template <int I> static int read_element( my_quat const & );
-            template <int I> static int & write_element( my_quat & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    my_quat const q=my_quat();
-    A<3>(V(q));
-    return 1;
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_access.hpp>\r
+#include <boost/qvm/vec_access.hpp>\r
+\r
+struct my_quat { };\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        template <>\r
+        struct\r
+        quat_traits<my_quat>\r
+            {\r
+            typedef int scalar_type;\r
+            template <int I> static int read_element( my_quat const & );\r
+            template <int I> static int & write_element( my_quat & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    my_quat const q=my_quat();\r
+    A<3>(V(q));\r
+    return 1;\r
+    }\r
index 063c2e50d5b6e4e168083c22978d05b2d4a9a46e..9d089b9d47f48fe9f0a75361c7f8a645160d14de 100644 (file)
@@ -1,39 +1,39 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_access.hpp>
-#include <boost/qvm/vec_access.hpp>
-#include "test_qvm_quaternion.hpp"
-
-int
-main()
-    {       
-    using namespace boost::qvm;
-
-    test_qvm::quaternion<Q1> q;
-    q.a[0]=42.0f;
-    q.a[1]=43.0f;
-    q.a[2]=44.0f;
-    q.a[3]=45.0f;
-    test_qvm::quaternion<Q1> const & qq=q;
-
-    BOOST_TEST_EQ(X(V(qq)),q.a[1]);
-    BOOST_TEST_EQ(Y(V(qq)),q.a[2]);
-    BOOST_TEST_EQ(Z(V(qq)),q.a[3]);
-    BOOST_TEST(&X(V(q))==&q.a[1]);
-    BOOST_TEST(&Y(V(q))==&q.a[2]);
-    BOOST_TEST(&Z(V(q))==&q.a[3]);
-
-    BOOST_TEST_EQ(S(qq),q.a[0]);
-    BOOST_TEST_EQ(X(qq),q.a[1]);
-    BOOST_TEST_EQ(Y(qq),q.a[2]);
-    BOOST_TEST_EQ(Z(qq),q.a[3]);
-    BOOST_TEST(&S(q)==&q.a[0]);
-    BOOST_TEST(&X(q)==&q.a[1]);
-    BOOST_TEST(&Y(q)==&q.a[2]);
-    BOOST_TEST(&Z(q)==&q.a[3]);
-
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_access.hpp>\r
+#include <boost/qvm/vec_access.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+\r
+int\r
+main()\r
+    {       \r
+    using namespace boost::qvm;\r
+\r
+    test_qvm::quaternion<Q1> q;\r
+    q.a[0]=42.0f;\r
+    q.a[1]=43.0f;\r
+    q.a[2]=44.0f;\r
+    q.a[3]=45.0f;\r
+    test_qvm::quaternion<Q1> const & qq=q;\r
+\r
+    BOOST_TEST_EQ(X(V(qq)),q.a[1]);\r
+    BOOST_TEST_EQ(Y(V(qq)),q.a[2]);\r
+    BOOST_TEST_EQ(Z(V(qq)),q.a[3]);\r
+    BOOST_TEST(&X(V(q))==&q.a[1]);\r
+    BOOST_TEST(&Y(V(q))==&q.a[2]);\r
+    BOOST_TEST(&Z(V(q))==&q.a[3]);\r
+\r
+    BOOST_TEST_EQ(S(qq),q.a[0]);\r
+    BOOST_TEST_EQ(X(qq),q.a[1]);\r
+    BOOST_TEST_EQ(Y(qq),q.a[2]);\r
+    BOOST_TEST_EQ(Z(qq),q.a[3]);\r
+    BOOST_TEST(&S(q)==&q.a[0]);\r
+    BOOST_TEST(&X(q)==&q.a[1]);\r
+    BOOST_TEST(&Y(q)==&q.a[2]);\r
+    BOOST_TEST(&Z(q)==&q.a[3]);\r
+\r
+    return boost::report_errors();\r
+    }\r
index cd801767b2da55f6cd8a090f5907539ad9ee5a60..f18212a3f799d9a54af80ef08ceee84c174f2e64 100644 (file)
@@ -1,35 +1,35 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_access.hpp>
-
-template <int D> struct my_vec { };
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        template <int D>
-        struct
-        vec_traits< my_vec<D> >
-            {
-            typedef int scalar_type;
-            static int const dim=D;
-            template <int I> static int read_element( my_vec<D> const & );
-            template <int I> static int & write_element( my_vec<D> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    my_vec<1> const v=my_vec<1>();
-    A1(v);
-    return 1;
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_access.hpp>\r
+\r
+template <int D> struct my_vec { };\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        template <int D>\r
+        struct\r
+        vec_traits< my_vec<D> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const dim=D;\r
+            template <int I> static int read_element( my_vec<D> const & );\r
+            template <int I> static int & write_element( my_vec<D> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    my_vec<1> const v=my_vec<1>();\r
+    A1(v);\r
+    return 1;\r
+    }\r
index c2feb4da736d08334e1490c1231a29861bf2f13f..d998b0a32120c6ea0c8686f35d8f1521ed8a13a2 100644 (file)
@@ -1,35 +1,35 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_access.hpp>
-
-template <int D> struct my_vec { };
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        template <int D>
-        struct
-        vec_traits< my_vec<D> >
-            {
-            typedef int scalar_type;
-            static int const dim=D;
-            template <int I> static int read_element( my_vec<D> const & );
-            template <int I> static int & write_element( my_vec<D> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    my_vec<1> v;
-    A1(v);
-    return 1;
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_access.hpp>\r
+\r
+template <int D> struct my_vec { };\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        template <int D>\r
+        struct\r
+        vec_traits< my_vec<D> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const dim=D;\r
+            template <int I> static int read_element( my_vec<D> const & );\r
+            template <int I> static int & write_element( my_vec<D> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    my_vec<1> v;\r
+    A1(v);\r
+    return 1;\r
+    }\r
index 9d355a372c12fd7a56b573f04293673a112a6abe..17a1e18741eda21f462f32bf6f6155c8e46d5dd7 100644 (file)
@@ -1,40 +1,40 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_access.hpp>
-#include "test_qvm_vector.hpp"
-
-using namespace boost::qvm;
-
-template <int I>
-void
-check_idx( test_qvm::vector<V1,10> & v, float & (*f)( test_qvm::vector<V1,10> & ) )
-    {
-    BOOST_TEST((&A<I>(v)==&v.a[I]));
-    BOOST_TEST((&f(v)==&v.a[I]));
-    }
-
-int
-main()
-    {       
-    test_qvm::vector<V1,10> v;
-#define CHECK_A(i) check_idx<i>(v,A##i);
-    CHECK_A(0);
-    CHECK_A(1);
-    CHECK_A(2);
-    CHECK_A(3);
-    CHECK_A(4);
-    CHECK_A(5);
-    CHECK_A(6);
-    CHECK_A(7);
-    CHECK_A(8);
-    CHECK_A(9);
-#undef CHECK_A
-    BOOST_TEST(&A<0>(v)==&X(v));
-    BOOST_TEST(&A<1>(v)==&Y(v));
-    BOOST_TEST(&A<2>(v)==&Z(v));
-    BOOST_TEST(&A<3>(v)==&W(v));
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_access.hpp>\r
+#include "test_qvm_vector.hpp"\r
+\r
+using namespace boost::qvm;\r
+\r
+template <int I>\r
+void\r
+check_idx( test_qvm::vector<V1,10> & v, float & (*f)( test_qvm::vector<V1,10> & ) )\r
+    {\r
+    BOOST_TEST((&A<I>(v)==&v.a[I]));\r
+    BOOST_TEST((&f(v)==&v.a[I]));\r
+    }\r
+\r
+int\r
+main()\r
+    {       \r
+    test_qvm::vector<V1,10> v;\r
+#define CHECK_A(i) check_idx<i>(v,A##i);\r
+    CHECK_A(0);\r
+    CHECK_A(1);\r
+    CHECK_A(2);\r
+    CHECK_A(3);\r
+    CHECK_A(4);\r
+    CHECK_A(5);\r
+    CHECK_A(6);\r
+    CHECK_A(7);\r
+    CHECK_A(8);\r
+    CHECK_A(9);\r
+#undef CHECK_A\r
+    BOOST_TEST(&A<0>(v)==&X(v));\r
+    BOOST_TEST(&A<1>(v)==&Y(v));\r
+    BOOST_TEST(&A<2>(v)==&Z(v));\r
+    BOOST_TEST(&A<3>(v)==&W(v));\r
+    return boost::report_errors();\r
+    }\r
index 96ff1cea345d99f495ee8a7c29a163286731f2b8..70822e4bc9a1bf652ce924a399d5c2b7a30f5ca5 100644 (file)
@@ -1,70 +1,70 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "test_qvm_quaternion.hpp"
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols>
-    void
-    test_matrix()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> const x(42,1);
-        test_qvm::matrix<M2,Rows,Cols> y(43,1);
-        assign(y,x);
-        BOOST_QVM_TEST_EQ(x.a,y.a);
-        }
-
-    template <int Dim>
-    void
-    test_vector()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> const x(42,1);
-        test_qvm::vector<V2,Dim> y(43,1);
-        assign(y,x);
-        BOOST_QVM_TEST_EQ(x.a,y.a);
-        }
-
-    void
-    test_quaternion()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> const x(42,1);
-        test_qvm::quaternion<Q2> y(43,1);
-        assign(y,x);
-        BOOST_QVM_TEST_EQ(x.a,y.a);
-        }
-    }
-
-int
-main()
-    {
-    test_matrix<1,2>();
-    test_matrix<2,1>();
-    test_matrix<2,2>();
-    test_matrix<1,3>();
-    test_matrix<3,1>();
-    test_matrix<3,3>();
-    test_matrix<1,4>();
-    test_matrix<4,1>();
-    test_matrix<4,4>();
-    test_matrix<1,5>();
-    test_matrix<5,1>();
-    test_matrix<5,5>();
-    test_vector<2>();
-    test_vector<3>();
-    test_vector<4>();
-    test_vector<5>();
-    test_quaternion();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "test_qvm_quaternion.hpp"\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols>\r
+    void\r
+    test_matrix()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> const x(42,1);\r
+        test_qvm::matrix<M2,Rows,Cols> y(43,1);\r
+        assign(y,x);\r
+        BOOST_QVM_TEST_EQ(x.a,y.a);\r
+        }\r
+\r
+    template <int Dim>\r
+    void\r
+    test_vector()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> const x(42,1);\r
+        test_qvm::vector<V2,Dim> y(43,1);\r
+        assign(y,x);\r
+        BOOST_QVM_TEST_EQ(x.a,y.a);\r
+        }\r
+\r
+    void\r
+    test_quaternion()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> const x(42,1);\r
+        test_qvm::quaternion<Q2> y(43,1);\r
+        assign(y,x);\r
+        BOOST_QVM_TEST_EQ(x.a,y.a);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test_matrix<1,2>();\r
+    test_matrix<2,1>();\r
+    test_matrix<2,2>();\r
+    test_matrix<1,3>();\r
+    test_matrix<3,1>();\r
+    test_matrix<3,3>();\r
+    test_matrix<1,4>();\r
+    test_matrix<4,1>();\r
+    test_matrix<4,4>();\r
+    test_matrix<1,5>();\r
+    test_matrix<5,1>();\r
+    test_matrix<5,5>();\r
+    test_vector<2>();\r
+    test_vector<3>();\r
+    test_vector<4>();\r
+    test_vector<5>();\r
+    test_quaternion();\r
+    return boost::report_errors();\r
+    }\r
index da85e6ef4f8c14f3cd92d8edff2fb23cfbfa91a6..6ef19b1dae137342d805e697a01412b072b96cec 100644 (file)
@@ -1,54 +1,54 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> const x(42,1);
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols; ++j )
-                {
-                    {
-                    test_qvm::matrix<M1,Rows,Cols> y(x);
-                    BOOST_QVM_TEST_EQ(x,y);
-                    y.a[i][j]=0;
-                    BOOST_QVM_TEST_NEQ(x,y);
-                    }
-                    {
-                    test_qvm::matrix<M2,Rows,Cols> y; assign(y,x);
-                    BOOST_QVM_TEST_EQ(x,y);
-                    y.a[i][j]=0;
-                    BOOST_QVM_TEST_NEQ(x,y);
-                    }
-                }
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> const x(42,1);\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                {\r
+                    {\r
+                    test_qvm::matrix<M1,Rows,Cols> y(x);\r
+                    BOOST_QVM_TEST_EQ(x,y);\r
+                    y.a[i][j]=0;\r
+                    BOOST_QVM_TEST_NEQ(x,y);\r
+                    }\r
+                    {\r
+                    test_qvm::matrix<M2,Rows,Cols> y; assign(y,x);\r
+                    BOOST_QVM_TEST_EQ(x,y);\r
+                    y.a[i][j]=0;\r
+                    BOOST_QVM_TEST_NEQ(x,y);\r
+                    }\r
+                }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index 6d71f8573f35c637baefad6ec48b6de34ea3c0e9..48d824d3539569d69ff94f449fdbcc187e69bb20 100644 (file)
@@ -1,35 +1,35 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Qersion 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-#include <functional>
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> const x(42,1);
-        for( int i=0; i!=4; ++i )
-            {
-                {
-                test_qvm::quaternion<Q1> y(x);
-                BOOST_TEST(cmp(x,y,std::equal_to<float>()));
-                y.a[i]=0;
-                BOOST_TEST(!cmp(x,y,std::equal_to<float>()));
-                }
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Qersion 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+#include <functional>\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> const x(42,1);\r
+        for( int i=0; i!=4; ++i )\r
+            {\r
+                {\r
+                test_qvm::quaternion<Q1> y(x);\r
+                BOOST_TEST(cmp(x,y,std::equal_to<float>()));\r
+                y.a[i]=0;\r
+                BOOST_TEST(!cmp(x,y,std::equal_to<float>()));\r
+                }\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index cad7ea3b2bed9c8e038ce26b38a0000119738a8b..81856ecb99afbce964a75002ea51a64d8980b973 100644 (file)
@@ -1,40 +1,40 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec_traits_array.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-#include <functional>
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> const x(42,1);
-        for( int i=0; i!=Dim; ++i )
-            {
-                {
-                test_qvm::vector<V1,Dim> y(x);
-                BOOST_TEST(cmp(x,y,std::equal_to<float>()));
-                y.a[i]=0;
-                BOOST_TEST(!cmp(x,y,std::equal_to<float>()));
-                }
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec_traits_array.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+#include <functional>\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> const x(42,1);\r
+        for( int i=0; i!=Dim; ++i )\r
+            {\r
+                {\r
+                test_qvm::vector<V1,Dim> y(x);\r
+                BOOST_TEST(cmp(x,y,std::equal_to<float>()));\r
+                y.a[i]=0;\r
+                BOOST_TEST(!cmp(x,y,std::equal_to<float>()));\r
+                }\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 6d325971e7a761d198d3961db20e678b4563eccb..2b5ecaa60276909071523ee377960a08fc3ce090 100644 (file)
@@ -1,40 +1,40 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::vector<V1,Dim> x(42,1);
-        float y[1][Dim]; assign(y,transposed(col_mat(x)));
-        BOOST_QVM_TEST_EQ(x.a,y[0]);
-        test_qvm::scalar_multiply_v(x.b,x.a,2.0f);
-        col<0>(col_mat(x)) *= 2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        col_mat(x)+col_mat(x);
-        -col_mat(x);
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::vector<V1,Dim> x(42,1);\r
+        float y[1][Dim]; assign(y,transposed(col_mat(x)));\r
+        BOOST_QVM_TEST_EQ(x.a,y[0]);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,2.0f);\r
+        col<0>(col_mat(x)) *= 2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        col_mat(x)+col_mat(x);\r
+        -col_mat(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 238c97e909a05931d8d259c6f9d6b534bc035792..44cf87b66a959216ba9b54f24bfc65a7d6526edc 100644 (file)
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map_mat_vec.hpp>
-#include <boost/qvm/vec_traits_array.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include "test_qvm.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols,int Col>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        float r1[Rows];
-        for( int i=0; i!=Rows; ++i )
-            r1[i]=x.a[i][Col];
-        float r2[Rows];
-        assign(r2,col<Col>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        col<Col>(x) *= 2;
-        for( int i=0; i!=Rows; ++i )
-            r1[i]=x.a[i][Col];
-        assign(r2,col<Col>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        col<Col>(x) + col<Col>(x);
-        -col<Col>(x);
-        }
-    }
-
-int
-main()
-    {
-    test<1,2,0>();
-    test<1,2,1>();
-    test<1,3,0>();
-    test<1,3,1>();
-    test<1,3,2>();
-    test<1,4,0>();
-    test<1,4,1>();
-    test<1,4,2>();
-    test<1,4,3>();
-    test<1,5,0>();
-    test<1,5,1>();
-    test<1,5,2>();
-    test<1,5,3>();
-    test<1,5,4>();
-
-    test<2,2,0>();
-    test<2,2,1>();
-    test<2,3,0>();
-    test<2,3,1>();
-    test<2,3,2>();
-    test<2,4,0>();
-    test<2,4,1>();
-    test<2,4,2>();
-    test<2,4,3>();
-    test<2,5,0>();
-    test<2,5,1>();
-    test<2,5,2>();
-    test<2,5,3>();
-    test<2,5,4>();
-
-    test<3,2,0>();
-    test<3,2,1>();
-    test<3,3,0>();
-    test<3,3,1>();
-    test<3,3,2>();
-    test<3,4,0>();
-    test<3,4,1>();
-    test<3,4,2>();
-    test<3,4,3>();
-    test<3,5,0>();
-    test<3,5,1>();
-    test<3,5,2>();
-    test<3,5,3>();
-    test<3,5,4>();
-
-    test<4,2,0>();
-    test<4,2,1>();
-    test<4,3,0>();
-    test<4,3,1>();
-    test<4,3,2>();
-    test<4,4,0>();
-    test<4,4,1>();
-    test<4,4,2>();
-    test<4,4,3>();
-    test<4,5,0>();
-    test<4,5,1>();
-    test<4,5,2>();
-    test<4,5,3>();
-    test<4,5,4>();
-
-    test<5,2,0>();
-    test<5,2,1>();
-    test<5,3,0>();
-    test<5,3,1>();
-    test<5,3,2>();
-    test<5,4,0>();
-    test<5,4,1>();
-    test<5,4,2>();
-    test<5,4,3>();
-    test<5,5,0>();
-    test<5,5,1>();
-    test<5,5,2>();
-    test<5,5,3>();
-    test<5,5,4>();
-
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map_mat_vec.hpp>\r
+#include <boost/qvm/vec_traits_array.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include "test_qvm.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols,int Col>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        float r1[Rows];\r
+        for( int i=0; i!=Rows; ++i )\r
+            r1[i]=x.a[i][Col];\r
+        float r2[Rows];\r
+        assign(r2,col<Col>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        col<Col>(x) *= 2;\r
+        for( int i=0; i!=Rows; ++i )\r
+            r1[i]=x.a[i][Col];\r
+        assign(r2,col<Col>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        col<Col>(x) + col<Col>(x);\r
+        -col<Col>(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2,0>();\r
+    test<1,2,1>();\r
+    test<1,3,0>();\r
+    test<1,3,1>();\r
+    test<1,3,2>();\r
+    test<1,4,0>();\r
+    test<1,4,1>();\r
+    test<1,4,2>();\r
+    test<1,4,3>();\r
+    test<1,5,0>();\r
+    test<1,5,1>();\r
+    test<1,5,2>();\r
+    test<1,5,3>();\r
+    test<1,5,4>();\r
+\r
+    test<2,2,0>();\r
+    test<2,2,1>();\r
+    test<2,3,0>();\r
+    test<2,3,1>();\r
+    test<2,3,2>();\r
+    test<2,4,0>();\r
+    test<2,4,1>();\r
+    test<2,4,2>();\r
+    test<2,4,3>();\r
+    test<2,5,0>();\r
+    test<2,5,1>();\r
+    test<2,5,2>();\r
+    test<2,5,3>();\r
+    test<2,5,4>();\r
+\r
+    test<3,2,0>();\r
+    test<3,2,1>();\r
+    test<3,3,0>();\r
+    test<3,3,1>();\r
+    test<3,3,2>();\r
+    test<3,4,0>();\r
+    test<3,4,1>();\r
+    test<3,4,2>();\r
+    test<3,4,3>();\r
+    test<3,5,0>();\r
+    test<3,5,1>();\r
+    test<3,5,2>();\r
+    test<3,5,3>();\r
+    test<3,5,4>();\r
+\r
+    test<4,2,0>();\r
+    test<4,2,1>();\r
+    test<4,3,0>();\r
+    test<4,3,1>();\r
+    test<4,3,2>();\r
+    test<4,4,0>();\r
+    test<4,4,1>();\r
+    test<4,4,2>();\r
+    test<4,4,3>();\r
+    test<4,5,0>();\r
+    test<4,5,1>();\r
+    test<4,5,2>();\r
+    test<4,5,3>();\r
+    test<4,5,4>();\r
+\r
+    test<5,2,0>();\r
+    test<5,2,1>();\r
+    test<5,3,0>();\r
+    test<5,3,1>();\r
+    test<5,3,2>();\r
+    test<5,4,0>();\r
+    test<5,4,1>();\r
+    test<5,4,2>();\r
+    test<5,4,3>();\r
+    test<5,5,0>();\r
+    test<5,5,1>();\r
+    test<5,5,2>();\r
+    test<5,5,3>();\r
+    test<5,5,4>();\r
+\r
+    return boost::report_errors();\r
+    }\r
index ca1ac69e44c8aa6fdaf0d2db873fe83e8fa14ec9..794556f7a9cf0ec49ac68f5f4db55bc23b506e62 100644 (file)
@@ -1,41 +1,41 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> const x(42,1);
-        test_qvm::scalar_multiply_v(x.b,x.a,-1.0f);
-        x.b[0]=-x.b[0];
-        test_same_type(x,conjugate(x));
-            {
-            test_qvm::quaternion<Q1> y=conjugate(x);
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-            {
-            test_qvm::quaternion<Q1> y=conjugate(qref(x));
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> const x(42,1);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,-1.0f);\r
+        x.b[0]=-x.b[0];\r
+        test_same_type(x,conjugate(x));\r
+            {\r
+            test_qvm::quaternion<Q1> y=conjugate(x);\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+            {\r
+            test_qvm::quaternion<Q1> y=conjugate(qref(x));\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index c1d0edfea460d96d5e99b1f642b64e91179bd410..7f2074fea2e5d79853b15e34eb60fdaed979fbb7 100644 (file)
@@ -1,86 +1,86 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/operations.hpp>
-#include <boost/qvm/map_mat_mat.hpp>
-#include "test_qvm_matrix.hpp"
-#include "test_qvm_quaternion.hpp"
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols>
-    void
-    test_matrix()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> const x(42,1);
-        test_qvm::matrix<M2,Rows,Cols> const y=convert_to< test_qvm::matrix<M2,Rows,Cols> >(x);
-        BOOST_QVM_TEST_EQ(x.a,y.a);
-        }
-
-    template <int Dim>
-    void
-    test_vector()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> const x(42,1);
-        test_qvm::vector<V2,Dim> const y=convert_to< test_qvm::vector<V2,Dim> >(x);
-        BOOST_QVM_TEST_EQ(x.a,y.a);
-        }
-
-    void
-    test_quaternion()
-        {
-        using namespace boost::qvm;
-        test_qvm::quaternion<Q1> x(42,1);
-        normalize(x);
-            {
-            test_qvm::quaternion<Q2> const y=convert_to< test_qvm::quaternion<Q2> >(x);
-            BOOST_QVM_TEST_EQ(x.a,y.a);
-            }
-            {
-            test_qvm::matrix<M1,3,3> const my=convert_to< test_qvm::matrix<M1,3,3> >(x);
-            test_qvm::quaternion<Q1> const qy=convert_to< test_qvm::quaternion<Q1> >(my);
-            BOOST_QVM_TEST_CLOSE(x.a,qy.a,0.00001f);
-            }
-            {
-            test_qvm::matrix<M1,4,4> const my=convert_to< test_qvm::matrix<M1,4,4> >(x);
-            BOOST_TEST(my.a[0][3]==0);
-            BOOST_TEST(my.a[1][3]==0);
-            BOOST_TEST(my.a[2][3]==0);
-            BOOST_TEST(my.a[3][0]==0);
-            BOOST_TEST(my.a[3][1]==0);
-            BOOST_TEST(my.a[3][2]==0);
-            BOOST_TEST(my.a[3][3]==1);
-            test_qvm::quaternion<Q1> const qy=convert_to< test_qvm::quaternion<Q1> >(del_row_col<3,3>(my));
-            BOOST_QVM_TEST_CLOSE(x.a,qy.a,0.00001f);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test_matrix<1,2>();
-    test_matrix<2,1>();
-    test_matrix<2,2>();
-    test_matrix<1,3>();
-    test_matrix<3,1>();
-    test_matrix<3,3>();
-    test_matrix<1,4>();
-    test_matrix<4,1>();
-    test_matrix<4,4>();
-    test_matrix<1,5>();
-    test_matrix<5,1>();
-    test_matrix<5,5>();
-    test_quaternion();
-    test_vector<2>();
-    test_vector<3>();
-    test_vector<4>();
-    test_vector<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/operations.hpp>\r
+#include <boost/qvm/map_mat_mat.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "test_qvm_quaternion.hpp"\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols>\r
+    void\r
+    test_matrix()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> const x(42,1);\r
+        test_qvm::matrix<M2,Rows,Cols> const y=convert_to< test_qvm::matrix<M2,Rows,Cols> >(x);\r
+        BOOST_QVM_TEST_EQ(x.a,y.a);\r
+        }\r
+\r
+    template <int Dim>\r
+    void\r
+    test_vector()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> const x(42,1);\r
+        test_qvm::vector<V2,Dim> const y=convert_to< test_qvm::vector<V2,Dim> >(x);\r
+        BOOST_QVM_TEST_EQ(x.a,y.a);\r
+        }\r
+\r
+    void\r
+    test_quaternion()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::quaternion<Q1> x(42,1);\r
+        normalize(x);\r
+            {\r
+            test_qvm::quaternion<Q2> const y=convert_to< test_qvm::quaternion<Q2> >(x);\r
+            BOOST_QVM_TEST_EQ(x.a,y.a);\r
+            }\r
+            {\r
+            test_qvm::matrix<M1,3,3> const my=convert_to< test_qvm::matrix<M1,3,3> >(x);\r
+            test_qvm::quaternion<Q1> const qy=convert_to< test_qvm::quaternion<Q1> >(my);\r
+            BOOST_QVM_TEST_CLOSE(x.a,qy.a,0.00001f);\r
+            }\r
+            {\r
+            test_qvm::matrix<M1,4,4> const my=convert_to< test_qvm::matrix<M1,4,4> >(x);\r
+            BOOST_TEST(my.a[0][3]==0);\r
+            BOOST_TEST(my.a[1][3]==0);\r
+            BOOST_TEST(my.a[2][3]==0);\r
+            BOOST_TEST(my.a[3][0]==0);\r
+            BOOST_TEST(my.a[3][1]==0);\r
+            BOOST_TEST(my.a[3][2]==0);\r
+            BOOST_TEST(my.a[3][3]==1);\r
+            test_qvm::quaternion<Q1> const qy=convert_to< test_qvm::quaternion<Q1> >(del_row_col<3,3>(my));\r
+            BOOST_QVM_TEST_CLOSE(x.a,qy.a,0.00001f);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test_matrix<1,2>();\r
+    test_matrix<2,1>();\r
+    test_matrix<2,2>();\r
+    test_matrix<1,3>();\r
+    test_matrix<3,1>();\r
+    test_matrix<3,3>();\r
+    test_matrix<1,4>();\r
+    test_matrix<4,1>();\r
+    test_matrix<4,4>();\r
+    test_matrix<1,5>();\r
+    test_matrix<5,1>();\r
+    test_matrix<5,5>();\r
+    test_quaternion();\r
+    test_vector<2>();\r
+    test_vector<3>();\r
+    test_vector<4>();\r
+    test_vector<5>();\r
+    return boost::report_errors();\r
+    }\r
index 9f752a1713bd4ec5605b9794ba4d54abe4625f76..ea423417dede73689b148dd708cd01f71a73e155 100644 (file)
@@ -1,56 +1,56 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec_access.hpp>
-#include <boost/qvm/mat_access.hpp>
-#include <boost/qvm/vec_operations3.hpp>
-#include <boost/qvm/vec.hpp>
-//#include <boost/qvm/quat_traits.hpp>
-#include "test_qvm_vector.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    test_qvm::vector<V1,3> x(42,1);
-    test_qvm::vector<V1,3> y=x*2;
-    test_qvm::matrix<M1,3,3> m;
-    A00(m) = 0;
-    A01(m) = -A2(x);
-    A02(m) = A1(x);
-    A10(m) = A2(x);
-    A11(m) = 0;
-    A12(m) = -A0(x);
-    A20(m) = -A1(x);
-    A21(m) = A0(x);
-    A22(m) = 0;
-        {
-        test_same_type(x,cross(x,y));
-        test_qvm::vector<V1,3> c=cross(x,y);
-        test_qvm::multiply_mv(c.b,m.a,y.a);
-        BOOST_QVM_TEST_EQ(c.a,c.b);
-        }
-        {
-        test_qvm::vector<V2,3> c=cross(vref(x),y);
-        test_qvm::multiply_mv(c.b,m.a,y.a);
-        BOOST_QVM_TEST_EQ(c.a,c.b);
-        }
-        {
-        test_qvm::vector<V2,3> c=cross(x,vref(y));
-        test_qvm::multiply_mv(c.b,m.a,y.a);
-        BOOST_QVM_TEST_EQ(c.a,c.b);
-        }
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec_access.hpp>\r
+#include <boost/qvm/mat_access.hpp>\r
+#include <boost/qvm/vec_operations3.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+//#include <boost/qvm/quat_traits.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    test_qvm::vector<V1,3> x(42,1);\r
+    test_qvm::vector<V1,3> y=x*2;\r
+    test_qvm::matrix<M1,3,3> m;\r
+    A00(m) = 0;\r
+    A01(m) = -A2(x);\r
+    A02(m) = A1(x);\r
+    A10(m) = A2(x);\r
+    A11(m) = 0;\r
+    A12(m) = -A0(x);\r
+    A20(m) = -A1(x);\r
+    A21(m) = A0(x);\r
+    A22(m) = 0;\r
+        {\r
+        test_same_type(x,cross(x,y));\r
+        test_qvm::vector<V1,3> c=cross(x,y);\r
+        test_qvm::multiply_mv(c.b,m.a,y.a);\r
+        BOOST_QVM_TEST_EQ(c.a,c.b);\r
+        }\r
+        {\r
+        test_qvm::vector<V2,3> c=cross(vref(x),y);\r
+        test_qvm::multiply_mv(c.b,m.a,y.a);\r
+        BOOST_QVM_TEST_EQ(c.a,c.b);\r
+        }\r
+        {\r
+        test_qvm::vector<V2,3> c=cross(x,vref(y));\r
+        test_qvm::multiply_mv(c.b,m.a,y.a);\r
+        BOOST_QVM_TEST_EQ(c.a,c.b);\r
+        }\r
+    return boost::report_errors();\r
+    }\r
index 769b790da7f7de42a7dc7a8c22d84fc217f5035c..4e846284f1a3dce6283d4e413098a7daa58d39ca 100644 (file)
@@ -1,51 +1,51 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/deduce_mat.hpp>
-
-template <class T,class U>
-struct same_type;
-
-template <class T>
-struct
-same_type<T,T>
-    {
-    };
-
-template <class A,class B,int R,int C,class Result>
-struct
-check
-    {
-    same_type<typename boost::qvm::deduce_mat2<A,B,R,C>::type,Result> a;
-    same_type<typename boost::qvm::deduce_mat2<B,A,R,C>::type,Result> b;
-    };
-
-template <class T,int R,int C> struct m;
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        template <class T,int R,int C>
-        struct
-        mat_traits< m<T,R,C> >
-            {
-            typedef T scalar_type;
-            static int const rows=R;
-            static int const cols=C;
-            };                     
-        }
-    }
-
-int
-main()
-    {
-    same_type< boost::qvm::deduce_mat< m<int,4,2> >::type, m<int,4,2> >();
-    same_type< boost::qvm::deduce_mat< m<int,4,2>, 4, 4 >::type, boost::qvm::mat<int,4,4> >();
-    check< m<int,4,2>, m<int,4,2>, 4, 2, m<int,4,2> >();
-    check< m<int,4,2>, m<float,4,2>, 4, 4, boost::qvm::mat<float,4,4> >();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/deduce_mat.hpp>\r
+\r
+template <class T,class U>\r
+struct same_type;\r
+\r
+template <class T>\r
+struct\r
+same_type<T,T>\r
+    {\r
+    };\r
+\r
+template <class A,class B,int R,int C,class Result>\r
+struct\r
+check\r
+    {\r
+    same_type<typename boost::qvm::deduce_mat2<A,B,R,C>::type,Result> a;\r
+    same_type<typename boost::qvm::deduce_mat2<B,A,R,C>::type,Result> b;\r
+    };\r
+\r
+template <class T,int R,int C> struct m;\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        template <class T,int R,int C>\r
+        struct\r
+        mat_traits< m<T,R,C> >\r
+            {\r
+            typedef T scalar_type;\r
+            static int const rows=R;\r
+            static int const cols=C;\r
+            };                     \r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    same_type< boost::qvm::deduce_mat< m<int,4,2> >::type, m<int,4,2> >();\r
+    same_type< boost::qvm::deduce_mat< m<int,4,2>, 4, 4 >::type, boost::qvm::mat<int,4,4> >();\r
+    check< m<int,4,2>, m<int,4,2>, 4, 2, m<int,4,2> >();\r
+    check< m<int,4,2>, m<float,4,2>, 4, 4, boost::qvm::mat<float,4,4> >();\r
+    }\r
index 00442c85f2986950130dfd98da00751dcae51c62..10131e0834be00594e5de1feea617bca507c6337 100644 (file)
@@ -1,8 +1,8 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/deduce_scalar.hpp>
-
-typedef boost::qvm::deduce_scalar<char,int>::type char_scalars_not_supported_use_signed_char_instead;
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/deduce_scalar.hpp>\r
+\r
+typedef boost::qvm::deduce_scalar<char,int>::type char_scalars_not_supported_use_signed_char_instead;\r
index c9b8df2601b5108bf96b06f083480eab466ee6a7..eff8c515d0e6856345bb33e0b7962689407431d8 100644 (file)
@@ -1,9 +1,9 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/deduce_scalar.hpp>
-
-struct foo;
-typedef boost::qvm::deduce_scalar<foo,int>::type user_defined_types_require_specialization;
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/deduce_scalar.hpp>\r
+\r
+struct foo;\r
+typedef boost::qvm::deduce_scalar<foo,int>::type user_defined_types_require_specialization;\r
index 101a1e0c18e1518eb58dd74ca7e0ea22955fa683..9486b42c6afbab6693e72d156789ff6523c88f72 100644 (file)
@@ -1,10 +1,10 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/deduce_scalar.hpp>
-
-struct foo;
-struct bar;
-typedef boost::qvm::deduce_scalar<foo,bar>::type user_defined_types_require_specialization;
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/deduce_scalar.hpp>\r
+\r
+struct foo;\r
+struct bar;\r
+typedef boost::qvm::deduce_scalar<foo,bar>::type user_defined_types_require_specialization;\r
index cfb12c284e6bbaf2156569d25860778c38d248a4..d74d704082aa936d1c2b9d043d6f0c1b301024ff 100644 (file)
@@ -1,77 +1,77 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/deduce_scalar.hpp>
-
-template <class T,class U>
-struct same_type;
-
-template <class T>
-struct
-same_type<T,T>
-    {
-    };
-
-template <class A,class B,class R>
-struct
-check
-    {
-    same_type<typename boost::qvm::deduce_scalar<A,B>::type,R> a;
-    same_type<typename boost::qvm::deduce_scalar<B,A>::type,R> b;
-    };
-
-int
-main()
-    {
-    check<signed char,signed char,signed char>();
-    check<signed char,signed short,signed short>();
-    check<signed char,signed int,signed int>();
-    check<signed char,signed long,signed long>();
-    check<signed char,unsigned char,unsigned char>();
-    check<signed char,unsigned short,unsigned short>();
-    check<signed char,unsigned int,unsigned int>();
-    check<signed char,unsigned long,unsigned long>();
-    check<signed char,float,float>();
-    check<signed char,double,double>();
-    check<signed short,signed short,signed short>();
-    check<signed short,signed int,signed int>();
-    check<signed short,signed long,signed long>();
-    check<signed short,unsigned short,unsigned short>();
-    check<signed short,unsigned int,unsigned int>();
-    check<signed short,unsigned long,unsigned long>();
-    check<signed short,float,float>();
-    check<signed short,double,double>();
-    check<signed int,signed int,signed int>();
-    check<signed int,signed long,signed long>();
-    check<signed int,unsigned int,unsigned int>();
-    check<signed int,unsigned long,unsigned long>();
-    check<signed int,float,float>();
-    check<signed int,double,double>();
-    check<signed long,signed long,signed long>();
-    check<signed long,unsigned long,unsigned long>();
-    check<signed long,float,float>();
-    check<signed long,double,double>();
-    check<unsigned char,unsigned char,unsigned char>();
-    check<unsigned char,unsigned short,unsigned short>();
-    check<unsigned char,unsigned int,unsigned int>();
-    check<unsigned char,unsigned long,unsigned long>();
-    check<unsigned char,float,float>();
-    check<unsigned char,double,double>();
-    check<unsigned short,unsigned short,unsigned short>();
-    check<unsigned short,unsigned int,unsigned int>();
-    check<unsigned short,unsigned long,unsigned long>();
-    check<unsigned short,float,float>();
-    check<unsigned short,double,double>();
-    check<unsigned int,unsigned int,unsigned int>();
-    check<unsigned int,unsigned long,unsigned long>();
-    check<unsigned int,float,float>();
-    check<unsigned int,double,double>();
-    check<unsigned long,unsigned long,unsigned long>();
-    check<unsigned long,float,float>();
-    check<unsigned long,double,double>();
-    check<float,float,float>();
-    check<float,double,double>();
-    check<double,double,double>();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/deduce_scalar.hpp>\r
+\r
+template <class T,class U>\r
+struct same_type;\r
+\r
+template <class T>\r
+struct\r
+same_type<T,T>\r
+    {\r
+    };\r
+\r
+template <class A,class B,class R>\r
+struct\r
+check\r
+    {\r
+    same_type<typename boost::qvm::deduce_scalar<A,B>::type,R> a;\r
+    same_type<typename boost::qvm::deduce_scalar<B,A>::type,R> b;\r
+    };\r
+\r
+int\r
+main()\r
+    {\r
+    check<signed char,signed char,signed char>();\r
+    check<signed char,signed short,signed short>();\r
+    check<signed char,signed int,signed int>();\r
+    check<signed char,signed long,signed long>();\r
+    check<signed char,unsigned char,unsigned char>();\r
+    check<signed char,unsigned short,unsigned short>();\r
+    check<signed char,unsigned int,unsigned int>();\r
+    check<signed char,unsigned long,unsigned long>();\r
+    check<signed char,float,float>();\r
+    check<signed char,double,double>();\r
+    check<signed short,signed short,signed short>();\r
+    check<signed short,signed int,signed int>();\r
+    check<signed short,signed long,signed long>();\r
+    check<signed short,unsigned short,unsigned short>();\r
+    check<signed short,unsigned int,unsigned int>();\r
+    check<signed short,unsigned long,unsigned long>();\r
+    check<signed short,float,float>();\r
+    check<signed short,double,double>();\r
+    check<signed int,signed int,signed int>();\r
+    check<signed int,signed long,signed long>();\r
+    check<signed int,unsigned int,unsigned int>();\r
+    check<signed int,unsigned long,unsigned long>();\r
+    check<signed int,float,float>();\r
+    check<signed int,double,double>();\r
+    check<signed long,signed long,signed long>();\r
+    check<signed long,unsigned long,unsigned long>();\r
+    check<signed long,float,float>();\r
+    check<signed long,double,double>();\r
+    check<unsigned char,unsigned char,unsigned char>();\r
+    check<unsigned char,unsigned short,unsigned short>();\r
+    check<unsigned char,unsigned int,unsigned int>();\r
+    check<unsigned char,unsigned long,unsigned long>();\r
+    check<unsigned char,float,float>();\r
+    check<unsigned char,double,double>();\r
+    check<unsigned short,unsigned short,unsigned short>();\r
+    check<unsigned short,unsigned int,unsigned int>();\r
+    check<unsigned short,unsigned long,unsigned long>();\r
+    check<unsigned short,float,float>();\r
+    check<unsigned short,double,double>();\r
+    check<unsigned int,unsigned int,unsigned int>();\r
+    check<unsigned int,unsigned long,unsigned long>();\r
+    check<unsigned int,float,float>();\r
+    check<unsigned int,double,double>();\r
+    check<unsigned long,unsigned long,unsigned long>();\r
+    check<unsigned long,float,float>();\r
+    check<unsigned long,double,double>();\r
+    check<float,float,float>();\r
+    check<float,double,double>();\r
+    check<double,double,double>();\r
+    }\r
index f2b0ab03143de2a3b23412eb4b0f772b0a6379b8..be1b2a8a9e16ba05bbc2282a22499b7aeea7d9e7 100644 (file)
@@ -1,50 +1,50 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/deduce_vec.hpp>
-
-template <class T,class U>
-struct same_type;
-
-template <class T>
-struct
-same_type<T,T>
-    {
-    };
-
-template <class A,class B,int D,class Result>
-struct
-check
-    {
-    same_type<typename boost::qvm::deduce_vec2<A,B,D>::type,Result> a;
-    same_type<typename boost::qvm::deduce_vec2<B,A,D>::type,Result> b;
-    };
-
-template <class T,int D> struct v;
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        template <class T,int D>
-        struct
-        vec_traits< v<T,D> >
-            {
-            typedef T scalar_type;
-            static int const dim=D;
-            };                     
-        }
-    }
-
-int
-main()
-    {
-    same_type< boost::qvm::deduce_vec< v<int,3> >::type, v<int,3> >();
-    same_type< boost::qvm::deduce_vec< v<int,3>, 4 >::type, boost::qvm::vec<int,4> >();
-    check< v<int,3>, v<int,3>, 3, v<int,3> >();
-    check< v<int,3>, v<float,3>, 4, boost::qvm::vec<float,4> >();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/deduce_vec.hpp>\r
+\r
+template <class T,class U>\r
+struct same_type;\r
+\r
+template <class T>\r
+struct\r
+same_type<T,T>\r
+    {\r
+    };\r
+\r
+template <class A,class B,int D,class Result>\r
+struct\r
+check\r
+    {\r
+    same_type<typename boost::qvm::deduce_vec2<A,B,D>::type,Result> a;\r
+    same_type<typename boost::qvm::deduce_vec2<B,A,D>::type,Result> b;\r
+    };\r
+\r
+template <class T,int D> struct v;\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        template <class T,int D>\r
+        struct\r
+        vec_traits< v<T,D> >\r
+            {\r
+            typedef T scalar_type;\r
+            static int const dim=D;\r
+            };                     \r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    same_type< boost::qvm::deduce_vec< v<int,3> >::type, v<int,3> >();\r
+    same_type< boost::qvm::deduce_vec< v<int,3>, 4 >::type, boost::qvm::vec<int,4> >();\r
+    check< v<int,3>, v<int,3>, 3, v<int,3> >();\r
+    check< v<int,3>, v<float,3>, 4, boost::qvm::vec<float,4> >();\r
+    }\r
index 09ffccbf744a1909a459224e97a2ed80071cab17..245a8f0a437c8250dec62acdddef936b966bf989 100644 (file)
@@ -1,61 +1,61 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map_mat_mat.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols,int Col>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        float r1[Rows][Cols-1];
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols-1; ++j )
-                r1[i][j]=x.a[i][j+(j>=Col)];
-        float r2[Rows][Cols-1];
-        assign(r2,del_col<Col>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        del_col<Col>(x) *= 2;
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols-1; ++j )
-                r1[i][j]=x.a[i][j+(j>=Col)];
-        assign(r2,del_col<Col>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        del_col<Col>(x) + del_col<Col>(x);
-        -del_col<Col>(x);
-        }
-    }
-
-int
-main()
-    {
-    test<2,2,0>();
-    test<2,2,1>();
-
-    test<3,3,0>();
-    test<3,3,1>();
-    test<3,3,2>();
-
-    test<4,4,0>();
-    test<4,4,1>();
-    test<4,4,2>();
-    test<4,4,3>();
-
-    test<5,5,0>();
-    test<5,5,1>();
-    test<5,5,2>();
-    test<5,5,3>();
-    test<5,5,4>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map_mat_mat.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols,int Col>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        float r1[Rows][Cols-1];\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols-1; ++j )\r
+                r1[i][j]=x.a[i][j+(j>=Col)];\r
+        float r2[Rows][Cols-1];\r
+        assign(r2,del_col<Col>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        del_col<Col>(x) *= 2;\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols-1; ++j )\r
+                r1[i][j]=x.a[i][j+(j>=Col)];\r
+        assign(r2,del_col<Col>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        del_col<Col>(x) + del_col<Col>(x);\r
+        -del_col<Col>(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2,2,0>();\r
+    test<2,2,1>();\r
+\r
+    test<3,3,0>();\r
+    test<3,3,1>();\r
+    test<3,3,2>();\r
+\r
+    test<4,4,0>();\r
+    test<4,4,1>();\r
+    test<4,4,2>();\r
+    test<4,4,3>();\r
+\r
+    test<5,5,0>();\r
+    test<5,5,1>();\r
+    test<5,5,2>();\r
+    test<5,5,3>();\r
+    test<5,5,4>();\r
+    return boost::report_errors();\r
+    }\r
index b07b15b488eac616baa5fd5113093c0e240f85d2..c51d31eb169753fc7b8d4cce2de8856ef96d5c9d 100644 (file)
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map_mat_mat.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols,int Row,int Col>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        float r1[Rows-1][Cols-1];
-        for( int i=0; i!=Rows-1; ++i )
-            for( int j=0; j!=Cols-1; ++j )
-                r1[i][j]=x.a[i+(i>=Row)][j+(j>=Col)];
-        float r2[Rows-1][Cols-1];
-        assign(r2,del_row_col<Row,Col>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        del_row_col<Row,Col>(x) *= 2;
-        for( int i=0; i!=Rows-1; ++i )
-            for( int j=0; j!=Cols-1; ++j )
-                r1[i][j]=x.a[i+(i>=Row)][j+(j>=Col)];
-        assign(r2,del_row_col<Row,Col>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        del_row_col<Row,Col>(x) + del_row_col<Row,Col>(x);
-        -del_row_col<Row,Col>(x);
-        }
-    }
-
-int
-main()
-    {
-    test<2,2,0,0>();
-    test<2,2,0,1>();
-    test<2,2,1,0>();
-    test<2,2,1,1>();
-
-    test<3,3,0,0>();
-    test<3,3,0,1>();
-    test<3,3,0,2>();
-    test<3,3,1,0>();
-    test<3,3,1,1>();
-    test<3,3,1,2>();
-    test<3,3,2,0>();
-    test<3,3,2,1>();
-    test<3,3,2,2>();
-
-    test<4,4,0,0>();
-    test<4,4,0,1>();
-    test<4,4,0,2>();
-    test<4,4,0,3>();
-    test<4,4,1,0>();
-    test<4,4,1,1>();
-    test<4,4,1,2>();
-    test<4,4,1,3>();
-    test<4,4,2,0>();
-    test<4,4,2,1>();
-    test<4,4,2,2>();
-    test<4,4,2,3>();
-    test<4,4,3,0>();
-    test<4,4,3,1>();
-    test<4,4,3,2>();
-    test<4,4,3,3>();
-
-    test<5,5,0,0>();
-    test<5,5,0,1>();
-    test<5,5,0,2>();
-    test<5,5,0,3>();
-    test<5,5,0,4>();
-    test<5,5,1,0>();
-    test<5,5,1,1>();
-    test<5,5,1,2>();
-    test<5,5,1,3>();
-    test<5,5,1,4>();
-    test<5,5,2,0>();
-    test<5,5,2,1>();
-    test<5,5,2,2>();
-    test<5,5,2,3>();
-    test<5,5,2,4>();
-    test<5,5,3,0>();
-    test<5,5,3,1>();
-    test<5,5,3,2>();
-    test<5,5,3,3>();
-    test<5,5,3,4>();
-    test<5,5,4,0>();
-    test<5,5,4,1>();
-    test<5,5,4,2>();
-    test<5,5,4,3>();
-    test<5,5,4,4>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map_mat_mat.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols,int Row,int Col>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        float r1[Rows-1][Cols-1];\r
+        for( int i=0; i!=Rows-1; ++i )\r
+            for( int j=0; j!=Cols-1; ++j )\r
+                r1[i][j]=x.a[i+(i>=Row)][j+(j>=Col)];\r
+        float r2[Rows-1][Cols-1];\r
+        assign(r2,del_row_col<Row,Col>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        del_row_col<Row,Col>(x) *= 2;\r
+        for( int i=0; i!=Rows-1; ++i )\r
+            for( int j=0; j!=Cols-1; ++j )\r
+                r1[i][j]=x.a[i+(i>=Row)][j+(j>=Col)];\r
+        assign(r2,del_row_col<Row,Col>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        del_row_col<Row,Col>(x) + del_row_col<Row,Col>(x);\r
+        -del_row_col<Row,Col>(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2,2,0,0>();\r
+    test<2,2,0,1>();\r
+    test<2,2,1,0>();\r
+    test<2,2,1,1>();\r
+\r
+    test<3,3,0,0>();\r
+    test<3,3,0,1>();\r
+    test<3,3,0,2>();\r
+    test<3,3,1,0>();\r
+    test<3,3,1,1>();\r
+    test<3,3,1,2>();\r
+    test<3,3,2,0>();\r
+    test<3,3,2,1>();\r
+    test<3,3,2,2>();\r
+\r
+    test<4,4,0,0>();\r
+    test<4,4,0,1>();\r
+    test<4,4,0,2>();\r
+    test<4,4,0,3>();\r
+    test<4,4,1,0>();\r
+    test<4,4,1,1>();\r
+    test<4,4,1,2>();\r
+    test<4,4,1,3>();\r
+    test<4,4,2,0>();\r
+    test<4,4,2,1>();\r
+    test<4,4,2,2>();\r
+    test<4,4,2,3>();\r
+    test<4,4,3,0>();\r
+    test<4,4,3,1>();\r
+    test<4,4,3,2>();\r
+    test<4,4,3,3>();\r
+\r
+    test<5,5,0,0>();\r
+    test<5,5,0,1>();\r
+    test<5,5,0,2>();\r
+    test<5,5,0,3>();\r
+    test<5,5,0,4>();\r
+    test<5,5,1,0>();\r
+    test<5,5,1,1>();\r
+    test<5,5,1,2>();\r
+    test<5,5,1,3>();\r
+    test<5,5,1,4>();\r
+    test<5,5,2,0>();\r
+    test<5,5,2,1>();\r
+    test<5,5,2,2>();\r
+    test<5,5,2,3>();\r
+    test<5,5,2,4>();\r
+    test<5,5,3,0>();\r
+    test<5,5,3,1>();\r
+    test<5,5,3,2>();\r
+    test<5,5,3,3>();\r
+    test<5,5,3,4>();\r
+    test<5,5,4,0>();\r
+    test<5,5,4,1>();\r
+    test<5,5,4,2>();\r
+    test<5,5,4,3>();\r
+    test<5,5,4,4>();\r
+    return boost::report_errors();\r
+    }\r
index 8ce14c5cf13a474c4c82491824f957aba55eba87..83838c4097b254cb2911b914734bb8454f9fa6ab 100644 (file)
@@ -1,61 +1,61 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map_mat_mat.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols,int Row>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        float r1[Rows-1][Cols];
-        for( int i=0; i!=Rows-1; ++i )
-            for( int j=0; j!=Cols; ++j )
-                r1[i][j]=x.a[i+(i>=Row)][j];
-        float r2[Rows-1][Cols];
-        assign(r2,del_row<Row>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        del_row<Row>(x) *= 2;
-        for( int i=0; i!=Rows-1; ++i )
-            for( int j=0; j!=Cols; ++j )
-                r1[i][j]=x.a[i+(i>=Row)][j];
-        assign(r2,del_row<Row>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        del_row<Row>(x)+del_row<Row>(x);
-        -del_row<Row>(x);
-        }
-    }
-
-int
-main()
-    {
-    test<2,2,0>();
-    test<2,2,1>();
-
-    test<3,3,0>();
-    test<3,3,1>();
-    test<3,3,2>();
-
-    test<4,4,0>();
-    test<4,4,1>();
-    test<4,4,2>();
-    test<4,4,3>();
-
-    test<5,5,0>();
-    test<5,5,1>();
-    test<5,5,2>();
-    test<5,5,3>();
-    test<5,5,4>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map_mat_mat.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols,int Row>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        float r1[Rows-1][Cols];\r
+        for( int i=0; i!=Rows-1; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                r1[i][j]=x.a[i+(i>=Row)][j];\r
+        float r2[Rows-1][Cols];\r
+        assign(r2,del_row<Row>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        del_row<Row>(x) *= 2;\r
+        for( int i=0; i!=Rows-1; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                r1[i][j]=x.a[i+(i>=Row)][j];\r
+        assign(r2,del_row<Row>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        del_row<Row>(x)+del_row<Row>(x);\r
+        -del_row<Row>(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2,2,0>();\r
+    test<2,2,1>();\r
+\r
+    test<3,3,0>();\r
+    test<3,3,1>();\r
+    test<3,3,2>();\r
+\r
+    test<4,4,0>();\r
+    test<4,4,1>();\r
+    test<4,4,2>();\r
+    test<4,4,3>();\r
+\r
+    test<5,5,0>();\r
+    test<5,5,1>();\r
+    test<5,5,2>();\r
+    test<5,5,3>();\r
+    test<5,5,4>();\r
+    return boost::report_errors();\r
+    }\r
index 0a99aa09b26d321b3289c76a4d58dd70ead0a7de..44077574069ff48e6df5e81afc6cecdf149ef8bd 100644 (file)
@@ -1,32 +1,32 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int D>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,D,D> const x(42,1);
-        float gd=test_qvm::determinant(x.b);
-        float d=determinant(x);
-        BOOST_QVM_TEST_EQ(gd,d);
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int D>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,D,D> const x(42,1);\r
+        float gd=test_qvm::determinant(x.b);\r
+        float d=determinant(x);\r
+        BOOST_QVM_TEST_EQ(gd,d);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 75bdda5a901b0b96a1680c26417de1971224cbac..ff9e376740af1b4ee6eeef536504ce1ba0b1682d 100644 (file)
@@ -1,42 +1,42 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::vector<V1,Dim> x(42,1);
-        float y[Dim][Dim]; assign(y,diag_mat(x));
-        for( int i=0; i!=Dim; ++i )
-            x.b[i]=y[i][i];
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        test_qvm::scalar_multiply_v(x.b,x.a,2.0f);
-        diag(diag_mat(x)) *= 2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        diag_mat(x) + diag_mat(x);
-        -diag_mat(x);
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::vector<V1,Dim> x(42,1);\r
+        float y[Dim][Dim]; assign(y,diag_mat(x));\r
+        for( int i=0; i!=Dim; ++i )\r
+            x.b[i]=y[i][i];\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,2.0f);\r
+        diag(diag_mat(x)) *= 2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        diag_mat(x) + diag_mat(x);\r
+        -diag_mat(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 74626d0bfdb8b442546ad79a75ee5855330e0327..ad6f0b4273574343a950c42c9294f20dae38fdfb 100644 (file)
@@ -1,65 +1,65 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include <boost/qvm/map_mat_vec.hpp>
-#include "test_qvm_matrix.hpp"
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int A,int B,bool LessThan=(A<B)>
-    struct
-    get_min
-        {
-        static int const value=B;
-        };
-
-    template <int A,int B>
-    struct
-    get_min<A,B,true>
-        {
-        static int const value=A;
-        };
-
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        int const D=get_min<Rows,Cols>::value;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        test_qvm::vector<V1,D> y=diag(x);
-        for( int i=0; i!=D; ++i )
-            y.b[i]=x.a[i][i];
-        BOOST_QVM_TEST_EQ(y.a,y.b);
-        diag(x) *= 2;
-        for( int i=0; i!=D; ++i )
-            x.b[i][i] *= 2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        diag(x) + diag(x);
-        -diag(x);
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<1,3>();
-    test<1,4>();
-    test<1,5>();
-    test<2,1>();
-    test<3,1>();
-    test<4,1>();
-    test<5,1>();
-    test<2,2>();
-    test<3,3>();
-    test<4,4>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include <boost/qvm/map_mat_vec.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int A,int B,bool LessThan=(A<B)>\r
+    struct\r
+    get_min\r
+        {\r
+        static int const value=B;\r
+        };\r
+\r
+    template <int A,int B>\r
+    struct\r
+    get_min<A,B,true>\r
+        {\r
+        static int const value=A;\r
+        };\r
+\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        int const D=get_min<Rows,Cols>::value;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        test_qvm::vector<V1,D> y=diag(x);\r
+        for( int i=0; i!=D; ++i )\r
+            y.b[i]=x.a[i][i];\r
+        BOOST_QVM_TEST_EQ(y.a,y.b);\r
+        diag(x) *= 2;\r
+        for( int i=0; i!=D; ++i )\r
+            x.b[i][i] *= 2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        diag(x) + diag(x);\r
+        -diag(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<1,3>();\r
+    test<1,4>();\r
+    test<1,5>();\r
+    test<2,1>();\r
+    test<3,1>();\r
+    test<4,1>();\r
+    test<5,1>();\r
+    test<2,2>();\r
+    test<3,3>();\r
+    test<4,4>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index d532d8ff1c20de7c5f7111a9ac6973608a864814..1879a1e3cd732c5fdf8cda436e531ce97be2604a 100644 (file)
@@ -1,40 +1,40 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        test_qvm::scalar_multiply_m(x.b,x.a,0.5f);
-        x/=2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        test_qvm::scalar_multiply_m(x.b,x.a,0.5f);\r
+        x/=2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index 9412b360a4c84c393c6d2365fc4bafff9952b39f..6a9e2cb5a01f3043d1b4e6ec59fb22baf70ba39c 100644 (file)
@@ -1,28 +1,28 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> x(42,1);
-        test_qvm::scalar_multiply_v(x.b,x.a,0.5f);
-        x/=2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> x(42,1);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,0.5f);\r
+        x/=2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index f767d4bc4bb407d70a190817b6b1240e38399c1b..08157861c0f4f0cfff05cbdb254022f21017bbb5 100644 (file)
@@ -1,33 +1,33 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> x(42,1);
-        test_qvm::scalar_multiply_v(x.b,x.a,0.5f);
-        x/=2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        }
-    }
-
-int
-main()
-    {
-    test<1>();
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> x(42,1);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,0.5f);\r
+        x/=2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1>();\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 67875a5185f41943fd78119ccba1425ddcfd56c4..0503eb92e3748d9589665b1912178b2d3f3ec38d 100644 (file)
@@ -1,52 +1,52 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> const x(42,1);
-        test_qvm::scalar_multiply_m(x.b,x.a,0.5f);
-        test_same_type(x,x/2);
-            {
-            test_qvm::matrix<M1,Rows,Cols> y=x/2;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-            {
-            test_qvm::matrix<M1,Rows,Cols> y=mref(x)/2;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> const x(42,1);\r
+        test_qvm::scalar_multiply_m(x.b,x.a,0.5f);\r
+        test_same_type(x,x/2);\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> y=x/2;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> y=mref(x)/2;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index 1a2ff172cd88c1209d203fca77b6288ac0cee3de..353872f2632dccca268efb75eadb70fbba76a237 100644 (file)
@@ -1,40 +1,40 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> const x(42,1);
-        test_qvm::scalar_multiply_v(x.b,x.a,0.5f);
-        test_same_type(x,x/2);
-            {
-            test_qvm::quaternion<Q1> y=x/2;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-            {
-            test_qvm::quaternion<Q1> y=qref(x)/2;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> const x(42,1);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,0.5f);\r
+        test_same_type(x,x/2);\r
+            {\r
+            test_qvm::quaternion<Q1> y=x/2;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+            {\r
+            test_qvm::quaternion<Q1> y=qref(x)/2;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index e17eb06ec687d4faf8c52342a1794a88951f6d80..21ae04069742724216678ce4d79f4f9cfeeed383 100644 (file)
@@ -1,45 +1,45 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> const x(42,1);
-        test_qvm::scalar_multiply_v(x.b,x.a,0.5f);
-        test_same_type(x,x/2);
-            {
-            test_qvm::vector<V1,Dim> y=x/2;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-            {
-            test_qvm::vector<V1,Dim> y=vref(x)/2;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<1>();
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> const x(42,1);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,0.5f);\r
+        test_same_type(x,x/2);\r
+            {\r
+            test_qvm::vector<V1,Dim> y=x/2;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+            {\r
+            test_qvm::vector<V1,Dim> y=vref(x)/2;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1>();\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 3c5a209b05976ae24b69cbce584a8daa5d2524da..7e497565f79c2ab7b0155bcde23ac176421293f9 100644 (file)
@@ -1,44 +1,44 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-
-        test_qvm::quaternion<Q1> const x(42,1);
-            {
-            test_qvm::quaternion<Q1> const y(43,1);
-            test_same_type(float(),dot(x,y));
-            float d1=dot(x,y);
-            float d2=test_qvm::dot<float>(x.a,y.a);
-            BOOST_QVM_TEST_CLOSE(d1,d2,0.000001f);
-            }
-            {
-            test_qvm::quaternion<Q1,double> const y(43,1);
-            test_same_type(double(),dot(x,y));
-            double d1=dot(x,y);
-            double d2=test_qvm::dot<double>(x.a,y.a);
-            BOOST_QVM_TEST_CLOSE(d1,d2,0.000001);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+\r
+        test_qvm::quaternion<Q1> const x(42,1);\r
+            {\r
+            test_qvm::quaternion<Q1> const y(43,1);\r
+            test_same_type(float(),dot(x,y));\r
+            float d1=dot(x,y);\r
+            float d2=test_qvm::dot<float>(x.a,y.a);\r
+            BOOST_QVM_TEST_CLOSE(d1,d2,0.000001f);\r
+            }\r
+            {\r
+            test_qvm::quaternion<Q1,double> const y(43,1);\r
+            test_same_type(double(),dot(x,y));\r
+            double d1=dot(x,y);\r
+            double d2=test_qvm::dot<double>(x.a,y.a);\r
+            BOOST_QVM_TEST_CLOSE(d1,d2,0.000001);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 42f670ec33492a5f126f88016ee8b6498674ef31..82892249650de6c3a554be7d9cd57ba9be3dac1f 100644 (file)
@@ -1,48 +1,48 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-
-        test_qvm::vector<V1,Dim> const x(42,1);
-            {
-            test_qvm::vector<V1,Dim> const y(43,1);
-            test_same_type(float(),dot(x,y));
-            float d1=dot(x,y);
-            float d2=test_qvm::dot<float>(x.a,y.a);
-            BOOST_QVM_TEST_CLOSE(d1,d2,0.000001f);
-            }
-            {
-            test_qvm::vector<V1,Dim,double> const y(43,1);
-            test_same_type(double(),dot(x,y));
-            double d1=dot(x,y);
-            double d2=test_qvm::dot<double>(x.a,y.a);
-            BOOST_QVM_TEST_CLOSE(d1,d2,0.000001);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+\r
+        test_qvm::vector<V1,Dim> const x(42,1);\r
+            {\r
+            test_qvm::vector<V1,Dim> const y(43,1);\r
+            test_same_type(float(),dot(x,y));\r
+            float d1=dot(x,y);\r
+            float d2=test_qvm::dot<float>(x.a,y.a);\r
+            BOOST_QVM_TEST_CLOSE(d1,d2,0.000001f);\r
+            }\r
+            {\r
+            test_qvm::vector<V1,Dim,double> const y(43,1);\r
+            test_same_type(double(),dot(x,y));\r
+            double d1=dot(x,y);\r
+            double d2=test_qvm::dot<double>(x.a,y.a);\r
+            BOOST_QVM_TEST_CLOSE(d1,d2,0.000001);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 29c948d02d0069b2b7e06a41bf543599110de0f8..9272305b7e8a1e5a5eb7ad5610413430b6e5d3ca 100644 (file)
@@ -1,53 +1,53 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> const x(42,1);
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols; ++j )
-                {
-                    {
-                    test_qvm::matrix<M1,Rows,Cols> y(x);
-                    BOOST_QVM_TEST_EQ(x,y);
-                    y.a[i][j]=0;
-                    BOOST_QVM_TEST_NEQ(x,y);
-                    }
-                    {
-                    test_qvm::matrix<M2,Rows,Cols> y; assign(y,x);
-                    BOOST_QVM_TEST_EQ(x,y);
-                    y.a[i][j]=0;
-                    BOOST_QVM_TEST_NEQ(x,y);
-                    }
-                }
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> const x(42,1);\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                {\r
+                    {\r
+                    test_qvm::matrix<M1,Rows,Cols> y(x);\r
+                    BOOST_QVM_TEST_EQ(x,y);\r
+                    y.a[i][j]=0;\r
+                    BOOST_QVM_TEST_NEQ(x,y);\r
+                    }\r
+                    {\r
+                    test_qvm::matrix<M2,Rows,Cols> y; assign(y,x);\r
+                    BOOST_QVM_TEST_EQ(x,y);\r
+                    y.a[i][j]=0;\r
+                    BOOST_QVM_TEST_NEQ(x,y);\r
+                    }\r
+                }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index eb2eb4f9d1e791875ff475892d072682d0244910..82132cda86913d4913130922499eced29082e47a 100644 (file)
@@ -1,40 +1,40 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Qersion 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> const x(42,1);
-        for( int i=0; i!=4; ++i )
-            {
-                {
-                test_qvm::quaternion<Q1> y(x);
-                BOOST_QVM_TEST_EQ(x,y);
-                y.a[i]=0;
-                BOOST_QVM_TEST_NEQ(x,y);
-                }
-                {
-                test_qvm::quaternion<Q2> y; assign(y,x);
-                BOOST_QVM_TEST_EQ(x,y);
-                y.a[i]=0;
-                BOOST_QVM_TEST_NEQ(x,y);
-                }
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Qersion 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> const x(42,1);\r
+        for( int i=0; i!=4; ++i )\r
+            {\r
+                {\r
+                test_qvm::quaternion<Q1> y(x);\r
+                BOOST_QVM_TEST_EQ(x,y);\r
+                y.a[i]=0;\r
+                BOOST_QVM_TEST_NEQ(x,y);\r
+                }\r
+                {\r
+                test_qvm::quaternion<Q2> y; assign(y,x);\r
+                BOOST_QVM_TEST_EQ(x,y);\r
+                y.a[i]=0;\r
+                BOOST_QVM_TEST_NEQ(x,y);\r
+                }\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 5c556211a538af14948eae330e9f309b69ba4478..d0831f9b24621f72b7c684dcb9de1e01580cfe19 100644 (file)
@@ -1,44 +1,44 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> const x(42,1);
-        for( int i=0; i!=Dim; ++i )
-            {
-                {
-                test_qvm::vector<V1,Dim> y(x);
-                BOOST_QVM_TEST_EQ(x,y);
-                y.a[i]=0;
-                BOOST_QVM_TEST_NEQ(x,y);
-                }
-                {
-                test_qvm::vector<V2,Dim> y; assign(y,x);
-                BOOST_QVM_TEST_EQ(x,y);
-                y.a[i]=0;
-                BOOST_QVM_TEST_NEQ(x,y);
-                }
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> const x(42,1);\r
+        for( int i=0; i!=Dim; ++i )\r
+            {\r
+                {\r
+                test_qvm::vector<V1,Dim> y(x);\r
+                BOOST_QVM_TEST_EQ(x,y);\r
+                y.a[i]=0;\r
+                BOOST_QVM_TEST_NEQ(x,y);\r
+                }\r
+                {\r
+                test_qvm::vector<V2,Dim> y; assign(y,x);\r
+                BOOST_QVM_TEST_EQ(x,y);\r
+                y.a[i]=0;\r
+                BOOST_QVM_TEST_NEQ(x,y);\r
+                }\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index e071226380b93787cb514409791cafb972745694..ca3d794925a7aafa4f03814a2df387744cd67f26 100644 (file)
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef UUID_907229FCB3A711DE83C152F855D89593
-#define UUID_907229FCB3A711DE83C152F855D89593
-
-#include <limits>
-#include <math.h>
-#include <assert.h>
-#include <memory.h>
-#include <stdlib.h>
-
-namespace
-test_qvm
-    {
-    namespace
-    detail
-        {
-        inline
-        float
-        sin( float a )
-            {
-            return ::sinf(a);
-            }
-
-        inline
-        double
-        sin( double a )
-            {
-            return ::sin(a);
-            }
-
-        inline
-        float
-        cos( float a )
-            {
-            return ::cosf(a);
-            }
-
-        inline
-        double
-        cos( double a )
-            {
-            return ::cos(a);
-            }
-
-        inline
-        float
-        abs( float a )
-            {
-            return ::fabsf(a);
-            }
-
-        inline
-        double
-        abs( double a )
-            {
-            return ::fabs(a);
-            }
-
-        inline
-        float
-        atan2( float a, float b )
-            {
-            return ::atan2f(a,b);
-            }
-
-        inline
-        double
-        atan2( double a, double b )
-            {
-            return ::atan2(a,b);
-            }
-
-        template <class T>
-        T
-        determinant( T * * a, int n )
-            {
-            int i,j,j1,j2;
-            T det = 0;
-            T * * m = 0;
-            assert(n>=1);
-            if( n==1 )
-                det = a[0][0];
-            else if( n==2 )
-                det = a[0][0] * a[1][1] - a[1][0] * a[0][1];
-            else
-                {
-                det = 0;
-                for( j1=0; j1<n; j1++ )
-                    {
-                    m = static_cast<T * *>(malloc((n-1)*sizeof(T *)));
-                    for( i=0; i<n-1; i++ )
-                        m[i] = static_cast<T *>(malloc((n-1)*sizeof(T)));
-                    for( i=1; i<n; i++ )
-                        {
-                        j2 = 0;
-                        for( j=0; j<n; j++ )
-                            {
-                            if( j==j1 )
-                                continue;
-                            m[i-1][j2] = a[i][j];
-                            j2++;
-                            }
-                        }
-                    det += T(pow(-1.0,1.0+j1+1.0)) * a[0][j1] * determinant(m,n-1);
-                    for( i=0; i<n-1; i++ )
-                        free(m[i]);
-                    free(m);
-                    }
-                }
-            return(det);
-            }
-
-        template <class T,int N>
-        void
-        cofactor( T * * a, T (&b)[N][N] )
-            {
-            int i,j,ii,jj,i1,j1;
-            T det;
-            T * * c;
-            c = static_cast<T * *>(malloc((N-1)*sizeof(T *)));
-            for( i=0; i<N-1; i++ )
-                c[i] = static_cast<T *>(malloc((N-1)*sizeof(T)));
-            for( j=0; j<N; j++ )
-                {
-                for( i=0; i<N; i++ )
-                    {
-                    i1 = 0;
-                    for( ii=0; ii<N; ii++ )
-                        {
-                        if( ii==i )
-                            continue;
-                        j1 = 0;
-                        for( jj=0; jj<N; jj++ )
-                            {
-                            if( jj==j )
-                                continue;
-                            c[i1][j1] = a[ii][jj];
-                            j1++;
-                            }
-                        i1++;
-                        }
-                    det = determinant(c,N-1);
-                    b[i][j] = T(pow(-1.0,i+j+2.0)) * det;
-                    }
-                }
-            for( i=0; i<N-1; i++ )
-                free(c[i]);
-            free(c);
-            }
-        }
-
-    template <class T,int D>
-    T
-    determinant( T (&in)[D][D] )
-        {
-        T * * m = static_cast<T * *>(malloc(D*sizeof(T *)));
-        for( int i=0; i!=D; ++i )
-            {
-            m[i] = static_cast<T *>(malloc(D*sizeof(T)));
-            for( int j=0; j!=D; ++j )
-                m[i][j]=in[i][j];
-            }
-        T det=::test_qvm::detail::determinant(m,D);
-        for( int i=0; i<D; ++i )
-            free(m[i]);
-        free(m);
-        return det;
-        }
-
-    template <class T,int D>
-    void
-    inverse( T (&out)[D][D], T (&in)[D][D] )
-        {
-        T * * m = static_cast<T * *>(malloc(D*sizeof(T *)));
-        for( int i=0; i!=D; ++i )
-            {
-            m[i] = static_cast<T *>(malloc(D*sizeof(T)));
-            for( int j=0; j!=D; ++j )
-                m[i][j]=in[i][j];
-            }
-        T det=::test_qvm::detail::determinant(m,D);
-        assert(det!=T(0));
-        T f=T(1)/det;
-        T b[D][D];
-        ::test_qvm::detail::cofactor(m,b);
-        for( int i=0; i<D; ++i )
-            free(m[i]);
-        free(m);
-        for( int i=0; i!=D; ++i )
-            for( int j=0; j!=D; ++j )
-                out[j][i]=b[i][j]*f;
-        }
-
-    template <class T,int M,int N>
-    void
-    init_m( T (&r)[M][N], T start=T(0), T step=T(0) )
-        {
-        for( int i=0; i<M; ++i )
-            for( int j=0; j<N; ++j,start+=step )
-                r[i][j] = start;
-        }
-
-    template <class T,int D>
-    void
-    init_v( T (&r)[D], T start=T(0), T step=T(0) )
-        {
-        for( int i=0; i<D; ++i,start+=step )
-            r[i] = start;
-        }
-
-    template <class T,int M,int N>
-    void
-    zero_mat( T (&r)[M][N] )
-        {
-        for( int i=0; i<M; ++i )
-            for( int j=0; j<N; ++j )
-                r[i][j] = T(0);
-        }
-
-    template <class T,int D>
-    void
-    zero_vec( T (&r)[D] )
-        {
-        for( int i=0; i<D; ++i )
-            r[i] = T(0);
-        }
-
-    template <class T,int D>
-    void
-    identity( T (&r)[D][D] )
-        {
-        for( int i=0; i<D; ++i )
-            for( int j=0; j<D; ++j )
-                r[i][j] = (i==j) ? T(1) : T(0);
-        }
-
-    template <class T,class U,class V,int M,int N>
-    void
-    add_m( T (&r)[M][N], U (&a)[M][N], V (&b)[M][N] )
-        {
-        for( int i=0; i<M; ++i )
-            for( int j=0; j<N; ++j )
-                r[i][j] = a[i][j] + b[i][j];
-        }
-
-    template <class T,class U,class V,int D>
-    void
-    add_v( T (&r)[D], U (&a)[D], V (&b)[D] )
-        {
-        for( int i=0; i<D; ++i )
-            r[i] = a[i] + b[i];
-        }
-
-    template <class T,class U,class V,int M,int N>
-    void
-    subtract_m( T (&r)[M][N], U (&a)[M][N], V (&b)[M][N] )
-        {
-        for( int i=0; i<M; ++i )
-            for( int j=0; j<N; ++j )
-                r[i][j] = a[i][j] - b[i][j];
-        }
-
-    template <class T,class U,class V,int D>
-    void
-    subtract_v( T (&r)[D], U (&a)[D], V (&b)[D] )
-        {
-        for( int i=0; i<D; ++i )
-            r[i] = a[i] - b[i];
-        }
-
-    template <class T,int D,class U>
-    void
-    rotation_x( T (&r)[D][D], U angle )
-        {
-        identity(r);
-        T c=::test_qvm::detail::cos(angle);
-        T s=::test_qvm::detail::sin(angle);
-        r[1][1]=c;
-        r[1][2]=-s;
-        r[2][1]=s;
-        r[2][2]=c;
-        }
-
-    template <class T,int D,class U>
-    void
-    rotation_y( T (&r)[D][D], U angle )
-        {
-        identity(r);
-        T c=::test_qvm::detail::cos(angle);
-        T s=::test_qvm::detail::sin(angle);
-        r[0][0]=c;
-        r[0][2]=s;
-        r[2][0]=-s;
-        r[2][2]=c;
-        }
-
-    template <class T,int D,class U>
-    void
-    rotation_z( T (&r)[D][D], U angle )
-        {
-        identity(r);
-        T c=::test_qvm::detail::cos(angle);
-        T s=::test_qvm::detail::sin(angle);
-        r[0][0]=c;
-        r[0][1]=-s;
-        r[1][0]=s;
-        r[1][1]=c;
-        }
-
-    template <class T,int D>
-    void
-    translation( T (&r)[D][D], T (&t)[D-1] )
-        {
-        identity(r);
-        for( int i=0; i!=D-1; ++i )
-            r[i][D-1]=t[i];
-        }
-
-    template <class R,class T,class U,int M,int N,int P>
-    void
-    multiply_m( R (&r)[M][P], T (&a)[M][N], U (&b)[N][P] )
-        {
-        for( int i=0; i<M; ++i )
-            for( int j=0; j<P; ++j )
-                {
-                R x=0;
-                for( int k=0; k<N; ++k )
-                    x += R(a[i][k])*R(b[k][j]);
-                r[i][j] = x;
-                }
-        }
-
-    template <class R,class T,class U,int M,int N>
-    void
-    multiply_mv( R (&r)[M], T (&a)[M][N], U (&b)[N] )
-        {
-        for( int i=0; i<M; ++i )
-            {
-            R x=0;
-            for( int k=0; k<N; ++k )
-                x += R(a[i][k])*R(b[k]);
-            r[i] = x;
-            }
-        }
-
-    template <class R,class T,class U,int N,int P>
-    void
-    multiply_vm( R (&r)[P], T (&a)[N], U (&b)[N][P] )
-        {
-        for( int j=0; j<P; ++j )
-            {
-            R x=0;
-            for( int k=0; k<N; ++k )
-                x += R(a[k])*R(b[k][j]);
-            r[j] = x;
-            }
-        }
-
-    template <class T,class U,int M,int N,class S>
-    void
-    scalar_multiply_m( T (&r)[M][N], U (&a)[M][N], S scalar )
-        {
-        for( int i=0; i<M; ++i )
-            for( int j=0; j<N; ++j )
-                r[i][j] = a[i][j]*scalar;
-        }
-
-    template <class T,class U,int D,class S>
-    void
-    scalar_multiply_v( T (&r)[D], U (&a)[D], S scalar )
-        {
-        for( int i=0; i<D; ++i )
-            r[i] = a[i]*scalar;
-        }
-
-    template <class T,int M,int N>
-    void
-    transpose( T (&r)[M][N], T (&a)[N][M] )
-        {
-        for( int i=0; i<M; ++i )
-            for( int j=0; j<N; ++j )
-                r[i][j] = a[j][i];
-        }
-
-    template <class R,class T,class U,int D>
-    R
-    dot( T (&a)[D], U (&b)[D] )
-        {
-        R r=R(0);
-        for( int i=0; i<D; ++i )
-            r+=a[i]*b[i];
-        return r;
-        }
-
-    template <class T,int M,int N>
-    T
-    norm_squared( T (&m)[M][N] )
-        {
-        T f=T(0);
-        for( int i=0; i<M; ++i )
-            for( int j=0; j<N; ++j )
-                {
-                T x=m[i][j];
-                f+=x*x;
-                }
-        return f;
-        }
-
-    template <class T>
-    inline
-    void
-    matrix_perspective_lh( T (&r)[4][4], T fov_y, T aspect_ratio, T zn, T zf )
-        {
-        T ys=T(1)/::tanf(fov_y/T(2));
-        T xs=ys/aspect_ratio;
-        zero_mat(r);
-        r[0][0] = xs;
-        r[1][1] = ys;
-        r[2][2] = zf/(zf-zn);
-        r[2][3] = -zn*zf/(zf-zn);
-        r[3][2] = 1;
-        }
-
-    template <class T>
-    inline
-    void
-    matrix_perspective_rh( T (&r)[4][4], T fov_y, T aspect_ratio, T zn, T zf )
-        {
-        matrix_perspective_lh(r,fov_y,aspect_ratio,zn,zf);
-        r[2][2]=-r[2][2];
-        r[3][2]=-r[3][2];
-        }
-    }
-
-#endif
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#ifndef UUID_907229FCB3A711DE83C152F855D89593\r
+#define UUID_907229FCB3A711DE83C152F855D89593\r
+\r
+#include <limits>\r
+#include <math.h>\r
+#include <assert.h>\r
+#include <memory.h>\r
+#include <stdlib.h>\r
+\r
+namespace\r
+test_qvm\r
+    {\r
+    namespace\r
+    detail\r
+        {\r
+        inline\r
+        float\r
+        sin( float a )\r
+            {\r
+            return ::sinf(a);\r
+            }\r
+\r
+        inline\r
+        double\r
+        sin( double a )\r
+            {\r
+            return ::sin(a);\r
+            }\r
+\r
+        inline\r
+        float\r
+        cos( float a )\r
+            {\r
+            return ::cosf(a);\r
+            }\r
+\r
+        inline\r
+        double\r
+        cos( double a )\r
+            {\r
+            return ::cos(a);\r
+            }\r
+\r
+        inline\r
+        float\r
+        abs( float a )\r
+            {\r
+            return ::fabsf(a);\r
+            }\r
+\r
+        inline\r
+        double\r
+        abs( double a )\r
+            {\r
+            return ::fabs(a);\r
+            }\r
+\r
+        inline\r
+        float\r
+        atan2( float a, float b )\r
+            {\r
+            return ::atan2f(a,b);\r
+            }\r
+\r
+        inline\r
+        double\r
+        atan2( double a, double b )\r
+            {\r
+            return ::atan2(a,b);\r
+            }\r
+\r
+        template <class T>\r
+        T\r
+        determinant( T * * a, int n )\r
+            {\r
+            int i,j,j1,j2;\r
+            T det = 0;\r
+            T * * m = 0;\r
+            assert(n>=1);\r
+            if( n==1 )\r
+                det = a[0][0];\r
+            else if( n==2 )\r
+                det = a[0][0] * a[1][1] - a[1][0] * a[0][1];\r
+            else\r
+                {\r
+                det = 0;\r
+                for( j1=0; j1<n; j1++ )\r
+                    {\r
+                    m = static_cast<T * *>(malloc((n-1)*sizeof(T *)));\r
+                    for( i=0; i<n-1; i++ )\r
+                        m[i] = static_cast<T *>(malloc((n-1)*sizeof(T)));\r
+                    for( i=1; i<n; i++ )\r
+                        {\r
+                        j2 = 0;\r
+                        for( j=0; j<n; j++ )\r
+                            {\r
+                            if( j==j1 )\r
+                                continue;\r
+                            m[i-1][j2] = a[i][j];\r
+                            j2++;\r
+                            }\r
+                        }\r
+                    det += T(pow(-1.0,1.0+j1+1.0)) * a[0][j1] * determinant(m,n-1);\r
+                    for( i=0; i<n-1; i++ )\r
+                        free(m[i]);\r
+                    free(m);\r
+                    }\r
+                }\r
+            return(det);\r
+            }\r
+\r
+        template <class T,int N>\r
+        void\r
+        cofactor( T * * a, T (&b)[N][N] )\r
+            {\r
+            int i,j,ii,jj,i1,j1;\r
+            T det;\r
+            T * * c;\r
+            c = static_cast<T * *>(malloc((N-1)*sizeof(T *)));\r
+            for( i=0; i<N-1; i++ )\r
+                c[i] = static_cast<T *>(malloc((N-1)*sizeof(T)));\r
+            for( j=0; j<N; j++ )\r
+                {\r
+                for( i=0; i<N; i++ )\r
+                    {\r
+                    i1 = 0;\r
+                    for( ii=0; ii<N; ii++ )\r
+                        {\r
+                        if( ii==i )\r
+                            continue;\r
+                        j1 = 0;\r
+                        for( jj=0; jj<N; jj++ )\r
+                            {\r
+                            if( jj==j )\r
+                                continue;\r
+                            c[i1][j1] = a[ii][jj];\r
+                            j1++;\r
+                            }\r
+                        i1++;\r
+                        }\r
+                    det = determinant(c,N-1);\r
+                    b[i][j] = T(pow(-1.0,i+j+2.0)) * det;\r
+                    }\r
+                }\r
+            for( i=0; i<N-1; i++ )\r
+                free(c[i]);\r
+            free(c);\r
+            }\r
+        }\r
+\r
+    template <class T,int D>\r
+    T\r
+    determinant( T (&in)[D][D] )\r
+        {\r
+        T * * m = static_cast<T * *>(malloc(D*sizeof(T *)));\r
+        for( int i=0; i!=D; ++i )\r
+            {\r
+            m[i] = static_cast<T *>(malloc(D*sizeof(T)));\r
+            for( int j=0; j!=D; ++j )\r
+                m[i][j]=in[i][j];\r
+            }\r
+        T det=::test_qvm::detail::determinant(m,D);\r
+        for( int i=0; i<D; ++i )\r
+            free(m[i]);\r
+        free(m);\r
+        return det;\r
+        }\r
+\r
+    template <class T,int D>\r
+    void\r
+    inverse( T (&out)[D][D], T (&in)[D][D] )\r
+        {\r
+        T * * m = static_cast<T * *>(malloc(D*sizeof(T *)));\r
+        for( int i=0; i!=D; ++i )\r
+            {\r
+            m[i] = static_cast<T *>(malloc(D*sizeof(T)));\r
+            for( int j=0; j!=D; ++j )\r
+                m[i][j]=in[i][j];\r
+            }\r
+        T det=::test_qvm::detail::determinant(m,D);\r
+        assert(det!=T(0));\r
+        T f=T(1)/det;\r
+        T b[D][D];\r
+        ::test_qvm::detail::cofactor(m,b);\r
+        for( int i=0; i<D; ++i )\r
+            free(m[i]);\r
+        free(m);\r
+        for( int i=0; i!=D; ++i )\r
+            for( int j=0; j!=D; ++j )\r
+                out[j][i]=b[i][j]*f;\r
+        }\r
+\r
+    template <class T,int M,int N>\r
+    void\r
+    init_m( T (&r)[M][N], T start=T(0), T step=T(0) )\r
+        {\r
+        for( int i=0; i<M; ++i )\r
+            for( int j=0; j<N; ++j,start+=step )\r
+                r[i][j] = start;\r
+        }\r
+\r
+    template <class T,int D>\r
+    void\r
+    init_v( T (&r)[D], T start=T(0), T step=T(0) )\r
+        {\r
+        for( int i=0; i<D; ++i,start+=step )\r
+            r[i] = start;\r
+        }\r
+\r
+    template <class T,int M,int N>\r
+    void\r
+    zero_mat( T (&r)[M][N] )\r
+        {\r
+        for( int i=0; i<M; ++i )\r
+            for( int j=0; j<N; ++j )\r
+                r[i][j] = T(0);\r
+        }\r
+\r
+    template <class T,int D>\r
+    void\r
+    zero_vec( T (&r)[D] )\r
+        {\r
+        for( int i=0; i<D; ++i )\r
+            r[i] = T(0);\r
+        }\r
+\r
+    template <class T,int D>\r
+    void\r
+    identity( T (&r)[D][D] )\r
+        {\r
+        for( int i=0; i<D; ++i )\r
+            for( int j=0; j<D; ++j )\r
+                r[i][j] = (i==j) ? T(1) : T(0);\r
+        }\r
+\r
+    template <class T,class U,class V,int M,int N>\r
+    void\r
+    add_m( T (&r)[M][N], U (&a)[M][N], V (&b)[M][N] )\r
+        {\r
+        for( int i=0; i<M; ++i )\r
+            for( int j=0; j<N; ++j )\r
+                r[i][j] = a[i][j] + b[i][j];\r
+        }\r
+\r
+    template <class T,class U,class V,int D>\r
+    void\r
+    add_v( T (&r)[D], U (&a)[D], V (&b)[D] )\r
+        {\r
+        for( int i=0; i<D; ++i )\r
+            r[i] = a[i] + b[i];\r
+        }\r
+\r
+    template <class T,class U,class V,int M,int N>\r
+    void\r
+    subtract_m( T (&r)[M][N], U (&a)[M][N], V (&b)[M][N] )\r
+        {\r
+        for( int i=0; i<M; ++i )\r
+            for( int j=0; j<N; ++j )\r
+                r[i][j] = a[i][j] - b[i][j];\r
+        }\r
+\r
+    template <class T,class U,class V,int D>\r
+    void\r
+    subtract_v( T (&r)[D], U (&a)[D], V (&b)[D] )\r
+        {\r
+        for( int i=0; i<D; ++i )\r
+            r[i] = a[i] - b[i];\r
+        }\r
+\r
+    template <class T,int D,class U>\r
+    void\r
+    rotation_x( T (&r)[D][D], U angle )\r
+        {\r
+        identity(r);\r
+        T c=::test_qvm::detail::cos(angle);\r
+        T s=::test_qvm::detail::sin(angle);\r
+        r[1][1]=c;\r
+        r[1][2]=-s;\r
+        r[2][1]=s;\r
+        r[2][2]=c;\r
+        }\r
+\r
+    template <class T,int D,class U>\r
+    void\r
+    rotation_y( T (&r)[D][D], U angle )\r
+        {\r
+        identity(r);\r
+        T c=::test_qvm::detail::cos(angle);\r
+        T s=::test_qvm::detail::sin(angle);\r
+        r[0][0]=c;\r
+        r[0][2]=s;\r
+        r[2][0]=-s;\r
+        r[2][2]=c;\r
+        }\r
+\r
+    template <class T,int D,class U>\r
+    void\r
+    rotation_z( T (&r)[D][D], U angle )\r
+        {\r
+        identity(r);\r
+        T c=::test_qvm::detail::cos(angle);\r
+        T s=::test_qvm::detail::sin(angle);\r
+        r[0][0]=c;\r
+        r[0][1]=-s;\r
+        r[1][0]=s;\r
+        r[1][1]=c;\r
+        }\r
+\r
+    template <class T,int D>\r
+    void\r
+    translation( T (&r)[D][D], T (&t)[D-1] )\r
+        {\r
+        identity(r);\r
+        for( int i=0; i!=D-1; ++i )\r
+            r[i][D-1]=t[i];\r
+        }\r
+\r
+    template <class R,class T,class U,int M,int N,int P>\r
+    void\r
+    multiply_m( R (&r)[M][P], T (&a)[M][N], U (&b)[N][P] )\r
+        {\r
+        for( int i=0; i<M; ++i )\r
+            for( int j=0; j<P; ++j )\r
+                {\r
+                R x=0;\r
+                for( int k=0; k<N; ++k )\r
+                    x += R(a[i][k])*R(b[k][j]);\r
+                r[i][j] = x;\r
+                }\r
+        }\r
+\r
+    template <class R,class T,class U,int M,int N>\r
+    void\r
+    multiply_mv( R (&r)[M], T (&a)[M][N], U (&b)[N] )\r
+        {\r
+        for( int i=0; i<M; ++i )\r
+            {\r
+            R x=0;\r
+            for( int k=0; k<N; ++k )\r
+                x += R(a[i][k])*R(b[k]);\r
+            r[i] = x;\r
+            }\r
+        }\r
+\r
+    template <class R,class T,class U,int N,int P>\r
+    void\r
+    multiply_vm( R (&r)[P], T (&a)[N], U (&b)[N][P] )\r
+        {\r
+        for( int j=0; j<P; ++j )\r
+            {\r
+            R x=0;\r
+            for( int k=0; k<N; ++k )\r
+                x += R(a[k])*R(b[k][j]);\r
+            r[j] = x;\r
+            }\r
+        }\r
+\r
+    template <class T,class U,int M,int N,class S>\r
+    void\r
+    scalar_multiply_m( T (&r)[M][N], U (&a)[M][N], S scalar )\r
+        {\r
+        for( int i=0; i<M; ++i )\r
+            for( int j=0; j<N; ++j )\r
+                r[i][j] = a[i][j]*scalar;\r
+        }\r
+\r
+    template <class T,class U,int D,class S>\r
+    void\r
+    scalar_multiply_v( T (&r)[D], U (&a)[D], S scalar )\r
+        {\r
+        for( int i=0; i<D; ++i )\r
+            r[i] = a[i]*scalar;\r
+        }\r
+\r
+    template <class T,int M,int N>\r
+    void\r
+    transpose( T (&r)[M][N], T (&a)[N][M] )\r
+        {\r
+        for( int i=0; i<M; ++i )\r
+            for( int j=0; j<N; ++j )\r
+                r[i][j] = a[j][i];\r
+        }\r
+\r
+    template <class R,class T,class U,int D>\r
+    R\r
+    dot( T (&a)[D], U (&b)[D] )\r
+        {\r
+        R r=R(0);\r
+        for( int i=0; i<D; ++i )\r
+            r+=a[i]*b[i];\r
+        return r;\r
+        }\r
+\r
+    template <class T,int M,int N>\r
+    T\r
+    norm_squared( T (&m)[M][N] )\r
+        {\r
+        T f=T(0);\r
+        for( int i=0; i<M; ++i )\r
+            for( int j=0; j<N; ++j )\r
+                {\r
+                T x=m[i][j];\r
+                f+=x*x;\r
+                }\r
+        return f;\r
+        }\r
+\r
+    template <class T>\r
+    inline\r
+    void\r
+    matrix_perspective_lh( T (&r)[4][4], T fov_y, T aspect_ratio, T zn, T zf )\r
+        {\r
+        T ys=T(1)/::tanf(fov_y/T(2));\r
+        T xs=ys/aspect_ratio;\r
+        zero_mat(r);\r
+        r[0][0] = xs;\r
+        r[1][1] = ys;\r
+        r[2][2] = zf/(zf-zn);\r
+        r[2][3] = -zn*zf/(zf-zn);\r
+        r[3][2] = 1;\r
+        }\r
+\r
+    template <class T>\r
+    inline\r
+    void\r
+    matrix_perspective_rh( T (&r)[4][4], T fov_y, T aspect_ratio, T zn, T zf )\r
+        {\r
+        matrix_perspective_lh(r,fov_y,aspect_ratio,zn,zf);\r
+        r[2][2]=-r[2][2];\r
+        r[3][2]=-r[3][2];\r
+        }\r
+    }\r
+\r
+#endif\r
index db09236bd251b486160a421db90bfad5de84a4cf..7920b4c4816bbcaa803f5e89b7b6501e6ea11e0b 100644 (file)
@@ -1,7 +1,7 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include REVERGE_HEADER
-#include REVERGE_HEADER
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include REVERGE_HEADER\r
+#include REVERGE_HEADER\r
index ef753fb38867be5314795fd89b733e5866ecccee..9d4b1792adef194fd6a8f874551e27195bc51118 100644 (file)
@@ -1,36 +1,36 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Dim,Dim> m=identity_mat<float,Dim>();
-        for( int i=0; i!=Dim; ++i )
-            for( int j=0; j!=Dim; ++j )
-                BOOST_TEST(m.a[i][j]==float(i==j));
-        test_qvm::matrix<M2,Dim,Dim> n(42,1);
-        set_identity(n);
-        for( int i=0; i!=Dim; ++i )
-            for( int j=0; j!=Dim; ++j )
-                BOOST_TEST(n.a[i][j]==float(i==j));
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Dim,Dim> m=identity_mat<float,Dim>();\r
+        for( int i=0; i!=Dim; ++i )\r
+            for( int j=0; j!=Dim; ++j )\r
+                BOOST_TEST(m.a[i][j]==float(i==j));\r
+        test_qvm::matrix<M2,Dim,Dim> n(42,1);\r
+        set_identity(n);\r
+        for( int i=0; i!=Dim; ++i )\r
+            for( int j=0; j!=Dim; ++j )\r
+                BOOST_TEST(n.a[i][j]==float(i==j));\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index d37288386e8e960afffee3deaa49c0484db1ff91..cdc5e1689c6e6c5ed51ed374aaf7ffff88267b8c 100644 (file)
@@ -1,34 +1,34 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::quaternion<Q1> q=identity_quat<float>();
-        BOOST_TEST(q.a[0]==1);
-        BOOST_TEST(q.a[1]==0);
-        BOOST_TEST(q.a[2]==0);
-        BOOST_TEST(q.a[3]==0);
-        test_qvm::quaternion<Q2> p(42,1);
-        set_identity(p);
-        BOOST_TEST(p.a[0]==1);
-        BOOST_TEST(p.a[1]==0);
-        BOOST_TEST(p.a[2]==0);
-        BOOST_TEST(p.a[3]==0);
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::quaternion<Q1> q=identity_quat<float>();\r
+        BOOST_TEST(q.a[0]==1);\r
+        BOOST_TEST(q.a[1]==0);\r
+        BOOST_TEST(q.a[2]==0);\r
+        BOOST_TEST(q.a[3]==0);\r
+        test_qvm::quaternion<Q2> p(42,1);\r
+        set_identity(p);\r
+        BOOST_TEST(p.a[0]==1);\r
+        BOOST_TEST(p.a[1]==0);\r
+        BOOST_TEST(p.a[2]==0);\r
+        BOOST_TEST(p.a[3]==0);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 37d67fc5acc73ebde381831a39c17ef6ba69a6e4..b08716ef08911a369c9339077c22180773285a00 100644 (file)
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include <boost/qvm/vec.hpp>
-#include <boost/qvm/mat.hpp>
-
-namespace
-my_stuff
-    {
-    struct
-    mat
-        {
-        float a[3][3];
-        };
-
-    struct
-    vec
-        {
-        float a[3];
-        };
-
-    struct
-    quat
-        {
-        float a[4];
-        };
-    }
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        template <>
-        struct
-        mat_traits<my_stuff::mat>
-            {
-            typedef float scalar_type;
-            static int const rows=3;
-            static int const cols=3;
-
-            template <int R,int C>
-            static
-            scalar_type &
-            write_element( my_stuff::mat & m )
-                {
-                BOOST_QVM_STATIC_ASSERT(R>=0);
-                BOOST_QVM_STATIC_ASSERT(R<rows);
-                BOOST_QVM_STATIC_ASSERT(C>=0);
-                BOOST_QVM_STATIC_ASSERT(C<cols);
-                return m.a[R][C];
-                }
-
-            template <int R,int C>
-            static
-            scalar_type
-            read_element( my_stuff::mat const & m )
-                {
-                BOOST_QVM_STATIC_ASSERT(R>=0);
-                BOOST_QVM_STATIC_ASSERT(R<rows);
-                BOOST_QVM_STATIC_ASSERT(C>=0);
-                BOOST_QVM_STATIC_ASSERT(C<cols);
-                return m.a[R][C];
-                }
-
-            static
-            inline
-            scalar_type &
-            write_element_idx( int r, int c, my_stuff::mat & m )
-                {
-                BOOST_QVM_ASSERT(r>=0);
-                BOOST_QVM_ASSERT(r<rows);
-                BOOST_QVM_ASSERT(c>=0);
-                BOOST_QVM_ASSERT(c<cols);
-                return m.a[r][c];
-                }
-
-            static
-            inline
-            scalar_type
-            read_element_idx( int r, int c, my_stuff::mat const & m )
-                {
-                BOOST_QVM_ASSERT(r>=0);
-                BOOST_QVM_ASSERT(r<rows);
-                BOOST_QVM_ASSERT(c>=0);
-                BOOST_QVM_ASSERT(c<cols);
-                return m.a[r][c];
-                }
-            };
-
-        template <>
-        struct
-        vec_traits<my_stuff::vec>
-            {
-            static int const dim=3;
-            typedef float scalar_type;
-
-            template <int I>
-            static
-            scalar_type &
-            write_element( my_stuff::vec & m )
-                {
-                BOOST_QVM_STATIC_ASSERT(I>=0);
-                BOOST_QVM_STATIC_ASSERT(I<dim);
-                return m.a[I];
-                }
-
-            template <int I>
-            static
-            scalar_type
-            read_element( my_stuff::vec const & m )
-                {
-                BOOST_QVM_STATIC_ASSERT(I>=0);
-                BOOST_QVM_STATIC_ASSERT(I<dim);
-                return m.a[I];
-                }
-
-            static
-            inline
-            scalar_type &
-            write_element_idx( int i, my_stuff::vec & m )
-                {
-                BOOST_QVM_ASSERT(i>=0);
-                BOOST_QVM_ASSERT(i<dim);
-                return m.a[i];
-                }
-
-            static
-            inline
-            scalar_type
-            read_element_idx( int i, my_stuff::vec const & m )
-                {
-                BOOST_QVM_ASSERT(i>=0);
-                BOOST_QVM_ASSERT(i<dim);
-                return m.a[i];
-                }
-            };
-
-        template <>
-        struct
-        quat_traits<my_stuff::quat>
-            {
-            typedef float scalar_type;
-
-            template <int I>
-            static
-            scalar_type &
-            write_element( my_stuff::quat & m )
-                {
-                BOOST_QVM_STATIC_ASSERT(I>=0);
-                BOOST_QVM_STATIC_ASSERT(I<4);
-                return m.a[I];
-                }
-
-            template <int I>
-            static
-            scalar_type
-            read_element( my_stuff::quat const & m )
-                {
-                BOOST_QVM_STATIC_ASSERT(I>=0);
-                BOOST_QVM_STATIC_ASSERT(I<4);
-                return m.a[I];
-                }
-            };
-        }
-    }
-
-namespace
-my_stuff
-    {
-    mat &
-    operator/=( mat & x, float y )
-        {
-        return boost::qvm::operator/=(x,y);
-        }
-
-    vec &
-    operator/=( vec & x, float y )
-        {
-        return boost::qvm::operator/=(x,y);
-        }
-
-    quat &
-    operator/=( quat & x, float y )
-        {
-        return boost::qvm::operator/=(x,y);
-        }
-
-    mat &
-    operator*=( mat & x, float y )
-        {
-        return boost::qvm::operator*=(x,y);
-        }
-
-    vec &
-    operator*=( vec & x, float y )
-        {
-        return boost::qvm::operator*=(x,y);
-        }
-
-    quat &
-    operator*=( quat & x, float y )
-        {
-        return boost::qvm::operator*=(x,y);
-        }
-
-    mat
-    operator/( mat const & x, float y )
-        {
-        return boost::qvm::operator/(x,y);
-        }
-
-    vec
-    operator/( vec const & x, float y )
-        {
-        return boost::qvm::operator/(x,y);
-        }
-
-    quat
-    operator/( quat const & x, float y )
-        {
-        return boost::qvm::operator/(x,y);
-        }
-
-    mat
-    operator*( mat const & x, float y )
-        {
-        return boost::qvm::operator*(x,y);
-        }
-
-    vec
-    operator*( vec const & x, float y )
-        {
-        return boost::qvm::operator*(x,y);
-        }
-
-    quat
-    operator*( quat const & x, float y )
-        {
-        return boost::qvm::operator*(x,y);
-        }
-
-    mat &
-    operator*=( mat & x, mat const & y )
-        {
-        return boost::qvm::operator*=(x,y);
-        }
-
-    mat
-    operator*=( mat const & x, mat const & y )
-        {
-        return boost::qvm::operator*(x,y);
-        }
-
-    vec
-    operator*( mat const & x, vec const & y )
-        {
-        return boost::qvm::operator*(x,y);
-        }
-
-    vec
-    operator*( quat const & x, vec const & y )
-        {
-        return boost::qvm::operator*(x,y);
-        }
-
-    vec
-    operator*( vec const & x, mat const & y )
-        {
-        return boost::qvm::operator*(x,y);
-        }
-
-    bool
-    operator==( mat const & x, mat const & y )
-        {
-        return boost::qvm::operator==(x,y);
-        }
-
-    bool
-    operator!=( mat const & x, mat const & y )
-        {
-        return boost::qvm::operator!=(x,y);
-        }
-
-    bool
-    operator==( vec const & x, vec const & y )
-        {
-        return boost::qvm::operator==(x,y);
-        }
-
-    bool
-    operator!=( vec const & x, vec const & y )
-        {
-        return boost::qvm::operator!=(x,y);
-        }
-
-    bool
-    operator==( quat const & x, quat const & y )
-        {
-        return boost::qvm::operator==(x,y);
-        }
-
-    bool
-    operator!=( quat const & x, quat const & y )
-        {
-        return boost::qvm::operator!=(x,y);
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm::sfinae;
-    using namespace my_stuff;
-    typedef boost::qvm::mat<double,3,3> mat2;
-    typedef boost::qvm::vec<double,3> vec2;
-    typedef boost::qvm::quat<double> quat2;
-
-    mat ma1, mb1; set_zero(ma1); set_zero(mb1);
-    vec va1, vb1; set_zero(va1); set_zero(vb1);
-    quat qa1, qb1; set_zero(qa1); set_zero(qb1);
-    mat2 ma2, mb2; set_zero(ma2); set_zero(mb2);
-    vec2 va2, vb2; set_zero(va2); set_zero(vb2);
-    quat2 qa2, qb2; set_zero(qa2); set_zero(qb2);
-
-    set_zero(ma1);
-    set_zero(mb1);
-    set_zero(va1);
-    set_zero(vb1);
-    set_zero(qa1);
-    set_zero(qb1);
-    set_zero(ma2);
-    set_zero(mb2);
-    set_zero(va2);
-    set_zero(vb2);
-    set_zero(qa2);
-    set_zero(qb2);
-
-    ma1/=2;
-    va1/=2;
-    qa1/=2;
-    ma2/=2;
-    va2/=2;
-    qa2/=2;
-
-    ma1*=2;
-    va1*=2;
-    qa1*=2;
-    ma2*=2;
-    va2*=2;
-    qa2*=2;
-
-    mb1=ma1/2;
-    vb1=va1/2;
-    qb1=qb1/2;
-    mb2=convert_to<mat2>(ma1/2);
-    vb2=convert_to<vec2>(va1/2);
-    qb2=convert_to<quat2>(qa1/2);
-    mb1=scalar_cast<float>(ma2/2);
-    vb1=scalar_cast<float>(va2/2);
-    qb1=scalar_cast<float>(qa2/2);
-
-    mb1=ma1*2;
-    vb1=va1*2;
-    qb1=qa1*2;
-    mb2=convert_to<mat2>(ma1*2);
-    vb2=convert_to<vec2>(va1*2);
-    qb2=convert_to<quat2>(qa1*2);
-    mb1=scalar_cast<float>(ma2*2);
-    vb1=scalar_cast<float>(va2*2);
-    qb1=scalar_cast<float>(qa2*2);
-
-    ma1*=mb1;
-    ma1*=scalar_cast<float>(ma2);
-    ma2*=ma1;
-
-    va1=ma1*va1;
-    va1=qa1*va1;
-    va1=scalar_cast<float>(ma2*va1);
-    va1=scalar_cast<float>(ma1*va2);
-    va1=scalar_cast<float>(ma2*va2);
-    va1=scalar_cast<float>(qa2*va1);
-    va1=scalar_cast<float>(qa1*va2);
-    va1=scalar_cast<float>(qa2*va2);
-
-    va2=convert_to<vec2>(ma1*va1);
-    va2=convert_to<vec2>(qa1*va1);
-    va2=ma2*va1;
-    va2=ma1*va2;
-    va2=ma2*va2;
-    va2=qa2*va1;
-    va2=qa1*va2;
-    va2=qa2*va2;
-
-    va1=va1*ma1;
-    va1=scalar_cast<float>(va1*ma2);
-    va1=scalar_cast<float>(va2*ma1);
-    va1=scalar_cast<float>(va2*ma2);
-
-    va2=convert_to<vec2>(va1*ma1);
-    va2=va1*ma2;
-    va2=va2*ma1;
-    va2=va2*ma2;
-
-    (void) (ma1==mb1);
-    (void) (ma1==ma2);
-    (void) (ma2==ma1);
-
-    (void) (ma1!=mb1);
-    (void) (ma1!=ma2);
-    (void) (ma2!=ma1);
-
-    (void) (va1==vb1);
-    (void) (va1==va2);
-    (void) (va2==va1);
-
-    (void) (va1!=vb1);
-    (void) (va1!=va2);
-    (void) (va2!=va1);
-
-    (void) (qa1==qb1);
-    (void) (qa1==qa2);
-    (void) (qa2==qa1);
-
-    (void) (qa1!=qb1);
-    (void) (qa1!=qa2);
-    (void) (qa2!=qa1);
-
-    return 0;
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+\r
+namespace\r
+my_stuff\r
+    {\r
+    struct\r
+    mat\r
+        {\r
+        float a[3][3];\r
+        };\r
+\r
+    struct\r
+    vec\r
+        {\r
+        float a[3];\r
+        };\r
+\r
+    struct\r
+    quat\r
+        {\r
+        float a[4];\r
+        };\r
+    }\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        template <>\r
+        struct\r
+        mat_traits<my_stuff::mat>\r
+            {\r
+            typedef float scalar_type;\r
+            static int const rows=3;\r
+            static int const cols=3;\r
+\r
+            template <int R,int C>\r
+            static\r
+            scalar_type &\r
+            write_element( my_stuff::mat & m )\r
+                {\r
+                BOOST_QVM_STATIC_ASSERT(R>=0);\r
+                BOOST_QVM_STATIC_ASSERT(R<rows);\r
+                BOOST_QVM_STATIC_ASSERT(C>=0);\r
+                BOOST_QVM_STATIC_ASSERT(C<cols);\r
+                return m.a[R][C];\r
+                }\r
+\r
+            template <int R,int C>\r
+            static\r
+            scalar_type\r
+            read_element( my_stuff::mat const & m )\r
+                {\r
+                BOOST_QVM_STATIC_ASSERT(R>=0);\r
+                BOOST_QVM_STATIC_ASSERT(R<rows);\r
+                BOOST_QVM_STATIC_ASSERT(C>=0);\r
+                BOOST_QVM_STATIC_ASSERT(C<cols);\r
+                return m.a[R][C];\r
+                }\r
+\r
+            static\r
+            inline\r
+            scalar_type &\r
+            write_element_idx( int r, int c, my_stuff::mat & m )\r
+                {\r
+                BOOST_QVM_ASSERT(r>=0);\r
+                BOOST_QVM_ASSERT(r<rows);\r
+                BOOST_QVM_ASSERT(c>=0);\r
+                BOOST_QVM_ASSERT(c<cols);\r
+                return m.a[r][c];\r
+                }\r
+\r
+            static\r
+            inline\r
+            scalar_type\r
+            read_element_idx( int r, int c, my_stuff::mat const & m )\r
+                {\r
+                BOOST_QVM_ASSERT(r>=0);\r
+                BOOST_QVM_ASSERT(r<rows);\r
+                BOOST_QVM_ASSERT(c>=0);\r
+                BOOST_QVM_ASSERT(c<cols);\r
+                return m.a[r][c];\r
+                }\r
+            };\r
+\r
+        template <>\r
+        struct\r
+        vec_traits<my_stuff::vec>\r
+            {\r
+            static int const dim=3;\r
+            typedef float scalar_type;\r
+\r
+            template <int I>\r
+            static\r
+            scalar_type &\r
+            write_element( my_stuff::vec & m )\r
+                {\r
+                BOOST_QVM_STATIC_ASSERT(I>=0);\r
+                BOOST_QVM_STATIC_ASSERT(I<dim);\r
+                return m.a[I];\r
+                }\r
+\r
+            template <int I>\r
+            static\r
+            scalar_type\r
+            read_element( my_stuff::vec const & m )\r
+                {\r
+                BOOST_QVM_STATIC_ASSERT(I>=0);\r
+                BOOST_QVM_STATIC_ASSERT(I<dim);\r
+                return m.a[I];\r
+                }\r
+\r
+            static\r
+            inline\r
+            scalar_type &\r
+            write_element_idx( int i, my_stuff::vec & m )\r
+                {\r
+                BOOST_QVM_ASSERT(i>=0);\r
+                BOOST_QVM_ASSERT(i<dim);\r
+                return m.a[i];\r
+                }\r
+\r
+            static\r
+            inline\r
+            scalar_type\r
+            read_element_idx( int i, my_stuff::vec const & m )\r
+                {\r
+                BOOST_QVM_ASSERT(i>=0);\r
+                BOOST_QVM_ASSERT(i<dim);\r
+                return m.a[i];\r
+                }\r
+            };\r
+\r
+        template <>\r
+        struct\r
+        quat_traits<my_stuff::quat>\r
+            {\r
+            typedef float scalar_type;\r
+\r
+            template <int I>\r
+            static\r
+            scalar_type &\r
+            write_element( my_stuff::quat & m )\r
+                {\r
+                BOOST_QVM_STATIC_ASSERT(I>=0);\r
+                BOOST_QVM_STATIC_ASSERT(I<4);\r
+                return m.a[I];\r
+                }\r
+\r
+            template <int I>\r
+            static\r
+            scalar_type\r
+            read_element( my_stuff::quat const & m )\r
+                {\r
+                BOOST_QVM_STATIC_ASSERT(I>=0);\r
+                BOOST_QVM_STATIC_ASSERT(I<4);\r
+                return m.a[I];\r
+                }\r
+            };\r
+        }\r
+    }\r
+\r
+namespace\r
+my_stuff\r
+    {\r
+    mat &\r
+    operator/=( mat & x, float y )\r
+        {\r
+        return boost::qvm::operator/=(x,y);\r
+        }\r
+\r
+    vec &\r
+    operator/=( vec & x, float y )\r
+        {\r
+        return boost::qvm::operator/=(x,y);\r
+        }\r
+\r
+    quat &\r
+    operator/=( quat & x, float y )\r
+        {\r
+        return boost::qvm::operator/=(x,y);\r
+        }\r
+\r
+    mat &\r
+    operator*=( mat & x, float y )\r
+        {\r
+        return boost::qvm::operator*=(x,y);\r
+        }\r
+\r
+    vec &\r
+    operator*=( vec & x, float y )\r
+        {\r
+        return boost::qvm::operator*=(x,y);\r
+        }\r
+\r
+    quat &\r
+    operator*=( quat & x, float y )\r
+        {\r
+        return boost::qvm::operator*=(x,y);\r
+        }\r
+\r
+    mat\r
+    operator/( mat const & x, float y )\r
+        {\r
+        return boost::qvm::operator/(x,y);\r
+        }\r
+\r
+    vec\r
+    operator/( vec const & x, float y )\r
+        {\r
+        return boost::qvm::operator/(x,y);\r
+        }\r
+\r
+    quat\r
+    operator/( quat const & x, float y )\r
+        {\r
+        return boost::qvm::operator/(x,y);\r
+        }\r
+\r
+    mat\r
+    operator*( mat const & x, float y )\r
+        {\r
+        return boost::qvm::operator*(x,y);\r
+        }\r
+\r
+    vec\r
+    operator*( vec const & x, float y )\r
+        {\r
+        return boost::qvm::operator*(x,y);\r
+        }\r
+\r
+    quat\r
+    operator*( quat const & x, float y )\r
+        {\r
+        return boost::qvm::operator*(x,y);\r
+        }\r
+\r
+    mat &\r
+    operator*=( mat & x, mat const & y )\r
+        {\r
+        return boost::qvm::operator*=(x,y);\r
+        }\r
+\r
+    mat\r
+    operator*=( mat const & x, mat const & y )\r
+        {\r
+        return boost::qvm::operator*(x,y);\r
+        }\r
+\r
+    vec\r
+    operator*( mat const & x, vec const & y )\r
+        {\r
+        return boost::qvm::operator*(x,y);\r
+        }\r
+\r
+    vec\r
+    operator*( quat const & x, vec const & y )\r
+        {\r
+        return boost::qvm::operator*(x,y);\r
+        }\r
+\r
+    vec\r
+    operator*( vec const & x, mat const & y )\r
+        {\r
+        return boost::qvm::operator*(x,y);\r
+        }\r
+\r
+    bool\r
+    operator==( mat const & x, mat const & y )\r
+        {\r
+        return boost::qvm::operator==(x,y);\r
+        }\r
+\r
+    bool\r
+    operator!=( mat const & x, mat const & y )\r
+        {\r
+        return boost::qvm::operator!=(x,y);\r
+        }\r
+\r
+    bool\r
+    operator==( vec const & x, vec const & y )\r
+        {\r
+        return boost::qvm::operator==(x,y);\r
+        }\r
+\r
+    bool\r
+    operator!=( vec const & x, vec const & y )\r
+        {\r
+        return boost::qvm::operator!=(x,y);\r
+        }\r
+\r
+    bool\r
+    operator==( quat const & x, quat const & y )\r
+        {\r
+        return boost::qvm::operator==(x,y);\r
+        }\r
+\r
+    bool\r
+    operator!=( quat const & x, quat const & y )\r
+        {\r
+        return boost::qvm::operator!=(x,y);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm::sfinae;\r
+    using namespace my_stuff;\r
+    typedef boost::qvm::mat<double,3,3> mat2;\r
+    typedef boost::qvm::vec<double,3> vec2;\r
+    typedef boost::qvm::quat<double> quat2;\r
+\r
+    mat ma1, mb1; set_zero(ma1); set_zero(mb1);\r
+    vec va1, vb1; set_zero(va1); set_zero(vb1);\r
+    quat qa1, qb1; set_zero(qa1); set_zero(qb1);\r
+    mat2 ma2, mb2; set_zero(ma2); set_zero(mb2);\r
+    vec2 va2, vb2; set_zero(va2); set_zero(vb2);\r
+    quat2 qa2, qb2; set_zero(qa2); set_zero(qb2);\r
+\r
+    set_zero(ma1);\r
+    set_zero(mb1);\r
+    set_zero(va1);\r
+    set_zero(vb1);\r
+    set_zero(qa1);\r
+    set_zero(qb1);\r
+    set_zero(ma2);\r
+    set_zero(mb2);\r
+    set_zero(va2);\r
+    set_zero(vb2);\r
+    set_zero(qa2);\r
+    set_zero(qb2);\r
+\r
+    ma1/=2;\r
+    va1/=2;\r
+    qa1/=2;\r
+    ma2/=2;\r
+    va2/=2;\r
+    qa2/=2;\r
+\r
+    ma1*=2;\r
+    va1*=2;\r
+    qa1*=2;\r
+    ma2*=2;\r
+    va2*=2;\r
+    qa2*=2;\r
+\r
+    mb1=ma1/2;\r
+    vb1=va1/2;\r
+    qb1=qb1/2;\r
+    mb2=convert_to<mat2>(ma1/2);\r
+    vb2=convert_to<vec2>(va1/2);\r
+    qb2=convert_to<quat2>(qa1/2);\r
+    mb1=scalar_cast<float>(ma2/2);\r
+    vb1=scalar_cast<float>(va2/2);\r
+    qb1=scalar_cast<float>(qa2/2);\r
+\r
+    mb1=ma1*2;\r
+    vb1=va1*2;\r
+    qb1=qa1*2;\r
+    mb2=convert_to<mat2>(ma1*2);\r
+    vb2=convert_to<vec2>(va1*2);\r
+    qb2=convert_to<quat2>(qa1*2);\r
+    mb1=scalar_cast<float>(ma2*2);\r
+    vb1=scalar_cast<float>(va2*2);\r
+    qb1=scalar_cast<float>(qa2*2);\r
+\r
+    ma1*=mb1;\r
+    ma1*=scalar_cast<float>(ma2);\r
+    ma2*=ma1;\r
+\r
+    va1=ma1*va1;\r
+    va1=qa1*va1;\r
+    va1=scalar_cast<float>(ma2*va1);\r
+    va1=scalar_cast<float>(ma1*va2);\r
+    va1=scalar_cast<float>(ma2*va2);\r
+    va1=scalar_cast<float>(qa2*va1);\r
+    va1=scalar_cast<float>(qa1*va2);\r
+    va1=scalar_cast<float>(qa2*va2);\r
+\r
+    va2=convert_to<vec2>(ma1*va1);\r
+    va2=convert_to<vec2>(qa1*va1);\r
+    va2=ma2*va1;\r
+    va2=ma1*va2;\r
+    va2=ma2*va2;\r
+    va2=qa2*va1;\r
+    va2=qa1*va2;\r
+    va2=qa2*va2;\r
+\r
+    va1=va1*ma1;\r
+    va1=scalar_cast<float>(va1*ma2);\r
+    va1=scalar_cast<float>(va2*ma1);\r
+    va1=scalar_cast<float>(va2*ma2);\r
+\r
+    va2=convert_to<vec2>(va1*ma1);\r
+    va2=va1*ma2;\r
+    va2=va2*ma1;\r
+    va2=va2*ma2;\r
+\r
+    (void) (ma1==mb1);\r
+    (void) (ma1==ma2);\r
+    (void) (ma2==ma1);\r
+\r
+    (void) (ma1!=mb1);\r
+    (void) (ma1!=ma2);\r
+    (void) (ma2!=ma1);\r
+\r
+    (void) (va1==vb1);\r
+    (void) (va1==va2);\r
+    (void) (va2==va1);\r
+\r
+    (void) (va1!=vb1);\r
+    (void) (va1!=va2);\r
+    (void) (va2!=va1);\r
+\r
+    (void) (qa1==qb1);\r
+    (void) (qa1==qa2);\r
+    (void) (qa2==qa1);\r
+\r
+    (void) (qa1!=qb1);\r
+    (void) (qa1!=qa2);\r
+    (void) (qa2!=qa1);\r
+\r
+    return 0;\r
+    }\r
index 5c2754ddd520ccf455396d987037af18813115d7..f27211f529e6f38834d1062f598c7cc555d4c4bf 100644 (file)
@@ -1,55 +1,55 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include <boost/exception/diagnostic_information.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int D>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,D,D> x;
-        test_qvm::rotation_z(x.a,42.0f);
-        test_qvm::inverse(x.b,x.a);
-        test_same_type(x,inverse(x));
-            {
-            test_qvm::matrix<M1,D,D> y=inverse(x);
-            BOOST_QVM_TEST_CLOSE(x.b,y.a,0.000001f);
-            }
-            {
-            test_qvm::matrix<M1,D,D> y=inverse(mref(x));
-            BOOST_QVM_TEST_CLOSE(x.b,y.a,0.000001f);
-            }
-        }
-    }
-
-int
-main()
-    {
-    try
-        {
-        test<2>();
-        test<3>();
-        test<4>();
-        test<5>();
-        return boost::report_errors();
-        }
-    catch(
-    ... )
-        {
-        std::cerr << "Uncaught exception:\n" << boost::current_exception_diagnostic_information();
-        return 1;
-        }
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include <boost/exception/diagnostic_information.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int D>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,D,D> x;\r
+        test_qvm::rotation_z(x.a,42.0f);\r
+        test_qvm::inverse(x.b,x.a);\r
+        test_same_type(x,inverse(x));\r
+            {\r
+            test_qvm::matrix<M1,D,D> y=inverse(x);\r
+            BOOST_QVM_TEST_CLOSE(x.b,y.a,0.000001f);\r
+            }\r
+            {\r
+            test_qvm::matrix<M1,D,D> y=inverse(mref(x));\r
+            BOOST_QVM_TEST_CLOSE(x.b,y.a,0.000001f);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    try\r
+        {\r
+        test<2>();\r
+        test<3>();\r
+        test<4>();\r
+        test<5>();\r
+        return boost::report_errors();\r
+        }\r
+    catch(\r
+    ... )\r
+        {\r
+        std::cerr << "Uncaught exception:\n" << boost::current_exception_diagnostic_information();\r
+        return 1;\r
+        }\r
+    }\r
index 52bf2c00e8fa2469942f27a119d0035acfb216e2..8a2cfeab936a9744c0a8731fb356b268f96ef535 100644 (file)
@@ -1,41 +1,41 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include <boost/exception/diagnostic_information.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "test_qvm.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::quaternion<Q1> x=rotx_quat(4.2f);
-        test_same_type(x,inverse(x));
-        test_qvm::quaternion<Q1> y=rotx_quat(-4.2f);
-            {
-            test_qvm::quaternion<Q1> z=inverse(x);
-            BOOST_QVM_TEST_CLOSE_QUAT(z.a,y.a,0.00001f);
-            }
-            {
-            test_qvm::quaternion<Q1> z=inverse(qref(x));
-            BOOST_QVM_TEST_CLOSE_QUAT(z.a,y.a,0.00001f);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include <boost/exception/diagnostic_information.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "test_qvm.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::quaternion<Q1> x=rotx_quat(4.2f);\r
+        test_same_type(x,inverse(x));\r
+        test_qvm::quaternion<Q1> y=rotx_quat(-4.2f);\r
+            {\r
+            test_qvm::quaternion<Q1> z=inverse(x);\r
+            BOOST_QVM_TEST_CLOSE_QUAT(z.a,y.a,0.00001f);\r
+            }\r
+            {\r
+            test_qvm::quaternion<Q1> z=inverse(qref(x));\r
+            BOOST_QVM_TEST_CLOSE_QUAT(z.a,y.a,0.00001f);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 96669e9c106a3460d73f2c863b613b9b6e0b79a0..92a91a1bb6c5436a1811cd0392c9d23e1d5eb731 100644 (file)
@@ -1,31 +1,31 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-
-        test_qvm::quaternion<Q1> const x(42,1);
-        float m1=mag(x);
-        float m2=mag(qref(x));
-        float m3=sqrtf(test_qvm::dot<float>(x.a,x.a));
-        BOOST_QVM_TEST_CLOSE(m1,m3,0.000001f);
-        BOOST_QVM_TEST_CLOSE(m2,m3,0.000001f);
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+\r
+        test_qvm::quaternion<Q1> const x(42,1);\r
+        float m1=mag(x);\r
+        float m2=mag(qref(x));\r
+        float m3=sqrtf(test_qvm::dot<float>(x.a,x.a));\r
+        BOOST_QVM_TEST_CLOSE(m1,m3,0.000001f);\r
+        BOOST_QVM_TEST_CLOSE(m2,m3,0.000001f);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 9fab3e15ac80bc077f4a494869fdbb5ffbd820ab..5b6b4000b00d93230c557ab569c25d1b72a076b8 100644 (file)
@@ -1,30 +1,30 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> const x(42,1);
-        float m1=mag_sqr(x);
-        float m2=mag_sqr(qref(x));
-        float m3=test_qvm::dot<float>(x.a,x.a);
-        BOOST_QVM_TEST_CLOSE(m1,m3,0.000001f);
-        BOOST_QVM_TEST_CLOSE(m2,m3,0.000001f);
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> const x(42,1);\r
+        float m1=mag_sqr(x);\r
+        float m2=mag_sqr(qref(x));\r
+        float m3=test_qvm::dot<float>(x.a,x.a);\r
+        BOOST_QVM_TEST_CLOSE(m1,m3,0.000001f);\r
+        BOOST_QVM_TEST_CLOSE(m2,m3,0.000001f);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index ea3166589009307ed768546f35cd6acd5badc5d8..a161441228e0579a66b541e69e5d621020d24979 100644 (file)
@@ -1,35 +1,35 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-
-        test_qvm::vector<V1,Dim> const x(42,1);
-        float m1=mag_sqr(x);
-        float m2=mag_sqr(vref(x));
-        float m3=test_qvm::dot<float>(x.a,x.a);
-        BOOST_QVM_TEST_CLOSE(m1,m3,0.000001f);
-        BOOST_QVM_TEST_CLOSE(m2,m3,0.000001f);
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+\r
+        test_qvm::vector<V1,Dim> const x(42,1);\r
+        float m1=mag_sqr(x);\r
+        float m2=mag_sqr(vref(x));\r
+        float m3=test_qvm::dot<float>(x.a,x.a);\r
+        BOOST_QVM_TEST_CLOSE(m1,m3,0.000001f);\r
+        BOOST_QVM_TEST_CLOSE(m2,m3,0.000001f);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index f9b816f8a37a2dfc25ef2663fdc802b0dca2ac47..2595464cd75b76299d887f11fe7e6242d266c5ef 100644 (file)
@@ -1,35 +1,35 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-
-        test_qvm::vector<V1,Dim> const x(42,1);
-        float m1=mag(x);
-        float m2=mag(vref(x));
-        float m3=sqrtf(test_qvm::dot<float>(x.a,x.a));
-        BOOST_QVM_TEST_CLOSE(m1,m3,0.000001f);
-        BOOST_QVM_TEST_CLOSE(m2,m3,0.000001f);
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+\r
+        test_qvm::vector<V1,Dim> const x(42,1);\r
+        float m1=mag(x);\r
+        float m2=mag(vref(x));\r
+        float m3=sqrtf(test_qvm::dot<float>(x.a,x.a));\r
+        BOOST_QVM_TEST_CLOSE(m1,m3,0.000001f);\r
+        BOOST_QVM_TEST_CLOSE(m2,m3,0.000001f);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 8db70605aace84dbfea63c6dbe0489dc3761022c..333a5faec5a2bbd71f4aa1b6c09c461f6cbefeb9 100644 (file)
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-template <class T,class U>
-struct same_type;
-
-template <class T>
-struct
-same_type<T,T>
-    {
-    };
-
-template <class T,class P>
-void
-test_ref_cast( T & v, P * ptr )
-    {
-    using namespace boost::qvm;
-    BOOST_QVM_STATIC_ASSERT(is_mat<T>::value);
-    BOOST_QVM_STATIC_ASSERT(mat_traits<T>::rows==3);
-    BOOST_QVM_STATIC_ASSERT(mat_traits<T>::cols==2);
-    BOOST_TEST((mat_traits<T>::template read_element<0,0>(v)==ptr[0*2+0]));
-    BOOST_TEST((mat_traits<T>::template read_element<0,1>(v)==ptr[0*2+1]));
-    BOOST_TEST((mat_traits<T>::template read_element<1,0>(v)==ptr[1*2+0]));
-    BOOST_TEST((mat_traits<T>::template read_element<1,1>(v)==ptr[1*2+1]));
-    BOOST_TEST((mat_traits<T>::template read_element<2,0>(v)==ptr[2*2+0]));
-    BOOST_TEST((mat_traits<T>::template read_element<2,1>(v)==ptr[2*2+1]));
-    BOOST_TEST((&mat_traits<T>::template write_element<0,0>(v)==&ptr[0*2+0]));
-    BOOST_TEST((&mat_traits<T>::template write_element<0,1>(v)==&ptr[0*2+1]));
-    BOOST_TEST((&mat_traits<T>::template write_element<1,0>(v)==&ptr[1*2+0]));
-    BOOST_TEST((&mat_traits<T>::template write_element<1,1>(v)==&ptr[1*2+1]));
-    BOOST_TEST((&mat_traits<T>::template write_element<2,0>(v)==&ptr[2*2+0]));
-    BOOST_TEST((&mat_traits<T>::template write_element<2,1>(v)==&ptr[2*2+1]));
-    BOOST_TEST(&v[0][0]==&ptr[0*2+0]);
-    BOOST_TEST(&v[0][1]==&ptr[0*2+1]);
-    BOOST_TEST(&v[1][0]==&ptr[1*2+0]);
-    BOOST_TEST(&v[1][1]==&ptr[1*2+1]);
-    BOOST_TEST(&v[2][0]==&ptr[2*2+0]);
-    BOOST_TEST(&v[2][1]==&ptr[2*2+1]);
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-        {
-        BOOST_QVM_STATIC_ASSERT(!is_mat<int[3]>::value);
-        BOOST_QVM_STATIC_ASSERT(!is_mat<int[3][3][3]>::value);
-        BOOST_QVM_STATIC_ASSERT(is_mat<int[3][4]>::value);
-        BOOST_QVM_STATIC_ASSERT(mat_traits<int[3][4]>::rows==3);
-        BOOST_QVM_STATIC_ASSERT(mat_traits<int[3][4]>::cols==4);
-        same_type<mat_traits<int[3][4]>::scalar_type,int>();
-        same_type< mat<int,3,3>, deduce_mat<int[3][3]>::type >();
-        same_type< mat<int,3,3>, deduce_mat<int const[3][3]>::type >();
-        int arr[3][3] = {{00,01,02},{10,11,12},{20,21,22}};
-        BOOST_TEST((mat_traits<int[3][3]>::read_element<0,0>(arr)==00));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element<0,1>(arr)==01));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element<0,2>(arr)==02));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element<1,0>(arr)==10));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element<1,1>(arr)==11));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element<1,2>(arr)==12));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element<2,0>(arr)==20));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element<2,1>(arr)==21));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element<2,2>(arr)==22));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element<0,0>(arr)==00));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element<0,1>(arr)==01));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element<0,2>(arr)==02));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element<1,0>(arr)==10));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element<1,1>(arr)==11));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element<1,2>(arr)==12));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element<2,0>(arr)==20));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element<2,1>(arr)==21));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element<2,2>(arr)==22));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(0,0,arr)==00));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(0,1,arr)==01));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(0,2,arr)==02));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(1,0,arr)==10));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(1,1,arr)==11));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(1,2,arr)==12));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(2,0,arr)==20));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(2,1,arr)==21));
-        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(2,2,arr)==22));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(0,0,arr)==00));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(0,1,arr)==01));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(0,2,arr)==02));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(1,0,arr)==10));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(1,1,arr)==11));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(1,2,arr)==12));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(2,0,arr)==20));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(2,1,arr)==21));
-        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(2,2,arr)==22));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element<0,0>(arr)==&arr[0][0]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element<0,1>(arr)==&arr[0][1]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element<0,2>(arr)==&arr[0][2]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element<1,0>(arr)==&arr[1][0]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element<1,1>(arr)==&arr[1][1]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element<1,2>(arr)==&arr[1][2]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element<2,0>(arr)==&arr[2][0]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element<2,1>(arr)==&arr[2][1]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element<2,2>(arr)==&arr[2][2]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(0,0,arr)==&arr[0][0]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(0,1,arr)==&arr[0][1]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(0,2,arr)==&arr[0][2]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(1,0,arr)==&arr[1][0]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(1,1,arr)==&arr[1][1]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(1,2,arr)==&arr[1][2]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(2,0,arr)==&arr[2][0]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(2,1,arr)==&arr[2][1]));
-        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(2,2,arr)==&arr[2][2]));
-        }
-        {
-        int arr[42] = {0};
-        int * ptr=arr+5;
-        ptr[0*2+0]=42;
-        ptr[0*2+1]=43;
-        ptr[1*2+0]=44;
-        ptr[1*2+1]=45;
-        ptr[2*2+0]=46;
-        ptr[2*2+1]=47;
-        test_ref_cast(ptr_mref<3,2>(ptr),ptr);
-        int m[3][2] = {{1,1},{1,1},{1,1}};
-        ptr_mref<3,2>(ptr) += mref(m);
-        BOOST_TEST(ptr[0*2+0]=43);
-        BOOST_TEST(ptr[0*2+1]=44);
-        BOOST_TEST(ptr[1*2+0]=45);
-        BOOST_TEST(ptr[1*2+1]=46);
-        BOOST_TEST(ptr[2*2+0]=47);
-        BOOST_TEST(ptr[2*2+1]=48);
-        }
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+\r
+template <class T,class U>\r
+struct same_type;\r
+\r
+template <class T>\r
+struct\r
+same_type<T,T>\r
+    {\r
+    };\r
+\r
+template <class T,class P>\r
+void\r
+test_ref_cast( T & v, P * ptr )\r
+    {\r
+    using namespace boost::qvm;\r
+    BOOST_QVM_STATIC_ASSERT(is_mat<T>::value);\r
+    BOOST_QVM_STATIC_ASSERT(mat_traits<T>::rows==3);\r
+    BOOST_QVM_STATIC_ASSERT(mat_traits<T>::cols==2);\r
+    BOOST_TEST((mat_traits<T>::template read_element<0,0>(v)==ptr[0*2+0]));\r
+    BOOST_TEST((mat_traits<T>::template read_element<0,1>(v)==ptr[0*2+1]));\r
+    BOOST_TEST((mat_traits<T>::template read_element<1,0>(v)==ptr[1*2+0]));\r
+    BOOST_TEST((mat_traits<T>::template read_element<1,1>(v)==ptr[1*2+1]));\r
+    BOOST_TEST((mat_traits<T>::template read_element<2,0>(v)==ptr[2*2+0]));\r
+    BOOST_TEST((mat_traits<T>::template read_element<2,1>(v)==ptr[2*2+1]));\r
+    BOOST_TEST((&mat_traits<T>::template write_element<0,0>(v)==&ptr[0*2+0]));\r
+    BOOST_TEST((&mat_traits<T>::template write_element<0,1>(v)==&ptr[0*2+1]));\r
+    BOOST_TEST((&mat_traits<T>::template write_element<1,0>(v)==&ptr[1*2+0]));\r
+    BOOST_TEST((&mat_traits<T>::template write_element<1,1>(v)==&ptr[1*2+1]));\r
+    BOOST_TEST((&mat_traits<T>::template write_element<2,0>(v)==&ptr[2*2+0]));\r
+    BOOST_TEST((&mat_traits<T>::template write_element<2,1>(v)==&ptr[2*2+1]));\r
+    BOOST_TEST(&v[0][0]==&ptr[0*2+0]);\r
+    BOOST_TEST(&v[0][1]==&ptr[0*2+1]);\r
+    BOOST_TEST(&v[1][0]==&ptr[1*2+0]);\r
+    BOOST_TEST(&v[1][1]==&ptr[1*2+1]);\r
+    BOOST_TEST(&v[2][0]==&ptr[2*2+0]);\r
+    BOOST_TEST(&v[2][1]==&ptr[2*2+1]);\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+        {\r
+        BOOST_QVM_STATIC_ASSERT(!is_mat<int[3]>::value);\r
+        BOOST_QVM_STATIC_ASSERT(!is_mat<int[3][3][3]>::value);\r
+        BOOST_QVM_STATIC_ASSERT(is_mat<int[3][4]>::value);\r
+        BOOST_QVM_STATIC_ASSERT(mat_traits<int[3][4]>::rows==3);\r
+        BOOST_QVM_STATIC_ASSERT(mat_traits<int[3][4]>::cols==4);\r
+        same_type<mat_traits<int[3][4]>::scalar_type,int>();\r
+        same_type< mat<int,3,3>, deduce_mat<int[3][3]>::type >();\r
+        same_type< mat<int,3,3>, deduce_mat<int const[3][3]>::type >();\r
+        int arr[3][3] = {{00,01,02},{10,11,12},{20,21,22}};\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element<0,0>(arr)==00));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element<0,1>(arr)==01));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element<0,2>(arr)==02));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element<1,0>(arr)==10));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element<1,1>(arr)==11));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element<1,2>(arr)==12));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element<2,0>(arr)==20));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element<2,1>(arr)==21));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element<2,2>(arr)==22));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element<0,0>(arr)==00));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element<0,1>(arr)==01));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element<0,2>(arr)==02));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element<1,0>(arr)==10));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element<1,1>(arr)==11));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element<1,2>(arr)==12));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element<2,0>(arr)==20));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element<2,1>(arr)==21));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element<2,2>(arr)==22));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(0,0,arr)==00));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(0,1,arr)==01));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(0,2,arr)==02));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(1,0,arr)==10));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(1,1,arr)==11));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(1,2,arr)==12));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(2,0,arr)==20));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(2,1,arr)==21));\r
+        BOOST_TEST((mat_traits<int[3][3]>::read_element_idx(2,2,arr)==22));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(0,0,arr)==00));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(0,1,arr)==01));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(0,2,arr)==02));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(1,0,arr)==10));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(1,1,arr)==11));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(1,2,arr)==12));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(2,0,arr)==20));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(2,1,arr)==21));\r
+        BOOST_TEST((mat_traits<int const[3][3]>::read_element_idx(2,2,arr)==22));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element<0,0>(arr)==&arr[0][0]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element<0,1>(arr)==&arr[0][1]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element<0,2>(arr)==&arr[0][2]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element<1,0>(arr)==&arr[1][0]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element<1,1>(arr)==&arr[1][1]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element<1,2>(arr)==&arr[1][2]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element<2,0>(arr)==&arr[2][0]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element<2,1>(arr)==&arr[2][1]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element<2,2>(arr)==&arr[2][2]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(0,0,arr)==&arr[0][0]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(0,1,arr)==&arr[0][1]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(0,2,arr)==&arr[0][2]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(1,0,arr)==&arr[1][0]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(1,1,arr)==&arr[1][1]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(1,2,arr)==&arr[1][2]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(2,0,arr)==&arr[2][0]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(2,1,arr)==&arr[2][1]));\r
+        BOOST_TEST((&mat_traits<int[3][3]>::write_element_idx(2,2,arr)==&arr[2][2]));\r
+        }\r
+        {\r
+        int arr[42] = {0};\r
+        int * ptr=arr+5;\r
+        ptr[0*2+0]=42;\r
+        ptr[0*2+1]=43;\r
+        ptr[1*2+0]=44;\r
+        ptr[1*2+1]=45;\r
+        ptr[2*2+0]=46;\r
+        ptr[2*2+1]=47;\r
+        test_ref_cast(ptr_mref<3,2>(ptr),ptr);\r
+        int m[3][2] = {{1,1},{1,1},{1,1}};\r
+        ptr_mref<3,2>(ptr) += mref(m);\r
+        BOOST_TEST(ptr[0*2+0]=43);\r
+        BOOST_TEST(ptr[0*2+1]=44);\r
+        BOOST_TEST(ptr[1*2+0]=45);\r
+        BOOST_TEST(ptr[1*2+1]=46);\r
+        BOOST_TEST(ptr[2*2+0]=47);\r
+        BOOST_TEST(ptr[2*2+1]=48);\r
+        }\r
+    return boost::report_errors();\r
+    }\r
index d5906bfcc729f05b5076cd3cb87af4c4fee89674..b157adc7d86609cf7351d590e0d73a3d184895cb 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> x(42,2);
-            {
-            test_qvm::matrix<M1,Rows,Cols> const y(42,1);
-            test_qvm::subtract_m(x.b,x.a,y.a);
-            x-=y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-            {
-            test_qvm::matrix<M2,Rows,Cols> const y(42,1);
-            test_qvm::subtract_m(x.b,x.a,y.a);
-            x-=y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,2);\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> const y(42,1);\r
+            test_qvm::subtract_m(x.b,x.a,y.a);\r
+            x-=y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+            {\r
+            test_qvm::matrix<M2,Rows,Cols> const y(42,1);\r
+            test_qvm::subtract_m(x.b,x.a,y.a);\r
+            x-=y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index 81dafee0ba79b7d4497bac9e793389751d7b1c0e..a4a44bbcdddb2959b3a557a24906b04961425797 100644 (file)
@@ -1,37 +1,37 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> x(42,2);
-            {
-            test_qvm::quaternion<Q1> const y(42,1);
-            test_qvm::subtract_v(x.b,x.a,y.a);
-            x-=y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-            {
-            test_qvm::quaternion<Q2> const y(42,1);
-            test_qvm::subtract_v(x.b,x.a,y.a);
-            x-=y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> x(42,2);\r
+            {\r
+            test_qvm::quaternion<Q1> const y(42,1);\r
+            test_qvm::subtract_v(x.b,x.a,y.a);\r
+            x-=y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+            {\r
+            test_qvm::quaternion<Q2> const y(42,1);\r
+            test_qvm::subtract_v(x.b,x.a,y.a);\r
+            x-=y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 9b28bba6ab261199b44739da274504c71fee60c0..ca6abb7c29cf1e97ee52b1b5535e5ac5605695a2 100644 (file)
@@ -1,41 +1,41 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> x(42,2);
-            {
-            test_qvm::vector<V1,Dim> const y(42,1);
-            test_qvm::subtract_v(x.b,x.a,y.a);
-            x-=y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-            {
-            test_qvm::vector<V2,Dim> const y(42,1);
-            test_qvm::subtract_v(x.b,x.a,y.a);
-            x-=y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> x(42,2);\r
+            {\r
+            test_qvm::vector<V1,Dim> const y(42,1);\r
+            test_qvm::subtract_v(x.b,x.a,y.a);\r
+            x-=y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+            {\r
+            test_qvm::vector<V2,Dim> const y(42,1);\r
+            test_qvm::subtract_v(x.b,x.a,y.a);\r
+            x-=y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 62ca0dd5636609a4262cbb8afca7a7aa76387a17..fe98923cbf2cd56d2390a342474ada64bbb18397 100644 (file)
@@ -1,52 +1,52 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> const x(42,1);
-        test_qvm::scalar_multiply_m(x.b,x.a,-1.0f);
-        test_same_type(x,-x);
-            {
-            test_qvm::matrix<M1,Rows,Cols> y=-x;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-            {
-            test_qvm::matrix<M1,Rows,Cols> y=-mref(x);
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> const x(42,1);\r
+        test_qvm::scalar_multiply_m(x.b,x.a,-1.0f);\r
+        test_same_type(x,-x);\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> y=-x;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> y=-mref(x);\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index fbe8a1c9db48660730cedbe4ea8be6639ed57148..3e11abd0473d63e16ef69ef7f8999bcd63d3a72d 100644 (file)
@@ -1,61 +1,61 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> const x(42,2);
-            {
-            test_qvm::matrix<M1,Rows,Cols> const y(42,1);
-            test_same_type(x,x-y);
-            test_qvm::matrix<M1,Rows,Cols> r=x-y;
-            test_qvm::subtract_m(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-            {
-            test_qvm::matrix<M1,Rows,Cols> const y(42,1);
-            test_qvm::matrix<M2,Rows,Cols> r=mref(x)-y;
-            test_qvm::subtract_m(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-            {
-            test_qvm::matrix<M1,Rows,Cols> const y(42,1);
-            test_qvm::matrix<M2,Rows,Cols> r=x-mref(y);
-            test_qvm::subtract_m(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> const x(42,2);\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> const y(42,1);\r
+            test_same_type(x,x-y);\r
+            test_qvm::matrix<M1,Rows,Cols> r=x-y;\r
+            test_qvm::subtract_m(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> const y(42,1);\r
+            test_qvm::matrix<M2,Rows,Cols> r=mref(x)-y;\r
+            test_qvm::subtract_m(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> const y(42,1);\r
+            test_qvm::matrix<M2,Rows,Cols> r=x-mref(y);\r
+            test_qvm::subtract_m(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index 845a0bbfad67f8c1c3e2221a987199b05777b304..4707a06e508f349a1f5faa14293c6267c2c0c75b 100644 (file)
@@ -1,40 +1,40 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> const x(42,1);
-        test_qvm::scalar_multiply_v(x.b,x.a,-1.0f);
-        test_same_type(x,-x);
-            {
-            test_qvm::quaternion<Q1> y=-x;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-            {
-            test_qvm::quaternion<Q1> y=-qref(x);
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> const x(42,1);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,-1.0f);\r
+        test_same_type(x,-x);\r
+            {\r
+            test_qvm::quaternion<Q1> y=-x;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+            {\r
+            test_qvm::quaternion<Q1> y=-qref(x);\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index ee37c0c231ec66a79d7e8c1ff473c67535685267..29d7fad113b4104dcb979482c32db582be2150a1 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> const x(42,2);
-            {
-            test_qvm::quaternion<Q1> const y(42,1);
-            test_same_type(x,x-y);
-            test_qvm::quaternion<Q1> r=x-y;
-            test_qvm::subtract_v(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-            {
-            test_qvm::quaternion<Q1> const y(42,1);
-            test_qvm::quaternion<Q2> r=qref(x)-y;
-            test_qvm::subtract_v(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-            {
-            test_qvm::quaternion<Q1> const y(42,1);
-            test_qvm::quaternion<Q2> r=x-qref(y);
-            test_qvm::subtract_v(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> const x(42,2);\r
+            {\r
+            test_qvm::quaternion<Q1> const y(42,1);\r
+            test_same_type(x,x-y);\r
+            test_qvm::quaternion<Q1> r=x-y;\r
+            test_qvm::subtract_v(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+            {\r
+            test_qvm::quaternion<Q1> const y(42,1);\r
+            test_qvm::quaternion<Q2> r=qref(x)-y;\r
+            test_qvm::subtract_v(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+            {\r
+            test_qvm::quaternion<Q1> const y(42,1);\r
+            test_qvm::quaternion<Q2> r=x-qref(y);\r
+            test_qvm::subtract_v(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 9a5c9902576e0663d8fde1f1f1c693933caa9aec..723f8f7abf234bfe88fd50fe1b01cf3093b2b5f6 100644 (file)
@@ -1,44 +1,44 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> const x(42,1);
-        test_qvm::scalar_multiply_v(x.b,x.a,-1.0f);
-        test_same_type(x,-x);
-            {
-            test_qvm::vector<V1,Dim> y=-x;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-            {
-            test_qvm::vector<V1,Dim> y=-vref(x);
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> const x(42,1);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,-1.0f);\r
+        test_same_type(x,-x);\r
+            {\r
+            test_qvm::vector<V1,Dim> y=-x;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+            {\r
+            test_qvm::vector<V1,Dim> y=-vref(x);\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 0d09a4f553d86447db358619f67f519120ecb100..0dc9c487f4cba07882cb441a92616b1ae0ffeda0 100644 (file)
@@ -1,53 +1,53 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> const x(42,2);
-            {
-            test_qvm::vector<V1,Dim> const y(42,1);
-            test_same_type(x,x-y);
-            test_qvm::vector<V1,Dim> r=x-y;
-            test_qvm::subtract_v(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-            {
-            test_qvm::vector<V1,Dim> const y(42,1);
-            test_qvm::vector<V2,Dim> r=vref(x)-y;
-            test_qvm::subtract_v(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-            {
-            test_qvm::vector<V1,Dim> const y(42,1);
-            test_qvm::vector<V2,Dim> r=x-vref(y);
-            test_qvm::subtract_v(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> const x(42,2);\r
+            {\r
+            test_qvm::vector<V1,Dim> const y(42,1);\r
+            test_same_type(x,x-y);\r
+            test_qvm::vector<V1,Dim> r=x-y;\r
+            test_qvm::subtract_v(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+            {\r
+            test_qvm::vector<V1,Dim> const y(42,1);\r
+            test_qvm::vector<V2,Dim> r=vref(x)-y;\r
+            test_qvm::subtract_v(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+            {\r
+            test_qvm::vector<V1,Dim> const y(42,1);\r
+            test_qvm::vector<V2,Dim> r=x-vref(y);\r
+            test_qvm::subtract_v(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 5c78e29f870ad9562a8b53fdb73d6432f6749ee8..87b8a644cbef56304e5e32b1136f268b5e4b98c0 100644 (file)
@@ -1,42 +1,42 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-            {
-            test_qvm::matrix<M1,Dim,Dim> x(42,1);
-            test_qvm::matrix<M1,Dim,Dim> const y(42,2);
-            test_qvm::multiply_m(x.b,x.a,y.a);
-            x *= y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-            {
-            test_qvm::matrix<M1,Dim,Dim> x(42,1);
-            test_qvm::matrix<M2,Dim,Dim> const y(42,2);
-            test_qvm::multiply_m(x.b,x.a,y.a);
-            x *= y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+            {\r
+            test_qvm::matrix<M1,Dim,Dim> x(42,1);\r
+            test_qvm::matrix<M1,Dim,Dim> const y(42,2);\r
+            test_qvm::multiply_m(x.b,x.a,y.a);\r
+            x *= y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+            {\r
+            test_qvm::matrix<M1,Dim,Dim> x(42,1);\r
+            test_qvm::matrix<M2,Dim,Dim> const y(42,2);\r
+            test_qvm::multiply_m(x.b,x.a,y.a);\r
+            x *= y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 11776de4ec5fa7bac687bd2d33658e6cac347b34..b470fa95682fc6ea9b2301b7c10369d423c0c41b 100644 (file)
@@ -1,40 +1,40 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        test_qvm::scalar_multiply_m(x.b,x.a,2.0f);
-        x*=2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        test_qvm::scalar_multiply_m(x.b,x.a,2.0f);\r
+        x*=2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index 1c1d814fd96b4c31a885bc597501b6be0f0a2868..d2744caf76cc6461daa8d3fdb5f3b71f37a8af1f 100644 (file)
@@ -1,46 +1,46 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        for( float a=0; a<6.28f; a+=0.2f )
-            {
-            test_qvm::quaternion<Q1> const qx=rotx_quat(a);
-            test_qvm::quaternion<Q1> const qy=roty_quat(a);
-            test_qvm::quaternion<Q1> const qz=rotz_quat(a);
-            test_qvm::quaternion<Q1> q1=identity_quat<float>();
-            q1 *= qx;
-            q1 *= qy;
-            q1 *= qref(qz);
-            test_qvm::matrix<M1,3,3> const mx=rotx_mat<3>(a);
-            test_qvm::matrix<M1,3,3> const my=roty_mat<3>(a);
-            test_qvm::matrix<M1,3,3> const mz=rotz_mat<3>(a);
-            test_qvm::matrix<M1,3,3> const m=mx*my*mz;
-            test_qvm::quaternion<Q1> const q2=convert_to< test_qvm::quaternion<Q1> >(m);
-            BOOST_QVM_TEST_CLOSE_QUAT(q1.a,q2.a,0.00001f);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        for( float a=0; a<6.28f; a+=0.2f )\r
+            {\r
+            test_qvm::quaternion<Q1> const qx=rotx_quat(a);\r
+            test_qvm::quaternion<Q1> const qy=roty_quat(a);\r
+            test_qvm::quaternion<Q1> const qz=rotz_quat(a);\r
+            test_qvm::quaternion<Q1> q1=identity_quat<float>();\r
+            q1 *= qx;\r
+            q1 *= qy;\r
+            q1 *= qref(qz);\r
+            test_qvm::matrix<M1,3,3> const mx=rotx_mat<3>(a);\r
+            test_qvm::matrix<M1,3,3> const my=roty_mat<3>(a);\r
+            test_qvm::matrix<M1,3,3> const mz=rotz_mat<3>(a);\r
+            test_qvm::matrix<M1,3,3> const m=mx*my*mz;\r
+            test_qvm::quaternion<Q1> const q2=convert_to< test_qvm::quaternion<Q1> >(m);\r
+            BOOST_QVM_TEST_CLOSE_QUAT(q1.a,q2.a,0.00001f);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 1d3e3d527b6c53fddf9fa97673f35c573ba31e33..e5852dd17da48c2dedb558aae134c82e1fb339e7 100644 (file)
@@ -1,28 +1,28 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> x(42,1);
-        test_qvm::scalar_multiply_v(x.b,x.a,2);
-        x*=2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> x(42,1);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,2);\r
+        x*=2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 56da18c757da3bbd2280a6c380437ec7677b0b71..51f411ccd59f822282a6ebb4afbd7bc9ebb582d6 100644 (file)
@@ -1,33 +1,33 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> x(42,1);
-        test_qvm::scalar_multiply_v(x.b,x.a,2.0f);
-        x*=2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        }
-    }
-
-int
-main()
-    {
-    test<1>();
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> x(42,1);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,2.0f);\r
+        x*=2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1>();\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 95ac94f62bfc24c0accae6695170c4037a2889c1..85bdd6032ca856de7b62d3c167554bfae3991412 100644 (file)
@@ -1,55 +1,55 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int R,int CR,int C>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,R,CR> const x(42,1);
-        test_qvm::matrix<M2,CR,C> const y(42,1);
-            {
-            test_qvm::matrix<M3,R,C> r=x*y;
-            test_qvm::multiply_m(r.b,x.b,y.b);
-            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);
-            }
-            {
-            test_qvm::matrix<M3,R,C> r=mref(x)*y;
-            test_qvm::multiply_m(r.b,x.b,y.b);
-            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);
-            }
-            {
-            test_qvm::matrix<M3,R,C> r=x*mref(y);
-            test_qvm::multiply_m(r.b,x.b,y.b);
-            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<1,2,2>();
-    test<2,2,1>();
-    test<2,2,2>();
-    test<1,3,3>();
-    test<3,3,1>();
-    test<3,3,3>();
-    test<1,4,4>();
-    test<4,4,1>();
-    test<4,4,4>();
-    test<1,5,5>();
-    test<5,5,1>();
-    test<5,5,5>();
-    test<2,3,4>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int R,int CR,int C>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,R,CR> const x(42,1);\r
+        test_qvm::matrix<M2,CR,C> const y(42,1);\r
+            {\r
+            test_qvm::matrix<M3,R,C> r=x*y;\r
+            test_qvm::multiply_m(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);\r
+            }\r
+            {\r
+            test_qvm::matrix<M3,R,C> r=mref(x)*y;\r
+            test_qvm::multiply_m(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);\r
+            }\r
+            {\r
+            test_qvm::matrix<M3,R,C> r=x*mref(y);\r
+            test_qvm::multiply_m(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2,2>();\r
+    test<2,2,1>();\r
+    test<2,2,2>();\r
+    test<1,3,3>();\r
+    test<3,3,1>();\r
+    test<3,3,3>();\r
+    test<1,4,4>();\r
+    test<4,4,1>();\r
+    test<4,4,4>();\r
+    test<1,5,5>();\r
+    test<5,5,1>();\r
+    test<5,5,5>();\r
+    test<2,3,4>();\r
+    return boost::report_errors();\r
+    }\r
index 642b2732ac7df57d8d39e014470fd9481bf9cad4..ce8319f050916f539edefc4aa1b2f40b1ce5f39c 100644 (file)
@@ -1,52 +1,52 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> const x(42,1);
-        test_qvm::scalar_multiply_m(x.b,x.a,2.0f);
-        test_same_type(x,x*2);
-            {
-            test_qvm::matrix<M1,Rows,Cols> y=x*2;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-            {
-            test_qvm::matrix<M1,Rows,Cols> y=mref(x)*2;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> const x(42,1);\r
+        test_qvm::scalar_multiply_m(x.b,x.a,2.0f);\r
+        test_same_type(x,x*2);\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> y=x*2;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> y=mref(x)*2;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index 368116d2c8841c0cda74b39a070ebbf380a68969..c475ee9db76cf3219199546beae1895c746ed867 100644 (file)
@@ -1,75 +1,75 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_mat_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include <boost/qvm/vec.hpp>
-#include "test_qvm_matrix.hpp"
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U>
-    struct same_type;
-
-    template <class T>
-    struct
-    same_type<T,T>
-        {
-        };
-
-    template <class T,class U>
-    void
-    check_same_type( T const &, U const & )
-        {
-        same_type<T,U>();
-        }
-
-    template <int M,int N>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,M,N> const x(42,1);
-        test_qvm::vector<V1,N> const y(42,1);
-            {
-            test_qvm::vector<V2,M> r=x*y;
-            test_qvm::multiply_mv(r.b,x.b,y.b);
-            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);
-            }
-            {
-            test_qvm::vector<V2,M> r=mref(x)*y;
-            test_qvm::multiply_mv(r.b,x.b,y.b);
-            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);
-            }
-            {
-            test_qvm::vector<V2,M> r=x*vref(y);
-            test_qvm::multiply_mv(r.b,x.b,y.b);
-            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);
-            }
-        check_same_type(x*y,boost::qvm::vec<float,M>());
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_mat_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U>\r
+    struct same_type;\r
+\r
+    template <class T>\r
+    struct\r
+    same_type<T,T>\r
+        {\r
+        };\r
+\r
+    template <class T,class U>\r
+    void\r
+    check_same_type( T const &, U const & )\r
+        {\r
+        same_type<T,U>();\r
+        }\r
+\r
+    template <int M,int N>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,M,N> const x(42,1);\r
+        test_qvm::vector<V1,N> const y(42,1);\r
+            {\r
+            test_qvm::vector<V2,M> r=x*y;\r
+            test_qvm::multiply_mv(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);\r
+            }\r
+            {\r
+            test_qvm::vector<V2,M> r=mref(x)*y;\r
+            test_qvm::multiply_mv(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);\r
+            }\r
+            {\r
+            test_qvm::vector<V2,M> r=x*vref(y);\r
+            test_qvm::multiply_mv(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);\r
+            }\r
+        check_same_type(x*y,boost::qvm::vec<float,M>());\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index 7b45ce408fe91166c0163de41eb07bd50001b462..5a6eabf9f3ea045e023c7161a5e9a8cbb836defa 100644 (file)
@@ -1,45 +1,45 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        for( float a=0; a<6.28f; a+=0.2f )
-            {
-            test_qvm::quaternion<Q1> const qx=rotx_quat(a);
-            test_qvm::quaternion<Q1> const qy=roty_quat(a);
-            test_qvm::quaternion<Q1> const qz=rotz_quat(a);
-            test_qvm::quaternion<Q1> const q1=qx*qy*qref(qz);
-            test_qvm::matrix<M1,3,3> const mx=rotx_mat<3>(a);
-            test_qvm::matrix<M1,3,3> const my=roty_mat<3>(a);
-            test_qvm::matrix<M1,3,3> const mz=rotz_mat<3>(a);
-            test_qvm::matrix<M1,3,3> const m=mx*my*mz;
-            test_qvm::quaternion<Q1> const q2=convert_to< test_qvm::quaternion<Q1> >(m);
-            test_same_type(qx,qx*qy);
-            BOOST_QVM_TEST_CLOSE_QUAT(q1.a,q2.a,0.00001f);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        for( float a=0; a<6.28f; a+=0.2f )\r
+            {\r
+            test_qvm::quaternion<Q1> const qx=rotx_quat(a);\r
+            test_qvm::quaternion<Q1> const qy=roty_quat(a);\r
+            test_qvm::quaternion<Q1> const qz=rotz_quat(a);\r
+            test_qvm::quaternion<Q1> const q1=qx*qy*qref(qz);\r
+            test_qvm::matrix<M1,3,3> const mx=rotx_mat<3>(a);\r
+            test_qvm::matrix<M1,3,3> const my=roty_mat<3>(a);\r
+            test_qvm::matrix<M1,3,3> const mz=rotz_mat<3>(a);\r
+            test_qvm::matrix<M1,3,3> const m=mx*my*mz;\r
+            test_qvm::quaternion<Q1> const q2=convert_to< test_qvm::quaternion<Q1> >(m);\r
+            test_same_type(qx,qx*qy);\r
+            BOOST_QVM_TEST_CLOSE_QUAT(q1.a,q2.a,0.00001f);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 89089df9adc7d97cb332bc9242c7bc712bac5988..b5ea1163f52e5e10f8e7aa1765693807c3cc0bba 100644 (file)
@@ -1,40 +1,40 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> const x(42,1);
-        test_qvm::scalar_multiply_v(x.b,x.a,2);
-        test_same_type(x,x*2);
-            {
-            test_qvm::quaternion<Q1> y=x*2;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-            {
-            test_qvm::quaternion<Q1> y=qref(x)*2;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> const x(42,1);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,2);\r
+        test_same_type(x,x*2);\r
+            {\r
+            test_qvm::quaternion<Q1> y=x*2;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+            {\r
+            test_qvm::quaternion<Q1> y=qref(x)*2;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 403d45d2e2a5c9abe3c32c0d173d9b757c5aac70..d2f7fb597e6fabc5c7a66d6457f856cc7f1886f5 100644 (file)
@@ -1,51 +1,51 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "test_qvm_matrix.hpp"
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        for( float a=0; a<6.28f; a+=0.2f )
-            {
-            test_qvm::quaternion<Q1> const qx=rotx_quat(a);
-            test_qvm::quaternion<Q1> const qy=roty_quat(a);
-            test_qvm::quaternion<Q1> const qz=rotz_quat(a);
-            test_qvm::matrix<M1,3,3> const mx=rotx_mat<3>(a);
-            test_qvm::matrix<M1,3,3> const my=roty_mat<3>(a);
-            test_qvm::matrix<M1,3,3> const mz=rotz_mat<3>(a);
-            test_qvm::vector<V1,3> const v(42,1);
-            test_same_type(vec<float,3>(),qx*v);
-            test_qvm::vector<V1,3> const q_vx=qx*v;
-            test_qvm::vector<V1,3> const m_vx=mx*v;
-            test_qvm::vector<V1,3> const q_vy=qy*v;
-            test_qvm::vector<V1,3> const m_vy=my*v;
-            test_qvm::vector<V1,3> const q_vz=qz*v;
-            test_qvm::vector<V1,3> const m_vz=mz*v;
-            BOOST_QVM_TEST_CLOSE(q_vx.a,m_vx.a,0.001f);
-            BOOST_QVM_TEST_CLOSE(q_vy.a,m_vy.a,0.001f);
-            BOOST_QVM_TEST_CLOSE(q_vz.a,m_vz.a,0.001f);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        for( float a=0; a<6.28f; a+=0.2f )\r
+            {\r
+            test_qvm::quaternion<Q1> const qx=rotx_quat(a);\r
+            test_qvm::quaternion<Q1> const qy=roty_quat(a);\r
+            test_qvm::quaternion<Q1> const qz=rotz_quat(a);\r
+            test_qvm::matrix<M1,3,3> const mx=rotx_mat<3>(a);\r
+            test_qvm::matrix<M1,3,3> const my=roty_mat<3>(a);\r
+            test_qvm::matrix<M1,3,3> const mz=rotz_mat<3>(a);\r
+            test_qvm::vector<V1,3> const v(42,1);\r
+            test_same_type(vec<float,3>(),qx*v);\r
+            test_qvm::vector<V1,3> const q_vx=qx*v;\r
+            test_qvm::vector<V1,3> const m_vx=mx*v;\r
+            test_qvm::vector<V1,3> const q_vy=qy*v;\r
+            test_qvm::vector<V1,3> const m_vy=my*v;\r
+            test_qvm::vector<V1,3> const q_vz=qz*v;\r
+            test_qvm::vector<V1,3> const m_vz=mz*v;\r
+            BOOST_QVM_TEST_CLOSE(q_vx.a,m_vx.a,0.001f);\r
+            BOOST_QVM_TEST_CLOSE(q_vy.a,m_vy.a,0.001f);\r
+            BOOST_QVM_TEST_CLOSE(q_vz.a,m_vz.a,0.001f);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 17f703a69ebd783770e2e393e13fe62012506ae6..b98fa9bfa012728308966d990dfc7ed5f68e5dda 100644 (file)
@@ -1,75 +1,75 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/vec_mat_operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include "test_qvm_matrix.hpp"
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U>
-    struct same_type;
-
-    template <class T>
-    struct
-    same_type<T,T>
-        {
-        };
-
-    template <class T,class U>
-    void
-    check_same_type( T const &, U const & )
-        {
-        same_type<T,U>();
-        }
-
-    template <int M,int N>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        using namespace boost::qvm;
-        test_qvm::vector<V1,M> const x(42,1);
-        test_qvm::matrix<M1,M,N> const y(42,1);
-            {
-            test_qvm::vector<V2,N> r=x*y;
-            test_qvm::multiply_vm(r.b,x.b,y.b);
-            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);
-            }
-            {
-            test_qvm::vector<V2,N> r=vref(x)*y;
-            test_qvm::multiply_vm(r.b,x.b,y.b);
-            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);
-            }
-            {
-            test_qvm::vector<V2,N> r=x*mref(y);
-            test_qvm::multiply_vm(r.b,x.b,y.b);
-            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);
-            }
-        check_same_type(x*y,boost::qvm::vec<float,N>());
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/vec_mat_operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U>\r
+    struct same_type;\r
+\r
+    template <class T>\r
+    struct\r
+    same_type<T,T>\r
+        {\r
+        };\r
+\r
+    template <class T,class U>\r
+    void\r
+    check_same_type( T const &, U const & )\r
+        {\r
+        same_type<T,U>();\r
+        }\r
+\r
+    template <int M,int N>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        using namespace boost::qvm;\r
+        test_qvm::vector<V1,M> const x(42,1);\r
+        test_qvm::matrix<M1,M,N> const y(42,1);\r
+            {\r
+            test_qvm::vector<V2,N> r=x*y;\r
+            test_qvm::multiply_vm(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);\r
+            }\r
+            {\r
+            test_qvm::vector<V2,N> r=vref(x)*y;\r
+            test_qvm::multiply_vm(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);\r
+            }\r
+            {\r
+            test_qvm::vector<V2,N> r=x*mref(y);\r
+            test_qvm::multiply_vm(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_CLOSE(r.a,r.b,0.0000001f);\r
+            }\r
+        check_same_type(x*y,boost::qvm::vec<float,N>());\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index 833824549bf8328dad405b123fd47ad2eea96667..a0c5100ef2a959dec9a3aea1f490cc10c69aa3ba 100644 (file)
@@ -1,45 +1,45 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> const x(42,1);
-        test_qvm::scalar_multiply_v(x.b,x.a,2.0f);
-        test_same_type(x,x*2);
-            {
-            test_qvm::vector<V1,Dim> y=x*2;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-            {
-            test_qvm::vector<V1,Dim> y=vref(x)*2;
-            BOOST_QVM_TEST_EQ(x.b,y.a);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<1>();
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> const x(42,1);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,2.0f);\r
+        test_same_type(x,x*2);\r
+            {\r
+            test_qvm::vector<V1,Dim> y=x*2;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+            {\r
+            test_qvm::vector<V1,Dim> y=vref(x)*2;\r
+            BOOST_QVM_TEST_EQ(x.b,y.a);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1>();\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 9ff94790b9039ab1895f2ea655ccb5da8649a130..700fb50a4f2cb9e90e370b1e3a92d51425f3b44d 100644 (file)
@@ -1,55 +1,55 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map_mat_mat.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols,int Col>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        float r1[Rows][Cols];
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols; ++j )
-                r1[i][j]=(j==Col?-x.a[i][j]:x.a[i][j]);
-        float r2[Rows][Cols];
-        assign(r2,neg_col<Col>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        neg_col<Col>(x) + neg_col<Col>(x);
-        -neg_col<Col>(x);
-        }
-    }
-
-int
-main()
-    {
-    test<2,2,0>();
-    test<2,2,1>();
-
-    test<3,3,0>();
-    test<3,3,1>();
-    test<3,3,2>();
-
-    test<4,4,0>();
-    test<4,4,1>();
-    test<4,4,2>();
-    test<4,4,3>();
-
-    test<5,5,0>();
-    test<5,5,1>();
-    test<5,5,2>();
-    test<5,5,3>();
-    test<5,5,4>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map_mat_mat.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols,int Col>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        float r1[Rows][Cols];\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                r1[i][j]=(j==Col?-x.a[i][j]:x.a[i][j]);\r
+        float r2[Rows][Cols];\r
+        assign(r2,neg_col<Col>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        neg_col<Col>(x) + neg_col<Col>(x);\r
+        -neg_col<Col>(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2,2,0>();\r
+    test<2,2,1>();\r
+\r
+    test<3,3,0>();\r
+    test<3,3,1>();\r
+    test<3,3,2>();\r
+\r
+    test<4,4,0>();\r
+    test<4,4,1>();\r
+    test<4,4,2>();\r
+    test<4,4,3>();\r
+\r
+    test<5,5,0>();\r
+    test<5,5,1>();\r
+    test<5,5,2>();\r
+    test<5,5,3>();\r
+    test<5,5,4>();\r
+    return boost::report_errors();\r
+    }\r
index e8ad870de637538de04336dac5a99212a48336da..2d4eb42d7308fcb95c5fb8d9bb0b87053ccc9d7b 100644 (file)
@@ -1,55 +1,55 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map_mat_mat.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols,int Row>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        float r1[Rows][Cols];
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols; ++j )
-                r1[i][j]=(i==Row?-x.a[i][j]:x.a[i][j]);
-        float r2[Rows][Cols];
-        assign(r2,neg_row<Row>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        neg_row<Row>(x) + neg_row<Row>(x);
-        -neg_row<Row>(x);
-        }
-    }
-
-int
-main()
-    {
-    test<2,2,0>();
-    test<2,2,1>();
-
-    test<3,3,0>();
-    test<3,3,1>();
-    test<3,3,2>();
-
-    test<4,4,0>();
-    test<4,4,1>();
-    test<4,4,2>();
-    test<4,4,3>();
-
-    test<5,5,0>();
-    test<5,5,1>();
-    test<5,5,2>();
-    test<5,5,3>();
-    test<5,5,4>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map_mat_mat.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols,int Row>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        float r1[Rows][Cols];\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                r1[i][j]=(i==Row?-x.a[i][j]:x.a[i][j]);\r
+        float r2[Rows][Cols];\r
+        assign(r2,neg_row<Row>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        neg_row<Row>(x) + neg_row<Row>(x);\r
+        -neg_row<Row>(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2,2,0>();\r
+    test<2,2,1>();\r
+\r
+    test<3,3,0>();\r
+    test<3,3,1>();\r
+    test<3,3,2>();\r
+\r
+    test<4,4,0>();\r
+    test<4,4,1>();\r
+    test<4,4,2>();\r
+    test<4,4,3>();\r
+\r
+    test<5,5,0>();\r
+    test<5,5,1>();\r
+    test<5,5,2>();\r
+    test<5,5,3>();\r
+    test<5,5,4>();\r
+    return boost::report_errors();\r
+    }\r
index ad1b5f9ef424e3c1a1040d55cc74bab4372e7e45..275229c27abf042208255eca258d3af9cba9fa49 100644 (file)
@@ -1,51 +1,51 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-            {
-        test_qvm::quaternion<Q1> const x(42,1);
-        test_same_type(x,normalized(x));
-        test_qvm::quaternion<Q1> y=normalized(x);
-        float m=sqrtf(test_qvm::dot<float>(x.a,x.a));
-        test_qvm::scalar_multiply_v(y.b,x.a,1/m);
-        BOOST_QVM_TEST_CLOSE(y.a,y.b,0.000001f);
-            }
-            {
-        test_qvm::quaternion<Q1> const x(42,1);
-        test_qvm::quaternion<Q1> y=normalized(qref(x));
-        float m=sqrtf(test_qvm::dot<float>(x.a,x.a));
-        test_qvm::scalar_multiply_v(y.b,x.a,1/m);
-        BOOST_QVM_TEST_CLOSE(y.a,y.b,0.000001f);
-            }
-            {
-        test_qvm::quaternion<Q1> x(42,1);
-        float m=sqrtf(test_qvm::dot<float>(x.a,x.a));
-        test_qvm::scalar_multiply_v(x.b,x.a,1/m);
-        normalize(x);
-        BOOST_QVM_TEST_CLOSE(x.a,x.b,0.000001f);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+            {\r
+        test_qvm::quaternion<Q1> const x(42,1);\r
+        test_same_type(x,normalized(x));\r
+        test_qvm::quaternion<Q1> y=normalized(x);\r
+        float m=sqrtf(test_qvm::dot<float>(x.a,x.a));\r
+        test_qvm::scalar_multiply_v(y.b,x.a,1/m);\r
+        BOOST_QVM_TEST_CLOSE(y.a,y.b,0.000001f);\r
+            }\r
+            {\r
+        test_qvm::quaternion<Q1> const x(42,1);\r
+        test_qvm::quaternion<Q1> y=normalized(qref(x));\r
+        float m=sqrtf(test_qvm::dot<float>(x.a,x.a));\r
+        test_qvm::scalar_multiply_v(y.b,x.a,1/m);\r
+        BOOST_QVM_TEST_CLOSE(y.a,y.b,0.000001f);\r
+            }\r
+            {\r
+        test_qvm::quaternion<Q1> x(42,1);\r
+        float m=sqrtf(test_qvm::dot<float>(x.a,x.a));\r
+        test_qvm::scalar_multiply_v(x.b,x.a,1/m);\r
+        normalize(x);\r
+        BOOST_QVM_TEST_CLOSE(x.a,x.b,0.000001f);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 8bca04b0a8a6b7bb99ca4ded32e406c14938f44f..3ab3aa7b6e58e7c01c0d45a9acb7efcc4f16313c 100644 (file)
@@ -1,47 +1,47 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-            {
-        test_qvm::vector<V1,Dim> const x(42,1);
-        test_same_type(x,normalized(x));
-        test_qvm::vector<V1,Dim> y=normalized(x);
-        float m=sqrtf(test_qvm::dot<float>(x.a,x.a));
-        test_qvm::scalar_multiply_v(y.b,x.a,1/m);
-        BOOST_QVM_TEST_CLOSE(y.a,y.b,0.000001f);
-            }
-            {
-        test_qvm::vector<V1,Dim> x(42,1);
-        float m=sqrtf(test_qvm::dot<float>(x.a,x.a));
-        test_qvm::scalar_multiply_v(x.b,x.a,1/m);
-        normalize(x);
-        BOOST_QVM_TEST_CLOSE(x.a,x.b,0.000001f);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+            {\r
+        test_qvm::vector<V1,Dim> const x(42,1);\r
+        test_same_type(x,normalized(x));\r
+        test_qvm::vector<V1,Dim> y=normalized(x);\r
+        float m=sqrtf(test_qvm::dot<float>(x.a,x.a));\r
+        test_qvm::scalar_multiply_v(y.b,x.a,1/m);\r
+        BOOST_QVM_TEST_CLOSE(y.a,y.b,0.000001f);\r
+            }\r
+            {\r
+        test_qvm::vector<V1,Dim> x(42,1);\r
+        float m=sqrtf(test_qvm::dot<float>(x.a,x.a));\r
+        test_qvm::scalar_multiply_v(x.b,x.a,1/m);\r
+        normalize(x);\r
+        BOOST_QVM_TEST_CLOSE(x.a,x.b,0.000001f);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index fc4b5a2602a6653f1a4f461ce99627cae3f30f08..f398d118f2a9c464ac716a9b3f2b3f5f3709f914 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> x(42,2);
-            {
-            test_qvm::matrix<M1,Rows,Cols> const y(42,1);
-            test_qvm::add_m(x.b,x.a,y.a);
-            x+=y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-            {
-            test_qvm::matrix<M2,Rows,Cols> const y(42,1);
-            test_qvm::add_m(x.b,x.a,y.a);
-            x+=y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,2);\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> const y(42,1);\r
+            test_qvm::add_m(x.b,x.a,y.a);\r
+            x+=y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+            {\r
+            test_qvm::matrix<M2,Rows,Cols> const y(42,1);\r
+            test_qvm::add_m(x.b,x.a,y.a);\r
+            x+=y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index 22d911c2a96adc70aa2a18a3d417e00634ad19c0..85206f2731f619bb17ce5d0afbbeb4104b137dc9 100644 (file)
@@ -1,37 +1,37 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> x(42,2);
-            {
-            test_qvm::quaternion<Q1> const y(42,1);
-            test_qvm::add_v(x.b,x.a,y.a);
-            x+=y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-            {
-            test_qvm::quaternion<Q2> const y(42,1);
-            test_qvm::add_v(x.b,x.a,y.a);
-            x+=y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> x(42,2);\r
+            {\r
+            test_qvm::quaternion<Q1> const y(42,1);\r
+            test_qvm::add_v(x.b,x.a,y.a);\r
+            x+=y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+            {\r
+            test_qvm::quaternion<Q2> const y(42,1);\r
+            test_qvm::add_v(x.b,x.a,y.a);\r
+            x+=y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index c069edc457d012f211a64efe16a0bdbfcfb723ce..b92bf4a3001454ea06dbd175f01f89390ecda4ef 100644 (file)
@@ -1,41 +1,41 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> x(42,2);
-            {
-            test_qvm::vector<V1,Dim> const y(42,1);
-            test_qvm::add_v(x.b,x.a,y.a);
-            x+=y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-            {
-            test_qvm::vector<V2,Dim> const y(42,1);
-            test_qvm::add_v(x.b,x.a,y.a);
-            x+=y;
-            BOOST_QVM_TEST_EQ(x.a,x.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> x(42,2);\r
+            {\r
+            test_qvm::vector<V1,Dim> const y(42,1);\r
+            test_qvm::add_v(x.b,x.a,y.a);\r
+            x+=y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+            {\r
+            test_qvm::vector<V2,Dim> const y(42,1);\r
+            test_qvm::add_v(x.b,x.a,y.a);\r
+            x+=y;\r
+            BOOST_QVM_TEST_EQ(x.a,x.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index f33aa053cdefa4c0388f819bd8367288b480a084..bfc10c8983bbf5f5b3be79f0d900a885c91cacb1 100644 (file)
@@ -1,61 +1,61 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols> const x(42,2);
-            {
-            test_qvm::matrix<M1,Rows,Cols> const y(42,1);
-            test_same_type(x,x+y);
-            test_qvm::matrix<M1,Rows,Cols> r=x+y;
-            test_qvm::add_m(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-            {
-            test_qvm::matrix<M1,Rows,Cols> const y(42,1);
-            test_qvm::matrix<M2,Rows,Cols> r=mref(x)+y;
-            test_qvm::add_m(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-            {
-            test_qvm::matrix<M1,Rows,Cols> const y(42,1);
-            test_qvm::matrix<M2,Rows,Cols> r=x+mref(y);
-            test_qvm::add_m(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols> const x(42,2);\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> const y(42,1);\r
+            test_same_type(x,x+y);\r
+            test_qvm::matrix<M1,Rows,Cols> r=x+y;\r
+            test_qvm::add_m(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> const y(42,1);\r
+            test_qvm::matrix<M2,Rows,Cols> r=mref(x)+y;\r
+            test_qvm::add_m(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+            {\r
+            test_qvm::matrix<M1,Rows,Cols> const y(42,1);\r
+            test_qvm::matrix<M2,Rows,Cols> r=x+mref(y);\r
+            test_qvm::add_m(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index 4b7546970cab326a06fdf7a11ba42657838f50be..43321110196b93c0e60edaa0ef919f02dfc5d325 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1> const x(42,2);
-            {
-            test_qvm::quaternion<Q1> const y(42,1);
-            test_same_type(x,x+y);
-            test_qvm::quaternion<Q1> r=x+y;
-            test_qvm::add_v(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-            {
-            test_qvm::quaternion<Q1> const y(42,1);
-            test_qvm::quaternion<Q2> r=qref(x)+y;
-            test_qvm::add_v(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-            {
-            test_qvm::quaternion<Q1> const y(42,1);
-            test_qvm::quaternion<Q2> r=x+qref(y);
-            test_qvm::add_v(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1> const x(42,2);\r
+            {\r
+            test_qvm::quaternion<Q1> const y(42,1);\r
+            test_same_type(x,x+y);\r
+            test_qvm::quaternion<Q1> r=x+y;\r
+            test_qvm::add_v(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+            {\r
+            test_qvm::quaternion<Q1> const y(42,1);\r
+            test_qvm::quaternion<Q2> r=qref(x)+y;\r
+            test_qvm::add_v(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+            {\r
+            test_qvm::quaternion<Q1> const y(42,1);\r
+            test_qvm::quaternion<Q2> r=x+qref(y);\r
+            test_qvm::add_v(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index f85c0e4a4432395db800eccc463eb8cd2aac321b..1b6b207a97f6c2425dadf38c5ce4e30f37dabcee 100644 (file)
@@ -1,53 +1,53 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T,class U> struct same_type_tester;
-    template <class T> struct same_type_tester<T,T> { };
-    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }
-
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim> const x(42,2);
-            {
-            test_qvm::vector<V1,Dim> const y(42,1);
-            test_same_type(x,x+y);
-            test_qvm::vector<V1,Dim> r=x+y;
-            test_qvm::add_v(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-            {
-            test_qvm::vector<V1,Dim> const y(42,1);
-            test_qvm::vector<V2,Dim> r=vref(x)+y;
-            test_qvm::add_v(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-            {
-            test_qvm::vector<V1,Dim> const y(42,1);
-            test_qvm::vector<V2,Dim> r=x+vref(y);
-            test_qvm::add_v(r.b,x.b,y.b);
-            BOOST_QVM_TEST_EQ(r.a,r.b);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U> struct same_type_tester;\r
+    template <class T> struct same_type_tester<T,T> { };\r
+    template <class T,class U> void test_same_type( T, U ) { same_type_tester<T,U>(); }\r
+\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim> const x(42,2);\r
+            {\r
+            test_qvm::vector<V1,Dim> const y(42,1);\r
+            test_same_type(x,x+y);\r
+            test_qvm::vector<V1,Dim> r=x+y;\r
+            test_qvm::add_v(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+            {\r
+            test_qvm::vector<V1,Dim> const y(42,1);\r
+            test_qvm::vector<V2,Dim> r=vref(x)+y;\r
+            test_qvm::add_v(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+            {\r
+            test_qvm::vector<V1,Dim> const y(42,1);\r
+            test_qvm::vector<V2,Dim> r=x+vref(y);\r
+            test_qvm::add_v(r.b,x.b,y.b);\r
+            BOOST_QVM_TEST_EQ(r.a,r.b);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 9959313c94160c77dba8176fa770bae574047c66..c01e98bcc72d882ba0af5aa648958c8512f339b1 100644 (file)
@@ -1,39 +1,39 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <class T>
-    void
-    test_perspective_lh( T fov_y, T aspect_ratio, T z_near, T z_far )
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,4,4> const m=perspective_lh(fov_y,aspect_ratio,z_near,z_far);
-        test_qvm::matrix_perspective_lh(m.b,fov_y,aspect_ratio,z_near,z_far);
-        BOOST_QVM_TEST_CLOSE(m.a,m.b,0.000001f);
-        }
-
-    template <class T>
-    void
-    test_perspective_rh( T fov_y, T aspect_ratio, T z_near, T z_far )
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,4,4> const m=perspective_rh(fov_y,aspect_ratio,z_near,z_far);
-        test_qvm::matrix_perspective_rh(m.b,fov_y,aspect_ratio,z_near,z_far);
-        BOOST_QVM_TEST_CLOSE(m.a,m.b,0.000001f);
-        }
-    }
-
-int
-main()
-    {
-    test_perspective_lh(0.5f,1.3f,0.1f,2000.0f);
-    test_perspective_rh(0.5f,1.3f,0.1f,2000.0f);
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T>\r
+    void\r
+    test_perspective_lh( T fov_y, T aspect_ratio, T z_near, T z_far )\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,4,4> const m=perspective_lh(fov_y,aspect_ratio,z_near,z_far);\r
+        test_qvm::matrix_perspective_lh(m.b,fov_y,aspect_ratio,z_near,z_far);\r
+        BOOST_QVM_TEST_CLOSE(m.a,m.b,0.000001f);\r
+        }\r
+\r
+    template <class T>\r
+    void\r
+    test_perspective_rh( T fov_y, T aspect_ratio, T z_near, T z_far )\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,4,4> const m=perspective_rh(fov_y,aspect_ratio,z_near,z_far);\r
+        test_qvm::matrix_perspective_rh(m.b,fov_y,aspect_ratio,z_near,z_far);\r
+        BOOST_QVM_TEST_CLOSE(m.a,m.b,0.000001f);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test_perspective_lh(0.5f,1.3f,0.1f,2000.0f);\r
+    test_perspective_rh(0.5f,1.3f,0.1f,2000.0f);\r
+    return boost::report_errors();\r
+    }\r
index 09fdf5b1fc62279ee4586b2e08a745c9e5b8010f..a1ae1c27775d6df36936710ffe7a6b40e4c4de31 100644 (file)
@@ -1,92 +1,92 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_traits_array.hpp>
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-template <class T,class U>
-struct same_type;
-
-template <class T>
-struct
-same_type<T,T>
-    {
-    };
-
-template <class T,class P>
-void
-test_ref_cast( T & q, P * ptr )
-    {
-    using namespace boost::qvm;
-    BOOST_QVM_STATIC_ASSERT(is_quat<T>::value);
-    BOOST_TEST(quat_traits<T>::template read_element<0>(q)==ptr[0]);
-    BOOST_TEST(quat_traits<T>::template read_element<1>(q)==ptr[1]);
-    BOOST_TEST(quat_traits<T>::template read_element<2>(q)==ptr[2]);
-    BOOST_TEST(quat_traits<T>::template read_element<3>(q)==ptr[3]);
-    BOOST_TEST(&quat_traits<T>::template write_element<0>(q)==&ptr[0]);
-    BOOST_TEST(&quat_traits<T>::template write_element<1>(q)==&ptr[1]);
-    BOOST_TEST(&quat_traits<T>::template write_element<2>(q)==&ptr[2]);
-    BOOST_TEST(&quat_traits<T>::template write_element<3>(q)==&ptr[3]);
-    BOOST_TEST(&q[0]==&ptr[0]);
-    BOOST_TEST(&q[1]==&ptr[1]);
-    BOOST_TEST(&q[2]==&ptr[2]);
-    BOOST_TEST(&q[3]==&ptr[3]);
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-        {
-        BOOST_QVM_STATIC_ASSERT(is_quat<int[4]>::value);
-        BOOST_QVM_STATIC_ASSERT(!is_quat<int[4][4]>::value);
-        BOOST_QVM_STATIC_ASSERT(!is_quat<int[4][4][4]>::value);
-        same_type<quat_traits<int[4]>::scalar_type,int>();
-        same_type< quat<int>, deduce_quat<int[4]>::type >();
-        same_type< quat<int>, deduce_quat<int const[4]>::type >();
-        int arr[4] = {0,1,2,3};
-        BOOST_TEST((quat_traits<int[4]>::read_element<0>(arr)==0));
-        BOOST_TEST((quat_traits<int[4]>::read_element<1>(arr)==1));
-        BOOST_TEST((quat_traits<int[4]>::read_element<2>(arr)==2));
-        BOOST_TEST((quat_traits<int[4]>::read_element<3>(arr)==3));
-        BOOST_TEST((quat_traits<int const[4]>::read_element<0>(arr)==0));
-        BOOST_TEST((quat_traits<int const[4]>::read_element<1>(arr)==1));
-        BOOST_TEST((quat_traits<int const[4]>::read_element<2>(arr)==2));
-        BOOST_TEST((quat_traits<int const[4]>::read_element<3>(arr)==3));
-        BOOST_TEST((quat_traits<int[4]>::read_element_idx(0,arr)==0));
-        BOOST_TEST((quat_traits<int[4]>::read_element_idx(1,arr)==1));
-        BOOST_TEST((quat_traits<int[4]>::read_element_idx(2,arr)==2));
-        BOOST_TEST((quat_traits<int[4]>::read_element_idx(3,arr)==3));
-        BOOST_TEST((quat_traits<int const[4]>::read_element_idx(0,arr)==0));
-        BOOST_TEST((quat_traits<int const[4]>::read_element_idx(1,arr)==1));
-        BOOST_TEST((quat_traits<int const[4]>::read_element_idx(2,arr)==2));
-        BOOST_TEST((quat_traits<int const[4]>::read_element_idx(3,arr)==3));
-        BOOST_TEST((&quat_traits<int[4]>::write_element<0>(arr)==&arr[0]));
-        BOOST_TEST((&quat_traits<int[4]>::write_element<1>(arr)==&arr[1]));
-        BOOST_TEST((&quat_traits<int[4]>::write_element<2>(arr)==&arr[2]));
-        BOOST_TEST((&quat_traits<int[4]>::write_element<3>(arr)==&arr[3]));
-        BOOST_TEST((&quat_traits<int[4]>::write_element_idx(0,arr)==&arr[0]));
-        BOOST_TEST((&quat_traits<int[4]>::write_element_idx(1,arr)==&arr[1]));
-        BOOST_TEST((&quat_traits<int[4]>::write_element_idx(2,arr)==&arr[2]));
-        BOOST_TEST((&quat_traits<int[4]>::write_element_idx(3,arr)==&arr[3]));
-        }
-        {
-        int arr[42] = {0};
-        int * ptr=arr+5;
-        ptr[0]=42;
-        ptr[1]=43;
-        ptr[2]=44;
-        ptr[3]=45;
-        test_ref_cast(ptr_qref(ptr),ptr);
-        int q[4] = {1,1,1,1};
-        ptr_qref(ptr) += qref(q);
-        BOOST_TEST(ptr[0]==43);
-        BOOST_TEST(ptr[1]==44);
-        BOOST_TEST(ptr[2]==45);
-        BOOST_TEST(ptr[3]==46);
-        }
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_traits_array.hpp>\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+\r
+template <class T,class U>\r
+struct same_type;\r
+\r
+template <class T>\r
+struct\r
+same_type<T,T>\r
+    {\r
+    };\r
+\r
+template <class T,class P>\r
+void\r
+test_ref_cast( T & q, P * ptr )\r
+    {\r
+    using namespace boost::qvm;\r
+    BOOST_QVM_STATIC_ASSERT(is_quat<T>::value);\r
+    BOOST_TEST(quat_traits<T>::template read_element<0>(q)==ptr[0]);\r
+    BOOST_TEST(quat_traits<T>::template read_element<1>(q)==ptr[1]);\r
+    BOOST_TEST(quat_traits<T>::template read_element<2>(q)==ptr[2]);\r
+    BOOST_TEST(quat_traits<T>::template read_element<3>(q)==ptr[3]);\r
+    BOOST_TEST(&quat_traits<T>::template write_element<0>(q)==&ptr[0]);\r
+    BOOST_TEST(&quat_traits<T>::template write_element<1>(q)==&ptr[1]);\r
+    BOOST_TEST(&quat_traits<T>::template write_element<2>(q)==&ptr[2]);\r
+    BOOST_TEST(&quat_traits<T>::template write_element<3>(q)==&ptr[3]);\r
+    BOOST_TEST(&q[0]==&ptr[0]);\r
+    BOOST_TEST(&q[1]==&ptr[1]);\r
+    BOOST_TEST(&q[2]==&ptr[2]);\r
+    BOOST_TEST(&q[3]==&ptr[3]);\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+        {\r
+        BOOST_QVM_STATIC_ASSERT(is_quat<int[4]>::value);\r
+        BOOST_QVM_STATIC_ASSERT(!is_quat<int[4][4]>::value);\r
+        BOOST_QVM_STATIC_ASSERT(!is_quat<int[4][4][4]>::value);\r
+        same_type<quat_traits<int[4]>::scalar_type,int>();\r
+        same_type< quat<int>, deduce_quat<int[4]>::type >();\r
+        same_type< quat<int>, deduce_quat<int const[4]>::type >();\r
+        int arr[4] = {0,1,2,3};\r
+        BOOST_TEST((quat_traits<int[4]>::read_element<0>(arr)==0));\r
+        BOOST_TEST((quat_traits<int[4]>::read_element<1>(arr)==1));\r
+        BOOST_TEST((quat_traits<int[4]>::read_element<2>(arr)==2));\r
+        BOOST_TEST((quat_traits<int[4]>::read_element<3>(arr)==3));\r
+        BOOST_TEST((quat_traits<int const[4]>::read_element<0>(arr)==0));\r
+        BOOST_TEST((quat_traits<int const[4]>::read_element<1>(arr)==1));\r
+        BOOST_TEST((quat_traits<int const[4]>::read_element<2>(arr)==2));\r
+        BOOST_TEST((quat_traits<int const[4]>::read_element<3>(arr)==3));\r
+        BOOST_TEST((quat_traits<int[4]>::read_element_idx(0,arr)==0));\r
+        BOOST_TEST((quat_traits<int[4]>::read_element_idx(1,arr)==1));\r
+        BOOST_TEST((quat_traits<int[4]>::read_element_idx(2,arr)==2));\r
+        BOOST_TEST((quat_traits<int[4]>::read_element_idx(3,arr)==3));\r
+        BOOST_TEST((quat_traits<int const[4]>::read_element_idx(0,arr)==0));\r
+        BOOST_TEST((quat_traits<int const[4]>::read_element_idx(1,arr)==1));\r
+        BOOST_TEST((quat_traits<int const[4]>::read_element_idx(2,arr)==2));\r
+        BOOST_TEST((quat_traits<int const[4]>::read_element_idx(3,arr)==3));\r
+        BOOST_TEST((&quat_traits<int[4]>::write_element<0>(arr)==&arr[0]));\r
+        BOOST_TEST((&quat_traits<int[4]>::write_element<1>(arr)==&arr[1]));\r
+        BOOST_TEST((&quat_traits<int[4]>::write_element<2>(arr)==&arr[2]));\r
+        BOOST_TEST((&quat_traits<int[4]>::write_element<3>(arr)==&arr[3]));\r
+        BOOST_TEST((&quat_traits<int[4]>::write_element_idx(0,arr)==&arr[0]));\r
+        BOOST_TEST((&quat_traits<int[4]>::write_element_idx(1,arr)==&arr[1]));\r
+        BOOST_TEST((&quat_traits<int[4]>::write_element_idx(2,arr)==&arr[2]));\r
+        BOOST_TEST((&quat_traits<int[4]>::write_element_idx(3,arr)==&arr[3]));\r
+        }\r
+        {\r
+        int arr[42] = {0};\r
+        int * ptr=arr+5;\r
+        ptr[0]=42;\r
+        ptr[1]=43;\r
+        ptr[2]=44;\r
+        ptr[3]=45;\r
+        test_ref_cast(ptr_qref(ptr),ptr);\r
+        int q[4] = {1,1,1,1};\r
+        ptr_qref(ptr) += qref(q);\r
+        BOOST_TEST(ptr[0]==43);\r
+        BOOST_TEST(ptr[1]==44);\r
+        BOOST_TEST(ptr[2]==45);\r
+        BOOST_TEST(ptr[3]==46);\r
+        }\r
+    return boost::report_errors();\r
+    }\r
index 5664d01a7b70fae3be3b90f56b4905710164fd23..aca0cd6bc62884ae00df264fb3c82b1d9297c181 100644 (file)
@@ -1,96 +1,96 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int D>
-    void
-    test_x()
-        {
-        using namespace boost::qvm;
-        test_qvm::vector<V1,3> axis; axis.a[0]=1;
-        for( float r=0; r<6.28f; r+=0.5f )
-            {
-            test_qvm::matrix<M1,D,D> const m1=rot_mat<D>(axis,r);
-            test_qvm::rotation_x(m1.b,r);
-            BOOST_QVM_TEST_EQ(m1.a,m1.b);
-            test_qvm::matrix<M1,D,D> m2(42,1);
-            set_rot(m2,axis,r);
-            test_qvm::rotation_x(m2.b,r);
-            BOOST_QVM_TEST_EQ(m2.a,m2.b);
-            test_qvm::matrix<M1,D,D> m3(42,1);
-            test_qvm::matrix<M1,D,D> m4(42,1);
-            rotate(m3,axis,r);
-            m3 = m3*m1;
-            BOOST_QVM_TEST_EQ(m3.a,m3.a);
-            }
-        }
-
-    template <int D>
-    void
-    test_y()
-        {
-        using namespace boost::qvm;
-        test_qvm::vector<V1,3> axis; axis.a[1]=1;
-        for( float r=0; r<6.28f; r+=0.5f )
-            {
-            test_qvm::matrix<M1,D,D> m1=rot_mat<D>(axis,r);
-            test_qvm::rotation_y(m1.b,r);
-            BOOST_QVM_TEST_EQ(m1.a,m1.b);
-            test_qvm::matrix<M1,D,D> m2(42,1);
-            set_rot(m2,axis,r);
-            test_qvm::rotation_y(m2.b,r);
-            BOOST_QVM_TEST_EQ(m2.a,m2.b);
-            test_qvm::matrix<M1,D,D> m3(42,1);
-            test_qvm::matrix<M1,D,D> m4(42,1);
-            rotate(m3,axis,r);
-            m3 = m3*m1;
-            BOOST_QVM_TEST_EQ(m3.a,m3.a);
-            }
-        }
-
-    template <int D>
-    void
-    test_z()
-        {
-        using namespace boost::qvm;
-        test_qvm::vector<V1,3> axis; axis.a[2]=1;
-        for( float r=0; r<6.28f; r+=0.5f )
-            {
-            test_qvm::matrix<M1,D,D> m1=rot_mat<D>(axis,r);
-            test_qvm::rotation_z(m1.b,r);
-            BOOST_QVM_TEST_EQ(m1.a,m1.b);
-            test_qvm::matrix<M1,D,D> m2(42,1);
-            set_rot(m2,axis,r);
-            test_qvm::rotation_z(m2.b,r);
-            BOOST_QVM_TEST_EQ(m2.a,m2.b);
-            test_qvm::matrix<M1,D,D> m3(42,1);
-            test_qvm::matrix<M1,D,D> m4(42,1);
-            rotate(m3,axis,r);
-            m3 = m3*m1;
-            BOOST_QVM_TEST_EQ(m3.a,m3.a);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test_x<3>();
-    test_y<3>();
-    test_z<3>();
-    test_x<4>();
-    test_y<4>();
-    test_z<4>();
-    test_x<5>();
-    test_y<5>();
-    test_z<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int D>\r
+    void\r
+    test_x()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::vector<V1,3> axis; axis.a[0]=1;\r
+        for( float r=0; r<6.28f; r+=0.5f )\r
+            {\r
+            test_qvm::matrix<M1,D,D> const m1=rot_mat<D>(axis,r);\r
+            test_qvm::rotation_x(m1.b,r);\r
+            BOOST_QVM_TEST_EQ(m1.a,m1.b);\r
+            test_qvm::matrix<M1,D,D> m2(42,1);\r
+            set_rot(m2,axis,r);\r
+            test_qvm::rotation_x(m2.b,r);\r
+            BOOST_QVM_TEST_EQ(m2.a,m2.b);\r
+            test_qvm::matrix<M1,D,D> m3(42,1);\r
+            test_qvm::matrix<M1,D,D> m4(42,1);\r
+            rotate(m3,axis,r);\r
+            m3 = m3*m1;\r
+            BOOST_QVM_TEST_EQ(m3.a,m3.a);\r
+            }\r
+        }\r
+\r
+    template <int D>\r
+    void\r
+    test_y()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::vector<V1,3> axis; axis.a[1]=1;\r
+        for( float r=0; r<6.28f; r+=0.5f )\r
+            {\r
+            test_qvm::matrix<M1,D,D> m1=rot_mat<D>(axis,r);\r
+            test_qvm::rotation_y(m1.b,r);\r
+            BOOST_QVM_TEST_EQ(m1.a,m1.b);\r
+            test_qvm::matrix<M1,D,D> m2(42,1);\r
+            set_rot(m2,axis,r);\r
+            test_qvm::rotation_y(m2.b,r);\r
+            BOOST_QVM_TEST_EQ(m2.a,m2.b);\r
+            test_qvm::matrix<M1,D,D> m3(42,1);\r
+            test_qvm::matrix<M1,D,D> m4(42,1);\r
+            rotate(m3,axis,r);\r
+            m3 = m3*m1;\r
+            BOOST_QVM_TEST_EQ(m3.a,m3.a);\r
+            }\r
+        }\r
+\r
+    template <int D>\r
+    void\r
+    test_z()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::vector<V1,3> axis; axis.a[2]=1;\r
+        for( float r=0; r<6.28f; r+=0.5f )\r
+            {\r
+            test_qvm::matrix<M1,D,D> m1=rot_mat<D>(axis,r);\r
+            test_qvm::rotation_z(m1.b,r);\r
+            BOOST_QVM_TEST_EQ(m1.a,m1.b);\r
+            test_qvm::matrix<M1,D,D> m2(42,1);\r
+            set_rot(m2,axis,r);\r
+            test_qvm::rotation_z(m2.b,r);\r
+            BOOST_QVM_TEST_EQ(m2.a,m2.b);\r
+            test_qvm::matrix<M1,D,D> m3(42,1);\r
+            test_qvm::matrix<M1,D,D> m4(42,1);\r
+            rotate(m3,axis,r);\r
+            m3 = m3*m1;\r
+            BOOST_QVM_TEST_EQ(m3.a,m3.a);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test_x<3>();\r
+    test_y<3>();\r
+    test_z<3>();\r
+    test_x<4>();\r
+    test_y<4>();\r
+    test_z<4>();\r
+    test_x<5>();\r
+    test_y<5>();\r
+    test_z<5>();\r
+    return boost::report_errors();\r
+    }\r
index 1a31d1d65e4cff05195cf9def265c1bc99380605..91eecbe5d0b60a4a80bf7a0a18e06a069a36c229 100644 (file)
@@ -1,95 +1,95 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "test_qvm_quaternion.hpp"
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test_x()
-        {
-        using namespace boost::qvm;
-        test_qvm::vector<V1,3> axis; axis.a[0]=1;
-        for( float r=0; r<6.28f; r+=0.5f )
-            {
-            test_qvm::quaternion<Q1> q1=rot_quat(axis,r);
-            test_qvm::matrix<M1,3,3> x1=convert_to< test_qvm::matrix<M1,3,3> >(q1);
-            test_qvm::rotation_x(x1.b,r);
-            BOOST_QVM_TEST_CLOSE(x1.a,x1.b,0.000001f);
-            test_qvm::quaternion<Q2> q2(42,1);
-            set_rot(q2,axis,r);
-            test_qvm::matrix<M2,3,3> x2=convert_to< test_qvm::matrix<M2,3,3> >(q2);
-            test_qvm::rotation_x(x2.b,r);
-            BOOST_QVM_TEST_CLOSE(x2.a,x2.b,0.000001f);
-            test_qvm::quaternion<Q1> q3(42,1);
-            test_qvm::quaternion<Q1> q4(42,1);
-            rotate(q3,axis,r);
-            q3 = q3*q1;
-            BOOST_QVM_TEST_EQ(q3.a,q3.a);
-            }
-        }
-
-    void
-    test_y()
-        {
-        using namespace boost::qvm;
-        test_qvm::vector<V1,3> axis; axis.a[1]=1;
-        for( float r=0; r<6.28f; r+=0.5f )
-            {
-            test_qvm::quaternion<Q1> q1=rot_quat(axis,r);
-            test_qvm::matrix<M1,3,3> x1=convert_to< test_qvm::matrix<M1,3,3> >(q1);
-            test_qvm::rotation_y(x1.b,r);
-            BOOST_QVM_TEST_CLOSE(x1.a,x1.b,0.000001f);
-            test_qvm::quaternion<Q2> q2(42,1);
-            set_rot(q2,axis,r);
-            test_qvm::matrix<M2,3,3> x2=convert_to< test_qvm::matrix<M2,3,3> >(q2);
-            test_qvm::rotation_y(x2.b,r);
-            BOOST_QVM_TEST_CLOSE(x2.a,x2.b,0.000001f);
-            test_qvm::quaternion<Q1> q3(42,1);
-            test_qvm::quaternion<Q1> q4(42,1);
-            rotate(q3,axis,r);
-            q3 = q3*q1;
-            BOOST_QVM_TEST_EQ(q3.a,q3.a);
-            }
-        }
-
-    void
-    test_z()
-        {
-        using namespace boost::qvm;
-        test_qvm::vector<V1,3> axis; axis.a[2]=1;
-        for( float r=0; r<6.28f; r+=0.5f )
-            {
-            test_qvm::quaternion<Q1> q1=rot_quat(axis,r);
-            test_qvm::matrix<M1,3,3> x1=convert_to< test_qvm::matrix<M1,3,3> >(q1);
-            test_qvm::rotation_z(x1.b,r);
-            BOOST_QVM_TEST_CLOSE(x1.a,x1.b,0.000001f);
-            test_qvm::quaternion<Q2> q2(42,1);
-            set_rot(q2,axis,r);
-            test_qvm::matrix<M2,3,3> x2=convert_to< test_qvm::matrix<M2,3,3> >(q2);
-            test_qvm::rotation_z(x2.b,r);
-            BOOST_QVM_TEST_CLOSE(x2.a,x2.b,0.000001f);
-            test_qvm::quaternion<Q1> q3(42,1);
-            test_qvm::quaternion<Q1> q4(42,1);
-            rotate(q3,axis,r);
-            q3 = q3*q1;
-            BOOST_QVM_TEST_EQ(q3.a,q3.a);
-            }
-        }
-    }
-
-int
-main()
-    {
-    test_x();
-    test_y();
-    test_z();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "test_qvm_quaternion.hpp"\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test_x()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::vector<V1,3> axis; axis.a[0]=1;\r
+        for( float r=0; r<6.28f; r+=0.5f )\r
+            {\r
+            test_qvm::quaternion<Q1> q1=rot_quat(axis,r);\r
+            test_qvm::matrix<M1,3,3> x1=convert_to< test_qvm::matrix<M1,3,3> >(q1);\r
+            test_qvm::rotation_x(x1.b,r);\r
+            BOOST_QVM_TEST_CLOSE(x1.a,x1.b,0.000001f);\r
+            test_qvm::quaternion<Q2> q2(42,1);\r
+            set_rot(q2,axis,r);\r
+            test_qvm::matrix<M2,3,3> x2=convert_to< test_qvm::matrix<M2,3,3> >(q2);\r
+            test_qvm::rotation_x(x2.b,r);\r
+            BOOST_QVM_TEST_CLOSE(x2.a,x2.b,0.000001f);\r
+            test_qvm::quaternion<Q1> q3(42,1);\r
+            test_qvm::quaternion<Q1> q4(42,1);\r
+            rotate(q3,axis,r);\r
+            q3 = q3*q1;\r
+            BOOST_QVM_TEST_EQ(q3.a,q3.a);\r
+            }\r
+        }\r
+\r
+    void\r
+    test_y()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::vector<V1,3> axis; axis.a[1]=1;\r
+        for( float r=0; r<6.28f; r+=0.5f )\r
+            {\r
+            test_qvm::quaternion<Q1> q1=rot_quat(axis,r);\r
+            test_qvm::matrix<M1,3,3> x1=convert_to< test_qvm::matrix<M1,3,3> >(q1);\r
+            test_qvm::rotation_y(x1.b,r);\r
+            BOOST_QVM_TEST_CLOSE(x1.a,x1.b,0.000001f);\r
+            test_qvm::quaternion<Q2> q2(42,1);\r
+            set_rot(q2,axis,r);\r
+            test_qvm::matrix<M2,3,3> x2=convert_to< test_qvm::matrix<M2,3,3> >(q2);\r
+            test_qvm::rotation_y(x2.b,r);\r
+            BOOST_QVM_TEST_CLOSE(x2.a,x2.b,0.000001f);\r
+            test_qvm::quaternion<Q1> q3(42,1);\r
+            test_qvm::quaternion<Q1> q4(42,1);\r
+            rotate(q3,axis,r);\r
+            q3 = q3*q1;\r
+            BOOST_QVM_TEST_EQ(q3.a,q3.a);\r
+            }\r
+        }\r
+\r
+    void\r
+    test_z()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::vector<V1,3> axis; axis.a[2]=1;\r
+        for( float r=0; r<6.28f; r+=0.5f )\r
+            {\r
+            test_qvm::quaternion<Q1> q1=rot_quat(axis,r);\r
+            test_qvm::matrix<M1,3,3> x1=convert_to< test_qvm::matrix<M1,3,3> >(q1);\r
+            test_qvm::rotation_z(x1.b,r);\r
+            BOOST_QVM_TEST_CLOSE(x1.a,x1.b,0.000001f);\r
+            test_qvm::quaternion<Q2> q2(42,1);\r
+            set_rot(q2,axis,r);\r
+            test_qvm::matrix<M2,3,3> x2=convert_to< test_qvm::matrix<M2,3,3> >(q2);\r
+            test_qvm::rotation_z(x2.b,r);\r
+            BOOST_QVM_TEST_CLOSE(x2.a,x2.b,0.000001f);\r
+            test_qvm::quaternion<Q1> q3(42,1);\r
+            test_qvm::quaternion<Q1> q4(42,1);\r
+            rotate(q3,axis,r);\r
+            q3 = q3*q1;\r
+            BOOST_QVM_TEST_EQ(q3.a,q3.a);\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test_x();\r
+    test_y();\r
+    test_z();\r
+    return boost::report_errors();\r
+    }\r
index bd3e6694a961523e0a7d846be52ce03e1c878e8f..6aa173f2291d5aa2175d4590906a1460145abb16 100644 (file)
@@ -1,44 +1,44 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        for( float r=0; r<6.28f; r+=0.5f )
-            {
-            test_qvm::matrix<M1,Dim,Dim> const m1=rotx_mat<Dim>(r);
-            test_qvm::rotation_x(m1.b,r);
-            BOOST_QVM_TEST_CLOSE(m1.a,m1.b,0.000001f);
-            test_qvm::matrix<M1,Dim,Dim> m2(42,1);
-            set_rotx(m2,r);
-            test_qvm::rotation_x(m2.b,r);
-            BOOST_QVM_TEST_CLOSE(m2.a,m2.b,0.000001f);
-            test_qvm::matrix<M1,Dim,Dim> m3(42,1);
-            test_qvm::matrix<M1,Dim,Dim> r1=m3*m1;
-            rotate_x(m3,r);
-            BOOST_QVM_TEST_EQ(m3.a,r1.a);
-            }
-        rotx_mat<Dim>(0.0f)+rotx_mat<Dim>(0.0f);
-        -rotx_mat<Dim>(0.0f);
-        }
-    }
-
-int
-main()
-    {
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        for( float r=0; r<6.28f; r+=0.5f )\r
+            {\r
+            test_qvm::matrix<M1,Dim,Dim> const m1=rotx_mat<Dim>(r);\r
+            test_qvm::rotation_x(m1.b,r);\r
+            BOOST_QVM_TEST_CLOSE(m1.a,m1.b,0.000001f);\r
+            test_qvm::matrix<M1,Dim,Dim> m2(42,1);\r
+            set_rotx(m2,r);\r
+            test_qvm::rotation_x(m2.b,r);\r
+            BOOST_QVM_TEST_CLOSE(m2.a,m2.b,0.000001f);\r
+            test_qvm::matrix<M1,Dim,Dim> m3(42,1);\r
+            test_qvm::matrix<M1,Dim,Dim> r1=m3*m1;\r
+            rotate_x(m3,r);\r
+            BOOST_QVM_TEST_EQ(m3.a,r1.a);\r
+            }\r
+        rotx_mat<Dim>(0.0f)+rotx_mat<Dim>(0.0f);\r
+        -rotx_mat<Dim>(0.0f);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index d2c598181a8cf780bb9c7414da40d9dce67f062b..7dabf411f8a855453c8d9bad4d9f8e9583dd9190 100644 (file)
@@ -1,45 +1,45 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        for( float r=0; r<6.28f; r+=0.5f )
-            {
-            test_qvm::quaternion<Q1> q1=rotx_quat(r);
-            test_qvm::matrix<M1,3,3> m1=convert_to< test_qvm::matrix<M1,3,3> >(q1);
-            test_qvm::rotation_x(m1.b,r);
-            BOOST_QVM_TEST_CLOSE(m1.a,m1.b,0.000001f);
-            test_qvm::quaternion<Q2> q2(42,1);
-            set_rotx(q2,r);
-            test_qvm::matrix<M1,3,3> m2=convert_to< test_qvm::matrix<M1,3,3> >(q2);
-            test_qvm::rotation_x(m2.b,r);
-            BOOST_QVM_TEST_CLOSE(m2.a,m2.b,0.000001f);
-            test_qvm::quaternion<Q1> q3(42,1);
-            test_qvm::quaternion<Q1> r1=q3*q1;
-            rotate_x(q3,r);
-            BOOST_QVM_TEST_EQ(q3.a,r1.a);
-            }
-        rotx_quat(0.0f)+rotx_quat(0.0f);
-        -rotx_quat(0.0f);
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        for( float r=0; r<6.28f; r+=0.5f )\r
+            {\r
+            test_qvm::quaternion<Q1> q1=rotx_quat(r);\r
+            test_qvm::matrix<M1,3,3> m1=convert_to< test_qvm::matrix<M1,3,3> >(q1);\r
+            test_qvm::rotation_x(m1.b,r);\r
+            BOOST_QVM_TEST_CLOSE(m1.a,m1.b,0.000001f);\r
+            test_qvm::quaternion<Q2> q2(42,1);\r
+            set_rotx(q2,r);\r
+            test_qvm::matrix<M1,3,3> m2=convert_to< test_qvm::matrix<M1,3,3> >(q2);\r
+            test_qvm::rotation_x(m2.b,r);\r
+            BOOST_QVM_TEST_CLOSE(m2.a,m2.b,0.000001f);\r
+            test_qvm::quaternion<Q1> q3(42,1);\r
+            test_qvm::quaternion<Q1> r1=q3*q1;\r
+            rotate_x(q3,r);\r
+            BOOST_QVM_TEST_EQ(q3.a,r1.a);\r
+            }\r
+        rotx_quat(0.0f)+rotx_quat(0.0f);\r
+        -rotx_quat(0.0f);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 98cdf7ae527577f3f0648464a79f21f0ab53cea3..c363452c2b02f50f7511ab501d11df5422b7e35c 100644 (file)
@@ -1,44 +1,44 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        for( float r=0; r<6.28f; r+=0.5f )
-            {
-            test_qvm::matrix<M1,Dim,Dim> const m1=roty_mat<Dim>(r);
-            test_qvm::rotation_y(m1.b,r);
-            BOOST_QVM_TEST_CLOSE(m1.a,m1.b,0.000001f);
-            test_qvm::matrix<M1,Dim,Dim> m2(42,1);
-            set_roty(m2,r);
-            test_qvm::rotation_y(m2.b,r);
-            BOOST_QVM_TEST_CLOSE(m2.a,m2.b,0.000001f);
-            test_qvm::matrix<M1,Dim,Dim> m3(42,1);
-            test_qvm::matrix<M1,Dim,Dim> r1=m3*m1;
-            rotate_y(m3,r);
-            BOOST_QVM_TEST_EQ(m3.a,r1.a);
-            }
-        roty_mat<Dim>(0.0f)+roty_mat<Dim>(0.0f);
-        -roty_mat<Dim>(0.0f);
-        }
-    }
-
-int
-main()
-    {
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        for( float r=0; r<6.28f; r+=0.5f )\r
+            {\r
+            test_qvm::matrix<M1,Dim,Dim> const m1=roty_mat<Dim>(r);\r
+            test_qvm::rotation_y(m1.b,r);\r
+            BOOST_QVM_TEST_CLOSE(m1.a,m1.b,0.000001f);\r
+            test_qvm::matrix<M1,Dim,Dim> m2(42,1);\r
+            set_roty(m2,r);\r
+            test_qvm::rotation_y(m2.b,r);\r
+            BOOST_QVM_TEST_CLOSE(m2.a,m2.b,0.000001f);\r
+            test_qvm::matrix<M1,Dim,Dim> m3(42,1);\r
+            test_qvm::matrix<M1,Dim,Dim> r1=m3*m1;\r
+            rotate_y(m3,r);\r
+            BOOST_QVM_TEST_EQ(m3.a,r1.a);\r
+            }\r
+        roty_mat<Dim>(0.0f)+roty_mat<Dim>(0.0f);\r
+        -roty_mat<Dim>(0.0f);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 0f88efe0cb37cbd11b445f361a875df1e06c4753..2f5ebfd8e6bd04d19028400cb95f61136cd7fc02 100644 (file)
@@ -1,45 +1,45 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        for( float r=0; r<6.28f; r+=0.5f )
-            {
-            test_qvm::quaternion<Q1> q1=roty_quat(r);
-            test_qvm::matrix<M1,3,3> m1=convert_to< test_qvm::matrix<M1,3,3> >(q1);
-            test_qvm::rotation_y(m1.b,r);
-            BOOST_QVM_TEST_CLOSE(m1.a,m1.b,0.000001f);
-            test_qvm::quaternion<Q2> q2(42,1);
-            set_roty(q2,r);
-            test_qvm::matrix<M1,3,3> m2=convert_to< test_qvm::matrix<M1,3,3> >(q2);
-            test_qvm::rotation_y(m2.b,r);
-            BOOST_QVM_TEST_CLOSE(m2.a,m2.b,0.000001f);
-            test_qvm::quaternion<Q1> q3(42,1);
-            test_qvm::quaternion<Q1> r1=q3*q1;
-            rotate_y(q3,r);
-            BOOST_QVM_TEST_EQ(q3.a,r1.a);
-            }
-        roty_quat(0.0f)+roty_quat(0.0f);
-        -roty_quat(0.0f);
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        for( float r=0; r<6.28f; r+=0.5f )\r
+            {\r
+            test_qvm::quaternion<Q1> q1=roty_quat(r);\r
+            test_qvm::matrix<M1,3,3> m1=convert_to< test_qvm::matrix<M1,3,3> >(q1);\r
+            test_qvm::rotation_y(m1.b,r);\r
+            BOOST_QVM_TEST_CLOSE(m1.a,m1.b,0.000001f);\r
+            test_qvm::quaternion<Q2> q2(42,1);\r
+            set_roty(q2,r);\r
+            test_qvm::matrix<M1,3,3> m2=convert_to< test_qvm::matrix<M1,3,3> >(q2);\r
+            test_qvm::rotation_y(m2.b,r);\r
+            BOOST_QVM_TEST_CLOSE(m2.a,m2.b,0.000001f);\r
+            test_qvm::quaternion<Q1> q3(42,1);\r
+            test_qvm::quaternion<Q1> r1=q3*q1;\r
+            rotate_y(q3,r);\r
+            BOOST_QVM_TEST_EQ(q3.a,r1.a);\r
+            }\r
+        roty_quat(0.0f)+roty_quat(0.0f);\r
+        -roty_quat(0.0f);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index a186c2e5801673a8cc7c0ce7048201642759061b..618eafbe866b6e19a6dcb733e657e5f909c486a6 100644 (file)
@@ -1,45 +1,45 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        for( float r=0; r<6.28f; r+=0.5f )
-            {
-            test_qvm::matrix<M1,Dim,Dim> const m1=rotz_mat<Dim>(r);
-            test_qvm::rotation_z(m1.b,r);
-            BOOST_QVM_TEST_CLOSE(m1.a,m1.b,0.000001f);
-            test_qvm::matrix<M1,Dim,Dim> m2(42,1);
-            set_rotz(m2,r);
-            test_qvm::rotation_z(m2.b,r);
-            BOOST_QVM_TEST_CLOSE(m2.a,m2.b,0.000001f);
-            test_qvm::matrix<M1,Dim,Dim> m3(42,1);
-            test_qvm::matrix<M1,Dim,Dim> r1=m3*m1;
-            rotate_z(m3,r);
-            BOOST_QVM_TEST_EQ(m3.a,r1.a);
-            }
-        rotz_mat<Dim>(0.0f)+rotz_mat<Dim>(0.0f);
-        -rotz_mat<Dim>(0.0f);
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        for( float r=0; r<6.28f; r+=0.5f )\r
+            {\r
+            test_qvm::matrix<M1,Dim,Dim> const m1=rotz_mat<Dim>(r);\r
+            test_qvm::rotation_z(m1.b,r);\r
+            BOOST_QVM_TEST_CLOSE(m1.a,m1.b,0.000001f);\r
+            test_qvm::matrix<M1,Dim,Dim> m2(42,1);\r
+            set_rotz(m2,r);\r
+            test_qvm::rotation_z(m2.b,r);\r
+            BOOST_QVM_TEST_CLOSE(m2.a,m2.b,0.000001f);\r
+            test_qvm::matrix<M1,Dim,Dim> m3(42,1);\r
+            test_qvm::matrix<M1,Dim,Dim> r1=m3*m1;\r
+            rotate_z(m3,r);\r
+            BOOST_QVM_TEST_EQ(m3.a,r1.a);\r
+            }\r
+        rotz_mat<Dim>(0.0f)+rotz_mat<Dim>(0.0f);\r
+        -rotz_mat<Dim>(0.0f);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index e6a3577c869fea079d62ef8425cc0d82f0b3477d..a8d36507778802f2d98edffb91e69b8c1144206e 100644 (file)
@@ -1,45 +1,45 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        for( float r=0; r<6.28f; r+=0.5f )
-            {
-            test_qvm::quaternion<Q1> q1=rotz_quat(r);
-            test_qvm::matrix<M1,3,3> m1=convert_to< test_qvm::matrix<M1,3,3> >(q1);
-            test_qvm::rotation_z(m1.b,r);
-            BOOST_QVM_TEST_CLOSE(m1.a,m1.b,0.000001f);
-            test_qvm::quaternion<Q2> q2(42,1);
-            set_rotz(q2,r);
-            test_qvm::matrix<M1,3,3> m2=convert_to< test_qvm::matrix<M1,3,3> >(q2);
-            test_qvm::rotation_z(m2.b,r);
-            BOOST_QVM_TEST_CLOSE(m2.a,m2.b,0.000001f);
-            test_qvm::quaternion<Q1> q3(42,1);
-            test_qvm::quaternion<Q1> r1=q3*q1;
-            rotate_z(q3,r);
-            BOOST_QVM_TEST_EQ(q3.a,r1.a);
-            }
-        rotz_quat(0.0f)+rotz_quat(0.0f);
-        -rotz_quat(0.0f);
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        for( float r=0; r<6.28f; r+=0.5f )\r
+            {\r
+            test_qvm::quaternion<Q1> q1=rotz_quat(r);\r
+            test_qvm::matrix<M1,3,3> m1=convert_to< test_qvm::matrix<M1,3,3> >(q1);\r
+            test_qvm::rotation_z(m1.b,r);\r
+            BOOST_QVM_TEST_CLOSE(m1.a,m1.b,0.000001f);\r
+            test_qvm::quaternion<Q2> q2(42,1);\r
+            set_rotz(q2,r);\r
+            test_qvm::matrix<M1,3,3> m2=convert_to< test_qvm::matrix<M1,3,3> >(q2);\r
+            test_qvm::rotation_z(m2.b,r);\r
+            BOOST_QVM_TEST_CLOSE(m2.a,m2.b,0.000001f);\r
+            test_qvm::quaternion<Q1> q3(42,1);\r
+            test_qvm::quaternion<Q1> r1=q3*q1;\r
+            rotate_z(q3,r);\r
+            BOOST_QVM_TEST_EQ(q3.a,r1.a);\r
+            }\r
+        rotz_quat(0.0f)+rotz_quat(0.0f);\r
+        -rotz_quat(0.0f);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 9aa3ec54dad3bb7a5f66cffd1770184880f556ab..67d97d7bcd1563e7fed1cf75ae5f4bd160440c8a 100644 (file)
@@ -1,40 +1,40 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::vector<V1,Dim> x(42,1);
-        float y[1][Dim]; assign(y,row_mat(x));
-        BOOST_QVM_TEST_EQ(x.a,y[0]);
-        test_qvm::scalar_multiply_v(x.b,x.a,2.0f);
-        row<0>(row_mat(x)) *= 2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        row_mat(x) + row_mat(x);
-        -row_mat(x);
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::vector<V1,Dim> x(42,1);\r
+        float y[1][Dim]; assign(y,row_mat(x));\r
+        BOOST_QVM_TEST_EQ(x.a,y[0]);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,2.0f);\r
+        row<0>(row_mat(x)) *= 2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        row_mat(x) + row_mat(x);\r
+        -row_mat(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 972e0762c8dcde3118dcf905e72e721291294dbc..3677efb6c76f6cac7ee50861f74d59bc27c9f16b 100644 (file)
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map_mat_vec.hpp>
-#include <boost/qvm/vec_traits_array.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include "test_qvm.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols,int Row>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        float r1[Cols];
-        for( int i=0; i!=Cols; ++i )
-            r1[i]=x.a[Row][i];
-        float r2[Cols];
-        assign(r2,row<Row>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        row<Row>(x) *= 2;
-        for( int i=0; i!=Cols; ++i )
-            r1[i]=x.a[Row][i];
-        assign(r2,row<Row>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        row<Row>(x) + row<Row>(x);
-        -row<Row>(x);
-        }
-    }
-
-int
-main()
-    {
-    test<2,1,0>();
-    test<2,1,1>();
-    test<3,1,0>();
-    test<3,1,1>();
-    test<3,1,2>();
-    test<4,1,0>();
-    test<4,1,1>();
-    test<4,1,2>();
-    test<4,1,3>();
-    test<5,1,0>();
-    test<5,1,1>();
-    test<5,1,2>();
-    test<5,1,3>();
-    test<5,1,4>();
-          
-    test<2,2,0>();
-    test<2,2,1>();
-    test<3,2,0>();
-    test<3,2,1>();
-    test<3,2,2>();
-    test<4,2,0>();
-    test<4,2,1>();
-    test<4,2,2>();
-    test<4,2,3>();
-    test<5,2,0>();
-    test<5,2,1>();
-    test<5,2,2>();
-    test<5,2,3>();
-    test<5,2,4>();
-          
-    test<2,3,0>();
-    test<2,3,1>();
-    test<3,3,0>();
-    test<3,3,1>();
-    test<3,3,2>();
-    test<4,3,0>();
-    test<4,3,1>();
-    test<4,3,2>();
-    test<4,3,3>();
-    test<5,3,0>();
-    test<5,3,1>();
-    test<5,3,2>();
-    test<5,3,3>();
-    test<5,3,4>();
-          
-    test<2,4,0>();
-    test<2,4,1>();
-    test<3,4,0>();
-    test<3,4,1>();
-    test<3,4,2>();
-    test<4,4,0>();
-    test<4,4,1>();
-    test<4,4,2>();
-    test<4,4,3>();
-    test<5,4,0>();
-    test<5,4,1>();
-    test<5,4,2>();
-    test<5,4,3>();
-    test<5,4,4>();
-          
-    test<2,5,0>();
-    test<2,5,1>();
-    test<3,5,0>();
-    test<3,5,1>();
-    test<3,5,2>();
-    test<4,5,0>();
-    test<4,5,1>();
-    test<4,5,2>();
-    test<4,5,3>();
-    test<5,5,0>();
-    test<5,5,1>();
-    test<5,5,2>();
-    test<5,5,3>();
-    test<5,5,4>();
-
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map_mat_vec.hpp>\r
+#include <boost/qvm/vec_traits_array.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include "test_qvm.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols,int Row>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        float r1[Cols];\r
+        for( int i=0; i!=Cols; ++i )\r
+            r1[i]=x.a[Row][i];\r
+        float r2[Cols];\r
+        assign(r2,row<Row>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        row<Row>(x) *= 2;\r
+        for( int i=0; i!=Cols; ++i )\r
+            r1[i]=x.a[Row][i];\r
+        assign(r2,row<Row>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        row<Row>(x) + row<Row>(x);\r
+        -row<Row>(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2,1,0>();\r
+    test<2,1,1>();\r
+    test<3,1,0>();\r
+    test<3,1,1>();\r
+    test<3,1,2>();\r
+    test<4,1,0>();\r
+    test<4,1,1>();\r
+    test<4,1,2>();\r
+    test<4,1,3>();\r
+    test<5,1,0>();\r
+    test<5,1,1>();\r
+    test<5,1,2>();\r
+    test<5,1,3>();\r
+    test<5,1,4>();\r
+          \r
+    test<2,2,0>();\r
+    test<2,2,1>();\r
+    test<3,2,0>();\r
+    test<3,2,1>();\r
+    test<3,2,2>();\r
+    test<4,2,0>();\r
+    test<4,2,1>();\r
+    test<4,2,2>();\r
+    test<4,2,3>();\r
+    test<5,2,0>();\r
+    test<5,2,1>();\r
+    test<5,2,2>();\r
+    test<5,2,3>();\r
+    test<5,2,4>();\r
+          \r
+    test<2,3,0>();\r
+    test<2,3,1>();\r
+    test<3,3,0>();\r
+    test<3,3,1>();\r
+    test<3,3,2>();\r
+    test<4,3,0>();\r
+    test<4,3,1>();\r
+    test<4,3,2>();\r
+    test<4,3,3>();\r
+    test<5,3,0>();\r
+    test<5,3,1>();\r
+    test<5,3,2>();\r
+    test<5,3,3>();\r
+    test<5,3,4>();\r
+          \r
+    test<2,4,0>();\r
+    test<2,4,1>();\r
+    test<3,4,0>();\r
+    test<3,4,1>();\r
+    test<3,4,2>();\r
+    test<4,4,0>();\r
+    test<4,4,1>();\r
+    test<4,4,2>();\r
+    test<4,4,3>();\r
+    test<5,4,0>();\r
+    test<5,4,1>();\r
+    test<5,4,2>();\r
+    test<5,4,3>();\r
+    test<5,4,4>();\r
+          \r
+    test<2,5,0>();\r
+    test<2,5,1>();\r
+    test<3,5,0>();\r
+    test<3,5,1>();\r
+    test<3,5,2>();\r
+    test<4,5,0>();\r
+    test<4,5,1>();\r
+    test<4,5,2>();\r
+    test<4,5,3>();\r
+    test<5,5,0>();\r
+    test<5,5,1>();\r
+    test<5,5,2>();\r
+    test<5,5,3>();\r
+    test<5,5,4>();\r
+\r
+    return boost::report_errors();\r
+    }\r
index 78d076a0bb2929a636df9637518fa9ed55eb18ce..d982dc38c3af3adc837909070e70111984da7084 100644 (file)
@@ -1,34 +1,34 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols,double> x(42,1);
-        test_qvm::matrix<M1,Rows,Cols,float> y;
-        assign(y,scalar_cast<float>(x));
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols; ++j )
-                y.b[i][j]=static_cast<float>(x.a[i][j]);
-        BOOST_QVM_TEST_EQ(y.a,y.b);
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols,double> x(42,1);\r
+        test_qvm::matrix<M1,Rows,Cols,float> y;\r
+        assign(y,scalar_cast<float>(x));\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                y.b[i][j]=static_cast<float>(x.a[i][j]);\r
+        BOOST_QVM_TEST_EQ(y.a,y.b);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    return boost::report_errors();\r
+    }\r
index ef70e38216d7ba23db924278766f98a43f3002af..2479661d705baf2eb2d2060a233f1077429e0b6b 100644 (file)
@@ -1,30 +1,30 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1,double> x(42,1);
-        test_qvm::quaternion<Q1,float> y;
-        assign(y,scalar_cast<float>(x));
-        for( int i=0; i!=4; ++i )
-            y.b[i]=static_cast<float>(x.a[i]);
-        BOOST_QVM_TEST_EQ(y.a,y.b);
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1,double> x(42,1);\r
+        test_qvm::quaternion<Q1,float> y;\r
+        assign(y,scalar_cast<float>(x));\r
+        for( int i=0; i!=4; ++i )\r
+            y.b[i]=static_cast<float>(x.a[i]);\r
+        BOOST_QVM_TEST_EQ(y.a,y.b);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 73555a25f310764b6d12f61e2199db84689719c6..ba7a717caf75146b90014a59a97a61c066eebc9c 100644 (file)
@@ -1,31 +1,31 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim,double> x(42,1);
-        test_qvm::vector<V1,Dim,float> y;
-        assign(y,scalar_cast<float>(x));
-        for( int i=0; i!=Dim; ++i )
-            y.b[i]=static_cast<float>(x.a[i]);
-        BOOST_QVM_TEST_EQ(y.a,y.b);
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim,double> x(42,1);\r
+        test_qvm::vector<V1,Dim,float> y;\r
+        assign(y,scalar_cast<float>(x));\r
+        for( int i=0; i!=Dim; ++i )\r
+            y.b[i]=static_cast<float>(x.a[i]);\r
+        BOOST_QVM_TEST_EQ(y.a,y.b);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    return boost::report_errors();\r
+    }\r
index c0914af300660bc90246dba657e91df5e1a440b5..ba3635a98027d2eba159b069aeaa0f9bc1afd4a3 100644 (file)
@@ -1,57 +1,57 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/quat.hpp>
-#include "test_qvm_quaternion.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm;
-            {
-            test_qvm::quaternion<Q1> a=rotx_quat(1.0f);
-            test_qvm::quaternion<Q1> b=rotx_quat(.5f);
-            test_qvm::quaternion<Q1> aa=slerp(a,b,0);
-            test_qvm::quaternion<Q1> bb=slerp(a,b,1);
-            BOOST_QVM_TEST_CLOSE(aa.a,a.a,0.0001f);
-            BOOST_QVM_TEST_CLOSE(bb.a,b.a,0.0001f);
-            }
-        for( float a1=0; a1<6.28f; a1+=0.3f )
-            {
-            test_qvm::quaternion<Q1> const qx1=rotx_quat(a1);
-            test_qvm::quaternion<Q1> const qy1=roty_quat(a1);
-            test_qvm::quaternion<Q1> const qz1=rotz_quat(a1);
-            for( float a2=0; a2<6.28f; a2+=0.05f )
-                {
-                test_qvm::quaternion<Q1> const qx2=rotx_quat(a2);
-                test_qvm::quaternion<Q1> const qy2=roty_quat(a2);
-                test_qvm::quaternion<Q1> const qz2=rotz_quat(a2);
-                for( float t=0; t<1; t+=0.03f )
-                    {
-                    test_qvm::quaternion<Q1> const qx=rotx_quat(a1*(1-t)+a2*t);
-                    test_qvm::quaternion<Q1> const qy=roty_quat(a1*(1-t)+a2*t);
-                    test_qvm::quaternion<Q1> const qz=rotz_quat(a1*(1-t)+a2*t);
-                    test_qvm::quaternion<Q1> const qsx=slerp(qx1,qx2,t);
-                    test_qvm::quaternion<Q1> const qsy=slerp(qref(qy1),qy2,t);
-                    test_qvm::quaternion<Q1> const qsz=slerp(qz1,qref(qz2),t);
-                    BOOST_QVM_TEST_CLOSE(qx.a,qsx.a,0.001f);
-                    BOOST_QVM_TEST_CLOSE(qy.a,qsy.a,0.001f);
-                    BOOST_QVM_TEST_CLOSE(qz.a,qsz.a,0.001f);
-                    }
-                }
-            }
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/quat.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+            {\r
+            test_qvm::quaternion<Q1> a=rotx_quat(1.0f);\r
+            test_qvm::quaternion<Q1> b=rotx_quat(.5f);\r
+            test_qvm::quaternion<Q1> aa=slerp(a,b,0);\r
+            test_qvm::quaternion<Q1> bb=slerp(a,b,1);\r
+            BOOST_QVM_TEST_CLOSE(aa.a,a.a,0.0001f);\r
+            BOOST_QVM_TEST_CLOSE(bb.a,b.a,0.0001f);\r
+            }\r
+        for( float a1=0; a1<6.28f; a1+=0.3f )\r
+            {\r
+            test_qvm::quaternion<Q1> const qx1=rotx_quat(a1);\r
+            test_qvm::quaternion<Q1> const qy1=roty_quat(a1);\r
+            test_qvm::quaternion<Q1> const qz1=rotz_quat(a1);\r
+            for( float a2=0; a2<6.28f; a2+=0.05f )\r
+                {\r
+                test_qvm::quaternion<Q1> const qx2=rotx_quat(a2);\r
+                test_qvm::quaternion<Q1> const qy2=roty_quat(a2);\r
+                test_qvm::quaternion<Q1> const qz2=rotz_quat(a2);\r
+                for( float t=0; t<1; t+=0.03f )\r
+                    {\r
+                    test_qvm::quaternion<Q1> const qx=rotx_quat(a1*(1-t)+a2*t);\r
+                    test_qvm::quaternion<Q1> const qy=roty_quat(a1*(1-t)+a2*t);\r
+                    test_qvm::quaternion<Q1> const qz=rotz_quat(a1*(1-t)+a2*t);\r
+                    test_qvm::quaternion<Q1> const qsx=slerp(qx1,qx2,t);\r
+                    test_qvm::quaternion<Q1> const qsy=slerp(qref(qy1),qy2,t);\r
+                    test_qvm::quaternion<Q1> const qsz=slerp(qz1,qref(qz2),t);\r
+                    BOOST_QVM_TEST_CLOSE(qx.a,qsx.a,0.001f);\r
+                    BOOST_QVM_TEST_CLOSE(qy.a,qsy.a,0.001f);\r
+                    BOOST_QVM_TEST_CLOSE(qz.a,qsz.a,0.001f);\r
+                    }\r
+                }\r
+            }\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index c7b40b7206b5fb8a0cc678d4f9ab8b0dd4c89d4c..0300193766c3780c2b57a37e11e0268c032a00e2 100644 (file)
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map_mat_mat.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols,int C1,int C2>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        float r1[Rows][Cols];
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols; ++j )
-                r1[i][j]=x.a[i][j==C1?C2:j==C2?C1:j];
-        float r2[Rows][Cols];
-        assign(r2,swap_cols<C1,C2>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        swap_cols<C1,C2>(x) *= 2;
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols; ++j )
-                r1[i][j]=x.a[i][j==C1?C2:j==C2?C1:j];
-        assign(r2,swap_cols<C1,C2>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        swap_cols<C1,C2>(x)+swap_cols<C1,C2>(x);
-        -swap_cols<C1,C2>(x);
-        }
-    }
-
-int
-main()
-    {
-    test<2,2,0,0>();
-    test<2,2,0,1>();
-    test<2,2,1,0>();
-    test<2,2,1,1>();
-
-    test<3,3,0,0>();
-    test<3,3,0,1>();
-    test<3,3,0,2>();
-    test<3,3,1,0>();
-    test<3,3,1,1>();
-    test<3,3,1,2>();
-    test<3,3,2,0>();
-    test<3,3,2,1>();
-    test<3,3,2,2>();
-
-    test<4,4,0,0>();
-    test<4,4,0,1>();
-    test<4,4,0,2>();
-    test<4,4,0,3>();
-    test<4,4,1,0>();
-    test<4,4,1,1>();
-    test<4,4,1,2>();
-    test<4,4,1,3>();
-    test<4,4,2,0>();
-    test<4,4,2,1>();
-    test<4,4,2,2>();
-    test<4,4,2,3>();
-    test<4,4,3,0>();
-    test<4,4,3,1>();
-    test<4,4,3,2>();
-    test<4,4,3,3>();
-
-    test<5,5,0,0>();
-    test<5,5,0,1>();
-    test<5,5,0,2>();
-    test<5,5,0,3>();
-    test<5,5,0,4>();
-    test<5,5,1,0>();
-    test<5,5,1,1>();
-    test<5,5,1,2>();
-    test<5,5,1,3>();
-    test<5,5,1,4>();
-    test<5,5,2,0>();
-    test<5,5,2,1>();
-    test<5,5,2,2>();
-    test<5,5,2,3>();
-    test<5,5,2,4>();
-    test<5,5,3,0>();
-    test<5,5,3,1>();
-    test<5,5,3,2>();
-    test<5,5,3,3>();
-    test<5,5,3,4>();
-    test<5,5,4,0>();
-    test<5,5,4,1>();
-    test<5,5,4,2>();
-    test<5,5,4,3>();
-    test<5,5,4,4>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map_mat_mat.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols,int C1,int C2>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        float r1[Rows][Cols];\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                r1[i][j]=x.a[i][j==C1?C2:j==C2?C1:j];\r
+        float r2[Rows][Cols];\r
+        assign(r2,swap_cols<C1,C2>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        swap_cols<C1,C2>(x) *= 2;\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                r1[i][j]=x.a[i][j==C1?C2:j==C2?C1:j];\r
+        assign(r2,swap_cols<C1,C2>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        swap_cols<C1,C2>(x)+swap_cols<C1,C2>(x);\r
+        -swap_cols<C1,C2>(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2,2,0,0>();\r
+    test<2,2,0,1>();\r
+    test<2,2,1,0>();\r
+    test<2,2,1,1>();\r
+\r
+    test<3,3,0,0>();\r
+    test<3,3,0,1>();\r
+    test<3,3,0,2>();\r
+    test<3,3,1,0>();\r
+    test<3,3,1,1>();\r
+    test<3,3,1,2>();\r
+    test<3,3,2,0>();\r
+    test<3,3,2,1>();\r
+    test<3,3,2,2>();\r
+\r
+    test<4,4,0,0>();\r
+    test<4,4,0,1>();\r
+    test<4,4,0,2>();\r
+    test<4,4,0,3>();\r
+    test<4,4,1,0>();\r
+    test<4,4,1,1>();\r
+    test<4,4,1,2>();\r
+    test<4,4,1,3>();\r
+    test<4,4,2,0>();\r
+    test<4,4,2,1>();\r
+    test<4,4,2,2>();\r
+    test<4,4,2,3>();\r
+    test<4,4,3,0>();\r
+    test<4,4,3,1>();\r
+    test<4,4,3,2>();\r
+    test<4,4,3,3>();\r
+\r
+    test<5,5,0,0>();\r
+    test<5,5,0,1>();\r
+    test<5,5,0,2>();\r
+    test<5,5,0,3>();\r
+    test<5,5,0,4>();\r
+    test<5,5,1,0>();\r
+    test<5,5,1,1>();\r
+    test<5,5,1,2>();\r
+    test<5,5,1,3>();\r
+    test<5,5,1,4>();\r
+    test<5,5,2,0>();\r
+    test<5,5,2,1>();\r
+    test<5,5,2,2>();\r
+    test<5,5,2,3>();\r
+    test<5,5,2,4>();\r
+    test<5,5,3,0>();\r
+    test<5,5,3,1>();\r
+    test<5,5,3,2>();\r
+    test<5,5,3,3>();\r
+    test<5,5,3,4>();\r
+    test<5,5,4,0>();\r
+    test<5,5,4,1>();\r
+    test<5,5,4,2>();\r
+    test<5,5,4,3>();\r
+    test<5,5,4,4>();\r
+    return boost::report_errors();\r
+    }\r
index 45ff0a940008cd1e3fd0f58034e24f786ccc15f8..fd3702fcea20fe6fdcce10375e458eecc616e1e3 100644 (file)
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map_mat_mat.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm.hpp"
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols,int R1,int R2>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        float r1[Rows][Cols];
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols; ++j )
-                r1[i][j]=x.a[i==R1?R2:i==R2?R1:i][j];
-        float r2[Rows][Cols];
-        assign(r2,swap_rows<R1,R2>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        swap_rows<R1,R2>(x) *= 2;
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols; ++j )
-                r1[i][j]=x.a[i==R1?R2:i==R2?R1:i][j];
-        assign(r2,swap_rows<R1,R2>(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        swap_rows<R1,R2>(x)+swap_rows<R1,R2>(x);
-        -swap_rows<R1,R2>(x);
-        }
-    }
-
-int
-main()
-    {
-    test<2,2,0,0>();
-    test<2,2,0,1>();
-    test<2,2,1,0>();
-    test<2,2,1,1>();
-
-    test<3,3,0,0>();
-    test<3,3,0,1>();
-    test<3,3,0,2>();
-    test<3,3,1,0>();
-    test<3,3,1,1>();
-    test<3,3,1,2>();
-    test<3,3,2,0>();
-    test<3,3,2,1>();
-    test<3,3,2,2>();
-
-    test<4,4,0,0>();
-    test<4,4,0,1>();
-    test<4,4,0,2>();
-    test<4,4,0,3>();
-    test<4,4,1,0>();
-    test<4,4,1,1>();
-    test<4,4,1,2>();
-    test<4,4,1,3>();
-    test<4,4,2,0>();
-    test<4,4,2,1>();
-    test<4,4,2,2>();
-    test<4,4,2,3>();
-    test<4,4,3,0>();
-    test<4,4,3,1>();
-    test<4,4,3,2>();
-    test<4,4,3,3>();
-
-    test<5,5,0,0>();
-    test<5,5,0,1>();
-    test<5,5,0,2>();
-    test<5,5,0,3>();
-    test<5,5,0,4>();
-    test<5,5,1,0>();
-    test<5,5,1,1>();
-    test<5,5,1,2>();
-    test<5,5,1,3>();
-    test<5,5,1,4>();
-    test<5,5,2,0>();
-    test<5,5,2,1>();
-    test<5,5,2,2>();
-    test<5,5,2,3>();
-    test<5,5,2,4>();
-    test<5,5,3,0>();
-    test<5,5,3,1>();
-    test<5,5,3,2>();
-    test<5,5,3,3>();
-    test<5,5,3,4>();
-    test<5,5,4,0>();
-    test<5,5,4,1>();
-    test<5,5,4,2>();
-    test<5,5,4,3>();
-    test<5,5,4,4>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map_mat_mat.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm.hpp"\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols,int R1,int R2>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        float r1[Rows][Cols];\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                r1[i][j]=x.a[i==R1?R2:i==R2?R1:i][j];\r
+        float r2[Rows][Cols];\r
+        assign(r2,swap_rows<R1,R2>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        swap_rows<R1,R2>(x) *= 2;\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                r1[i][j]=x.a[i==R1?R2:i==R2?R1:i][j];\r
+        assign(r2,swap_rows<R1,R2>(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        swap_rows<R1,R2>(x)+swap_rows<R1,R2>(x);\r
+        -swap_rows<R1,R2>(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2,2,0,0>();\r
+    test<2,2,0,1>();\r
+    test<2,2,1,0>();\r
+    test<2,2,1,1>();\r
+\r
+    test<3,3,0,0>();\r
+    test<3,3,0,1>();\r
+    test<3,3,0,2>();\r
+    test<3,3,1,0>();\r
+    test<3,3,1,1>();\r
+    test<3,3,1,2>();\r
+    test<3,3,2,0>();\r
+    test<3,3,2,1>();\r
+    test<3,3,2,2>();\r
+\r
+    test<4,4,0,0>();\r
+    test<4,4,0,1>();\r
+    test<4,4,0,2>();\r
+    test<4,4,0,3>();\r
+    test<4,4,1,0>();\r
+    test<4,4,1,1>();\r
+    test<4,4,1,2>();\r
+    test<4,4,1,3>();\r
+    test<4,4,2,0>();\r
+    test<4,4,2,1>();\r
+    test<4,4,2,2>();\r
+    test<4,4,2,3>();\r
+    test<4,4,3,0>();\r
+    test<4,4,3,1>();\r
+    test<4,4,3,2>();\r
+    test<4,4,3,3>();\r
+\r
+    test<5,5,0,0>();\r
+    test<5,5,0,1>();\r
+    test<5,5,0,2>();\r
+    test<5,5,0,3>();\r
+    test<5,5,0,4>();\r
+    test<5,5,1,0>();\r
+    test<5,5,1,1>();\r
+    test<5,5,1,2>();\r
+    test<5,5,1,3>();\r
+    test<5,5,1,4>();\r
+    test<5,5,2,0>();\r
+    test<5,5,2,1>();\r
+    test<5,5,2,2>();\r
+    test<5,5,2,3>();\r
+    test<5,5,2,4>();\r
+    test<5,5,3,0>();\r
+    test<5,5,3,1>();\r
+    test<5,5,3,2>();\r
+    test<5,5,3,3>();\r
+    test<5,5,3,4>();\r
+    test<5,5,4,0>();\r
+    test<5,5,4,1>();\r
+    test<5,5,4,2>();\r
+    test<5,5,4,3>();\r
+    test<5,5,4,4>();\r
+    return boost::report_errors();\r
+    }\r
index 837026e6230d47863257555df7c76a66f3cd30ac..5d950dee94e9c9fa43d491639803eab2912dbf93 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_traits.hpp>
-#include <boost/qvm/swizzle2.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-template <int D> struct my_vec { };
-int called=0;
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        void
-        XX(...)
-            {
-            BOOST_TEST(0);
-            }
-        void
-        XY(...)
-            {
-            ++called;
-            }
-        template <int D>
-        struct
-        vec_traits< my_vec<D> >
-            {
-            typedef int scalar_type;
-            static int const dim=D;
-            template <int I> static int read_element( my_vec<D> const & );
-            template <int I> static int & write_element( my_vec<D> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    XX(my_vec<1>());
-    XY(my_vec<1>());
-    BOOST_TEST(called==1);
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_traits.hpp>\r
+#include <boost/qvm/swizzle2.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+\r
+template <int D> struct my_vec { };\r
+int called=0;\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        void\r
+        XX(...)\r
+            {\r
+            BOOST_TEST(0);\r
+            }\r
+        void\r
+        XY(...)\r
+            {\r
+            ++called;\r
+            }\r
+        template <int D>\r
+        struct\r
+        vec_traits< my_vec<D> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const dim=D;\r
+            template <int I> static int read_element( my_vec<D> const & );\r
+            template <int I> static int & write_element( my_vec<D> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    XX(my_vec<1>());\r
+    XY(my_vec<1>());\r
+    BOOST_TEST(called==1);\r
+    return boost::report_errors();\r
+    }\r
index a9c02b68cd071dd1dfbac3d6efdf68302b556f78..14a6f5b5153efce4ab300577a59269b45b6cb297 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_traits.hpp>
-#include <boost/qvm/swizzle2.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-template <int D> struct my_vec { };
-int called=0;
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        void
-        YY(...)
-            {
-            BOOST_TEST(0);
-            }
-        void
-        XZ(...)
-            {
-            ++called;
-            }
-        template <int D>
-        struct
-        vec_traits< my_vec<D> >
-            {
-            typedef int scalar_type;
-            static int const dim=D;
-            template <int I> static int read_element( my_vec<D> const & );
-            template <int I> static int & write_element( my_vec<D> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    YY(my_vec<2>());
-    XZ(my_vec<2>());
-    BOOST_TEST(called==1);
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_traits.hpp>\r
+#include <boost/qvm/swizzle2.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+\r
+template <int D> struct my_vec { };\r
+int called=0;\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        void\r
+        YY(...)\r
+            {\r
+            BOOST_TEST(0);\r
+            }\r
+        void\r
+        XZ(...)\r
+            {\r
+            ++called;\r
+            }\r
+        template <int D>\r
+        struct\r
+        vec_traits< my_vec<D> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const dim=D;\r
+            template <int I> static int read_element( my_vec<D> const & );\r
+            template <int I> static int & write_element( my_vec<D> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    YY(my_vec<2>());\r
+    XZ(my_vec<2>());\r
+    BOOST_TEST(called==1);\r
+    return boost::report_errors();\r
+    }\r
index 2b8f63f6ac0cc287a3cae1616a8fd9620669df0b..f086333c7970741b960cf35f7442e59b648e2228 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_traits.hpp>
-#include <boost/qvm/swizzle2.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-template <int D> struct my_vec { };
-int called=0;
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        void
-        ZZ(...)
-            {
-            BOOST_TEST(0);
-            }
-        void
-        XW(...)
-            {
-            ++called;
-            }
-        template <int D>
-        struct
-        vec_traits< my_vec<D> >
-            {
-            typedef int scalar_type;
-            static int const dim=D;
-            template <int I> static int read_element( my_vec<D> const & );
-            template <int I> static int & write_element( my_vec<D> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    ZZ(my_vec<3>());
-    XW(my_vec<3>());
-    BOOST_TEST(called==1);
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_traits.hpp>\r
+#include <boost/qvm/swizzle2.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+\r
+template <int D> struct my_vec { };\r
+int called=0;\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        void\r
+        ZZ(...)\r
+            {\r
+            BOOST_TEST(0);\r
+            }\r
+        void\r
+        XW(...)\r
+            {\r
+            ++called;\r
+            }\r
+        template <int D>\r
+        struct\r
+        vec_traits< my_vec<D> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const dim=D;\r
+            template <int I> static int read_element( my_vec<D> const & );\r
+            template <int I> static int & write_element( my_vec<D> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    ZZ(my_vec<3>());\r
+    XW(my_vec<3>());\r
+    BOOST_TEST(called==1);\r
+    return boost::report_errors();\r
+    }\r
index cfc91f0f44a8582d3727e7ab164e885766ac38a0..6817518f397d211fef6745fe4ba4e82f6ced5aa8 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_traits.hpp>
-#include <boost/qvm/swizzle3.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-template <int D> struct my_vec { };
-int called=0;
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        void
-        XXX(...)
-            {
-            BOOST_TEST(0);
-            }
-        void
-        XXY(...)
-            {
-            ++called;
-            }
-        template <int D>
-        struct
-        vec_traits< my_vec<D> >
-            {
-            typedef int scalar_type;
-            static int const dim=D;
-            template <int I> static int read_element( my_vec<D> const & );
-            template <int I> static int & write_element( my_vec<D> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    XXX(my_vec<1>());
-    XXY(my_vec<1>());
-    BOOST_TEST(called==1);
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_traits.hpp>\r
+#include <boost/qvm/swizzle3.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+\r
+template <int D> struct my_vec { };\r
+int called=0;\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        void\r
+        XXX(...)\r
+            {\r
+            BOOST_TEST(0);\r
+            }\r
+        void\r
+        XXY(...)\r
+            {\r
+            ++called;\r
+            }\r
+        template <int D>\r
+        struct\r
+        vec_traits< my_vec<D> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const dim=D;\r
+            template <int I> static int read_element( my_vec<D> const & );\r
+            template <int I> static int & write_element( my_vec<D> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    XXX(my_vec<1>());\r
+    XXY(my_vec<1>());\r
+    BOOST_TEST(called==1);\r
+    return boost::report_errors();\r
+    }\r
index 006f1138fd180f154526150157738d427413103e..0499d82d3824079ddcddcba5486e1390182cf3c2 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_traits.hpp>
-#include <boost/qvm/swizzle3.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-template <int D> struct my_vec { };
-int called=0;
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        void
-        YYY(...)
-            {
-            BOOST_TEST(0);
-            }
-        void
-        XXZ(...)
-            {
-            ++called;
-            }
-        template <int D>
-        struct
-        vec_traits< my_vec<D> >
-            {
-            typedef int scalar_type;
-            static int const dim=D;
-            template <int I> static int read_element( my_vec<D> const & );
-            template <int I> static int & write_element( my_vec<D> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    YYY(my_vec<2>());
-    XXZ(my_vec<2>());
-    BOOST_TEST(called==1);
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_traits.hpp>\r
+#include <boost/qvm/swizzle3.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+\r
+template <int D> struct my_vec { };\r
+int called=0;\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        void\r
+        YYY(...)\r
+            {\r
+            BOOST_TEST(0);\r
+            }\r
+        void\r
+        XXZ(...)\r
+            {\r
+            ++called;\r
+            }\r
+        template <int D>\r
+        struct\r
+        vec_traits< my_vec<D> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const dim=D;\r
+            template <int I> static int read_element( my_vec<D> const & );\r
+            template <int I> static int & write_element( my_vec<D> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    YYY(my_vec<2>());\r
+    XXZ(my_vec<2>());\r
+    BOOST_TEST(called==1);\r
+    return boost::report_errors();\r
+    }\r
index bba231a1c755cd19a3f5fa008a605ac81eb7516f..26b4b18db7074efeaca0a63cfe62724cf4234a44 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_traits.hpp>
-#include <boost/qvm/swizzle3.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-template <int D> struct my_vec { };
-int called=0;
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        void
-        ZZZ(...)
-            {
-            BOOST_TEST(0);
-            }
-        void
-        XXW(...)
-            {
-            ++called;
-            }
-        template <int D>
-        struct
-        vec_traits< my_vec<D> >
-            {
-            typedef int scalar_type;
-            static int const dim=D;
-            template <int I> static int read_element( my_vec<D> const & );
-            template <int I> static int & write_element( my_vec<D> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    ZZZ(my_vec<3>());
-    XXW(my_vec<3>());
-    BOOST_TEST(called==1);
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_traits.hpp>\r
+#include <boost/qvm/swizzle3.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+\r
+template <int D> struct my_vec { };\r
+int called=0;\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        void\r
+        ZZZ(...)\r
+            {\r
+            BOOST_TEST(0);\r
+            }\r
+        void\r
+        XXW(...)\r
+            {\r
+            ++called;\r
+            }\r
+        template <int D>\r
+        struct\r
+        vec_traits< my_vec<D> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const dim=D;\r
+            template <int I> static int read_element( my_vec<D> const & );\r
+            template <int I> static int & write_element( my_vec<D> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    ZZZ(my_vec<3>());\r
+    XXW(my_vec<3>());\r
+    BOOST_TEST(called==1);\r
+    return boost::report_errors();\r
+    }\r
index 049d59917e9c6ae61eb8b3354009987a3e2204cd..ca03f261b80f83d5a990f64d854b0e9100eb74d3 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_traits.hpp>
-#include <boost/qvm/swizzle4.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-template <int D> struct my_vec { };
-int called=0;
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        void
-        XXXX(...)
-            {
-            BOOST_TEST(0);
-            }
-        void
-        XXXY(...)
-            {
-            ++called;
-            }
-        template <int D>
-        struct
-        vec_traits< my_vec<D> >
-            {
-            typedef int scalar_type;
-            static int const dim=D;
-            template <int I> static int read_element( my_vec<D> const & );
-            template <int I> static int & write_element( my_vec<D> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    XXXX(my_vec<1>());
-    XXXY(my_vec<1>());
-    BOOST_TEST(called==1);
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_traits.hpp>\r
+#include <boost/qvm/swizzle4.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+\r
+template <int D> struct my_vec { };\r
+int called=0;\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        void\r
+        XXXX(...)\r
+            {\r
+            BOOST_TEST(0);\r
+            }\r
+        void\r
+        XXXY(...)\r
+            {\r
+            ++called;\r
+            }\r
+        template <int D>\r
+        struct\r
+        vec_traits< my_vec<D> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const dim=D;\r
+            template <int I> static int read_element( my_vec<D> const & );\r
+            template <int I> static int & write_element( my_vec<D> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    XXXX(my_vec<1>());\r
+    XXXY(my_vec<1>());\r
+    BOOST_TEST(called==1);\r
+    return boost::report_errors();\r
+    }\r
index ac472b2dc78510a36909539f2167f3be5f07e26e..728879ff4fbf1fdc69fee40d0254dcf28e39598d 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_traits.hpp>
-#include <boost/qvm/swizzle4.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-template <int D> struct my_vec { };
-int called=0;
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        void
-        YYYY(...)
-            {
-            BOOST_TEST(0);
-            }
-        void
-        XXXZ(...)
-            {
-            ++called;
-            }
-        template <int D>
-        struct
-        vec_traits< my_vec<D> >
-            {
-            typedef int scalar_type;
-            static int const dim=D;
-            template <int I> static int read_element( my_vec<D> const & );
-            template <int I> static int & write_element( my_vec<D> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    YYYY(my_vec<2>());
-    XXXZ(my_vec<2>());
-    BOOST_TEST(called==1);
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_traits.hpp>\r
+#include <boost/qvm/swizzle4.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+\r
+template <int D> struct my_vec { };\r
+int called=0;\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        void\r
+        YYYY(...)\r
+            {\r
+            BOOST_TEST(0);\r
+            }\r
+        void\r
+        XXXZ(...)\r
+            {\r
+            ++called;\r
+            }\r
+        template <int D>\r
+        struct\r
+        vec_traits< my_vec<D> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const dim=D;\r
+            template <int I> static int read_element( my_vec<D> const & );\r
+            template <int I> static int & write_element( my_vec<D> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    YYYY(my_vec<2>());\r
+    XXXZ(my_vec<2>());\r
+    BOOST_TEST(called==1);\r
+    return boost::report_errors();\r
+    }\r
index 7b191563d1d22becbee1765e076869e541ac566e..33e796bd738fbbd62146c8adc72bad5d9082ee73 100644 (file)
@@ -1,49 +1,49 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_traits.hpp>
-#include <boost/qvm/swizzle4.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-template <int D> struct my_vec { };
-int called=0;
-
-namespace
-boost
-    {
-    namespace
-    qvm
-        {
-        void
-        ZZZZ(...)
-            {
-            BOOST_TEST(0);
-            }
-        void
-        XXXW(...)
-            {
-            ++called;
-            }
-        template <int D>
-        struct
-        vec_traits< my_vec<D> >
-            {
-            typedef int scalar_type;
-            static int const dim=D;
-            template <int I> static int read_element( my_vec<D> const & );
-            template <int I> static int & write_element( my_vec<D> & );
-            };
-        }
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    ZZZZ(my_vec<3>());
-    XXXW(my_vec<3>());
-    BOOST_TEST(called==1);
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_traits.hpp>\r
+#include <boost/qvm/swizzle4.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+\r
+template <int D> struct my_vec { };\r
+int called=0;\r
+\r
+namespace\r
+boost\r
+    {\r
+    namespace\r
+    qvm\r
+        {\r
+        void\r
+        ZZZZ(...)\r
+            {\r
+            BOOST_TEST(0);\r
+            }\r
+        void\r
+        XXXW(...)\r
+            {\r
+            ++called;\r
+            }\r
+        template <int D>\r
+        struct\r
+        vec_traits< my_vec<D> >\r
+            {\r
+            typedef int scalar_type;\r
+            static int const dim=D;\r
+            template <int I> static int read_element( my_vec<D> const & );\r
+            template <int I> static int & write_element( my_vec<D> & );\r
+            };\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    ZZZZ(my_vec<3>());\r
+    XXXW(my_vec<3>());\r
+    BOOST_TEST(called==1);\r
+    return boost::report_errors();\r
+    }\r
index df3d77c9dd936c0ab7865425fb921b9049d1aa9c..eda488ad28264714c1146fdb39e347ddf0396b9b 100644 (file)
@@ -1,18 +1,18 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec.hpp>
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/swizzle2.hpp>
-
-int
-main()
-    {
-    using namespace boost::qvm;
-    vec<float,2> v;
-    vec<float,2> const & cv=v;
-    XY(cv)*=2;
-    return 1;
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec.hpp>\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/swizzle2.hpp>\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+    vec<float,2> v;\r
+    vec<float,2> const & cv=v;\r
+    XY(cv)*=2;\r
+    return 1;\r
+    }\r
index 621acfa5ecbbefa4ede75cd4b6791c2a3bd01a66..b9ff5c10a17a20818b5bb44f6adc644fc0276931 100644 (file)
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef UUID_06E5D36EB6C211DEA317E19C55D89593
-#define UUID_06E5D36EB6C211DEA317E19C55D89593
-
-#include <boost/test/floating_point_comparison.hpp>
-#include <boost/detail/lightweight_test.hpp>
-#include <iostream>
-
-#define BOOST_QVM_TEST_EQ(expra,exprb) ( ::test_qvm::detail::test_eq_impl(#expra, #exprb, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expra, exprb) )
-#define BOOST_QVM_TEST_NEQ(expra,exprb) ( ::test_qvm::detail::test_neq_impl(#expra, #exprb, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expra, exprb) )
-#define BOOST_QVM_TEST_CLOSE(expra,exprb,exprt) ( ::test_qvm::detail::test_close_impl(#expra, #exprb, #exprt, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expra, exprb, exprt) )
-
-#define BOOST_QVM_TEST_EQ_QUAT(expra,exprb) ( ::test_qvm::detail::test_eq_q_impl(#expra, #exprb, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expra, exprb) )
-#define BOOST_QVM_TEST_NEQ_QUAT(expra,exprb) ( ::test_qvm::detail::test_neq_q_impl(#expra, #exprb, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expra, exprb) )
-#define BOOST_QVM_TEST_CLOSE_QUAT(expra,exprb,exprt) ( ::test_qvm::detail::test_close_q_impl(#expra, #exprb, #exprt, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expra, exprb, exprt) )
-
-namespace
-test_qvm
-    {
-    namespace
-    detail
-        {
-        inline
-        bool
-        close_at_tolerance( float a, float b, float tolerance )
-            {
-            return boost::math::fpc::close_at_tolerance<float>(tolerance,boost::math::fpc::FPC_STRONG)(a,b);
-            }
-
-        inline
-        bool
-        close_at_tolerance( double a, double b, double tolerance )
-            {
-            return boost::math::fpc::close_at_tolerance<double>(tolerance,boost::math::fpc::FPC_STRONG)(a,b);
-            }
-
-        template <class A,class B>
-        void
-        dump_ab( A a, B b )
-            {
-            std::cerr << a << '\t' << b << std::endl;
-            }
-
-        template <class A,class B,int D>
-        void
-        dump_ab( A (&a)[D], B (&b)[D] )
-            {
-            for( int i=0; i!=D; ++i )
-                dump_ab(a[i],b[i]);
-            }
-
-        template <class A,class B>
-        void
-        test_eq_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A a, B b )
-            {
-            using namespace ::boost::qvm;
-            if( !(a==b) )
-                {
-                std::cerr << file << "(" << line << "): BOOST_QVM_TEST_EQ(" << expra << ',' << exprb
-                    << ") failed in function " << function << '\n';
-                dump_ab(a,b);
-                ++::boost::detail::test_errors();
-                }
-            }
-
-        template <class A,class B,int M,int N>
-        void
-        test_eq_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A (&a)[M][N], B (&b)[M][N] )
-            {
-            using namespace ::boost::qvm;
-            for( int i=0; i<M; ++i )
-                for( int j=0; j<N; ++j )
-                    if( !(a[i][j]==b[i][j]) )
-                        {
-                        std::cerr << file << "(" << line << "): BOOST_QVM_TEST_EQ(" << expra << ',' << exprb
-                            << ") failed in function " << function << '\n';
-                        dump_ab(a,b);
-                        ++::boost::detail::test_errors();
-                        return;
-                        }
-            }
-
-        template <class A,class B,int D>
-        void
-        test_eq_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A (&a)[D], B (&b)[D] )
-            {
-            using namespace ::boost::qvm;
-            for( int i=0; i<D; ++i )
-                if( !(a[i]==b[i]) )
-                    {
-                    std::cerr << file << "(" << line << "): BOOST_QVM_TEST_EQ" << expra << ',' << exprb
-                        << ") failed in function " << function <<'\n';
-                    dump_ab(a,b);
-                    ++::boost::detail::test_errors();
-                    return;
-                    }
-            }
-
-        template <class A,class B>
-        void
-        test_eq_q_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A (&a)[4], B (&b)[4] )
-            {
-            using namespace ::boost::qvm;
-            int i;
-            for( i=0; i<4; ++i )
-                if( !(a[i]==b[i]) )
-                    break;
-            if( i==4 )
-                return;
-            for( i=0; i<4; ++i )
-                if( !(a[i]==-b[i]) )
-                    {
-                    std::cerr << file << "(" << line << "): BOOST_QVM_TEST_EQ" << expra << ',' << exprb
-                        << ") failed in function " << function <<'\n';
-                    dump_ab(a,b);
-                    ++::boost::detail::test_errors();
-                    return;
-                    }
-            }
-
-        template <class A,class B>
-        void
-        test_neq_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A a, B b )
-            {
-            using namespace ::boost::qvm;
-            if( !(a!=b) )
-                {
-                std::cerr << file << "(" << line << "): BOOST_QVM_TEST_NEQ(" << expra << ',' << exprb
-                    << ") failed in function " << function << '\n';
-                dump_ab(a,b);
-                ++::boost::detail::test_errors();
-                }
-            }
-
-        template <class A,class B,int M,int N>
-        void
-        test_neq_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A (&a)[M][N], B (&b)[M][N] )
-            {
-            using namespace ::boost::qvm;
-            for( int i=0; i<M; ++i )
-                for( int j=0; j<N; ++j )
-                    if( a[i][j]!=b[i][j] )
-                        return;
-            std::cerr << file << "(" << line << "): BOOST_QVM_TEST_NEQ(" << expra << ',' << exprb
-                << ") failed in function " << function << '\n';
-            dump_ab(a,b);
-            ++::boost::detail::test_errors();
-            }
-
-        template <class A,class B,int D>
-        void
-        test_neq_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A (&a)[D], B (&b)[D] )
-            {
-            using namespace ::boost::qvm;
-            for( int i=0; i<D; ++i )
-                if( a[i]!=b[i] )
-                    return;
-            std::cerr << file << "(" << line << "): BOOST_QVM_TEST_NEQ(" << expra << ',' << exprb
-                << ") failed in function " << function << '\n';
-            dump_ab(a,b);
-            ++::boost::detail::test_errors();
-            }
-
-        template <class A,class B>
-        void
-        test_neq_q_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A (&a)[4], B (&b)[4] )
-            {
-            using namespace ::boost::qvm;
-            int i;
-            for( i=0; i<4; ++i )
-                if( !(a[i]!=b[i]) )
-                    break;
-            if( i==4 )
-                return;
-            for( i=0; i<4; ++i )
-                if( !(a[i]!=-b[i]) )
-                    {
-                    std::cerr << file << "(" << line << "): BOOST_QVM_TEST_EQ" << expra << ',' << exprb
-                        << ") failed in function " << function <<'\n';
-                    dump_ab(a,b);
-                    ++::boost::detail::test_errors();
-                    return;
-                    }
-            }
-
-        template <class A,class B,class T>
-        void
-        test_close_impl( char const * expra, char const * /*exprb*/, char const * /*exprt*/, char const * file, int line, char const * function, A a, B b, T t )
-            {
-            if( !close_at_tolerance(a,b,t) )
-                {
-                std::cerr << file << "(" << line << "): BOOST_QVM_TEST_CLOSE(" << expra << ',' << b << ',' << t
-                    << ") failed in function " << function << '\n';
-                ++::boost::detail::test_errors();
-                return;
-                }
-            }
-
-        template <class A,class B,class T,int M,int N>
-        void
-        test_close_impl( char const * expra, char const * exprb, char const * exprt, char const * file, int line, char const * function, A (&a)[M][N], B (&b)[M][N], T t )
-            {
-            for( int i=0; i<M; ++i )
-                for( int j=0; j<N; ++j )
-                    if( !close_at_tolerance(a[i][j],b[i][j],t) )
-                        {
-                        std::cerr << file << "(" << line << "): BOOST_QVM_TEST_CLOSE(" << expra << ',' << exprb << ',' << exprt
-                            << ") failed in function " << function << '\n';
-                        dump_ab(a,b);
-                        ++::boost::detail::test_errors();
-                        return;
-                        }
-            }
-
-        template <class A,class B,class T,int D>
-        void
-        test_close_impl( char const * expra, char const * exprb, char const * exprt, char const * file, int line, char const * function, A (&a)[D], B (&b)[D], T t )
-            {
-            for( int i=0; i<D; ++i )
-                if( !close_at_tolerance(a[i],b[i],t) )
-                    {
-                    std::cerr << file << "(" << line << "): BOOST_QVM_TEST_CLOSE(" << expra << ',' << exprb << ',' << exprt
-                        << ") failed in function " << function << '\n';
-                    dump_ab(a,b);
-                    ++::boost::detail::test_errors();
-                    return;
-                    }
-            }
-
-        template <class A,class B,class T>
-        void
-        test_close_q_impl( char const * expra, char const * exprb, char const * exprt, char const * file, int line, char const * function, A (&a)[4], B (&b)[4], T t )
-            {
-            int i;
-            for( i=0; i<4; ++i )
-                if( !close_at_tolerance(a[i],b[i],t) )
-                    break;
-            if( i==4 )
-                return;
-            for( i=0; i<4; ++i )
-                if( !close_at_tolerance(a[i],-b[i],t) )
-                    {
-                    std::cerr << file << "(" << line << "): BOOST_QVM_TEST_CLOSE_QUAT(" << expra << ',' << exprb << ',' << exprt
-                        << ") failed in function " << function << '\n';
-                    dump_ab(a,b);
-                    ++::boost::detail::test_errors();
-                    return;
-                    }
-            }
-        }
-    }
-
-#endif
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#ifndef UUID_06E5D36EB6C211DEA317E19C55D89593\r
+#define UUID_06E5D36EB6C211DEA317E19C55D89593\r
+\r
+#include <boost/test/floating_point_comparison.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+#include <iostream>\r
+\r
+#define BOOST_QVM_TEST_EQ(expra,exprb) ( ::test_qvm::detail::test_eq_impl(#expra, #exprb, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expra, exprb) )\r
+#define BOOST_QVM_TEST_NEQ(expra,exprb) ( ::test_qvm::detail::test_neq_impl(#expra, #exprb, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expra, exprb) )\r
+#define BOOST_QVM_TEST_CLOSE(expra,exprb,exprt) ( ::test_qvm::detail::test_close_impl(#expra, #exprb, #exprt, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expra, exprb, exprt) )\r
+\r
+#define BOOST_QVM_TEST_EQ_QUAT(expra,exprb) ( ::test_qvm::detail::test_eq_q_impl(#expra, #exprb, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expra, exprb) )\r
+#define BOOST_QVM_TEST_NEQ_QUAT(expra,exprb) ( ::test_qvm::detail::test_neq_q_impl(#expra, #exprb, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expra, exprb) )\r
+#define BOOST_QVM_TEST_CLOSE_QUAT(expra,exprb,exprt) ( ::test_qvm::detail::test_close_q_impl(#expra, #exprb, #exprt, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expra, exprb, exprt) )\r
+\r
+namespace\r
+test_qvm\r
+    {\r
+    namespace\r
+    detail\r
+        {\r
+        inline\r
+        bool\r
+        close_at_tolerance( float a, float b, float tolerance )\r
+            {\r
+            return boost::math::fpc::close_at_tolerance<float>(tolerance,boost::math::fpc::FPC_STRONG)(a,b);\r
+            }\r
+\r
+        inline\r
+        bool\r
+        close_at_tolerance( double a, double b, double tolerance )\r
+            {\r
+            return boost::math::fpc::close_at_tolerance<double>(tolerance,boost::math::fpc::FPC_STRONG)(a,b);\r
+            }\r
+\r
+        template <class A,class B>\r
+        void\r
+        dump_ab( A a, B b )\r
+            {\r
+            std::cerr << a << '\t' << b << std::endl;\r
+            }\r
+\r
+        template <class A,class B,int D>\r
+        void\r
+        dump_ab( A (&a)[D], B (&b)[D] )\r
+            {\r
+            for( int i=0; i!=D; ++i )\r
+                dump_ab(a[i],b[i]);\r
+            }\r
+\r
+        template <class A,class B>\r
+        void\r
+        test_eq_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A a, B b )\r
+            {\r
+            using namespace ::boost::qvm;\r
+            if( !(a==b) )\r
+                {\r
+                std::cerr << file << "(" << line << "): BOOST_QVM_TEST_EQ(" << expra << ',' << exprb\r
+                    << ") failed in function " << function << '\n';\r
+                dump_ab(a,b);\r
+                ++::boost::detail::test_errors();\r
+                }\r
+            }\r
+\r
+        template <class A,class B,int M,int N>\r
+        void\r
+        test_eq_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A (&a)[M][N], B (&b)[M][N] )\r
+            {\r
+            using namespace ::boost::qvm;\r
+            for( int i=0; i<M; ++i )\r
+                for( int j=0; j<N; ++j )\r
+                    if( !(a[i][j]==b[i][j]) )\r
+                        {\r
+                        std::cerr << file << "(" << line << "): BOOST_QVM_TEST_EQ(" << expra << ',' << exprb\r
+                            << ") failed in function " << function << '\n';\r
+                        dump_ab(a,b);\r
+                        ++::boost::detail::test_errors();\r
+                        return;\r
+                        }\r
+            }\r
+\r
+        template <class A,class B,int D>\r
+        void\r
+        test_eq_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A (&a)[D], B (&b)[D] )\r
+            {\r
+            using namespace ::boost::qvm;\r
+            for( int i=0; i<D; ++i )\r
+                if( !(a[i]==b[i]) )\r
+                    {\r
+                    std::cerr << file << "(" << line << "): BOOST_QVM_TEST_EQ" << expra << ',' << exprb\r
+                        << ") failed in function " << function <<'\n';\r
+                    dump_ab(a,b);\r
+                    ++::boost::detail::test_errors();\r
+                    return;\r
+                    }\r
+            }\r
+\r
+        template <class A,class B>\r
+        void\r
+        test_eq_q_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A (&a)[4], B (&b)[4] )\r
+            {\r
+            using namespace ::boost::qvm;\r
+            int i;\r
+            for( i=0; i<4; ++i )\r
+                if( !(a[i]==b[i]) )\r
+                    break;\r
+            if( i==4 )\r
+                return;\r
+            for( i=0; i<4; ++i )\r
+                if( !(a[i]==-b[i]) )\r
+                    {\r
+                    std::cerr << file << "(" << line << "): BOOST_QVM_TEST_EQ" << expra << ',' << exprb\r
+                        << ") failed in function " << function <<'\n';\r
+                    dump_ab(a,b);\r
+                    ++::boost::detail::test_errors();\r
+                    return;\r
+                    }\r
+            }\r
+\r
+        template <class A,class B>\r
+        void\r
+        test_neq_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A a, B b )\r
+            {\r
+            using namespace ::boost::qvm;\r
+            if( !(a!=b) )\r
+                {\r
+                std::cerr << file << "(" << line << "): BOOST_QVM_TEST_NEQ(" << expra << ',' << exprb\r
+                    << ") failed in function " << function << '\n';\r
+                dump_ab(a,b);\r
+                ++::boost::detail::test_errors();\r
+                }\r
+            }\r
+\r
+        template <class A,class B,int M,int N>\r
+        void\r
+        test_neq_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A (&a)[M][N], B (&b)[M][N] )\r
+            {\r
+            using namespace ::boost::qvm;\r
+            for( int i=0; i<M; ++i )\r
+                for( int j=0; j<N; ++j )\r
+                    if( a[i][j]!=b[i][j] )\r
+                        return;\r
+            std::cerr << file << "(" << line << "): BOOST_QVM_TEST_NEQ(" << expra << ',' << exprb\r
+                << ") failed in function " << function << '\n';\r
+            dump_ab(a,b);\r
+            ++::boost::detail::test_errors();\r
+            }\r
+\r
+        template <class A,class B,int D>\r
+        void\r
+        test_neq_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A (&a)[D], B (&b)[D] )\r
+            {\r
+            using namespace ::boost::qvm;\r
+            for( int i=0; i<D; ++i )\r
+                if( a[i]!=b[i] )\r
+                    return;\r
+            std::cerr << file << "(" << line << "): BOOST_QVM_TEST_NEQ(" << expra << ',' << exprb\r
+                << ") failed in function " << function << '\n';\r
+            dump_ab(a,b);\r
+            ++::boost::detail::test_errors();\r
+            }\r
+\r
+        template <class A,class B>\r
+        void\r
+        test_neq_q_impl( char const * expra, char const * exprb, char const * file, int line, char const * function, A (&a)[4], B (&b)[4] )\r
+            {\r
+            using namespace ::boost::qvm;\r
+            int i;\r
+            for( i=0; i<4; ++i )\r
+                if( !(a[i]!=b[i]) )\r
+                    break;\r
+            if( i==4 )\r
+                return;\r
+            for( i=0; i<4; ++i )\r
+                if( !(a[i]!=-b[i]) )\r
+                    {\r
+                    std::cerr << file << "(" << line << "): BOOST_QVM_TEST_EQ" << expra << ',' << exprb\r
+                        << ") failed in function " << function <<'\n';\r
+                    dump_ab(a,b);\r
+                    ++::boost::detail::test_errors();\r
+                    return;\r
+                    }\r
+            }\r
+\r
+        template <class A,class B,class T>\r
+        void\r
+        test_close_impl( char const * expra, char const * /*exprb*/, char const * /*exprt*/, char const * file, int line, char const * function, A a, B b, T t )\r
+            {\r
+            if( !close_at_tolerance(a,b,t) )\r
+                {\r
+                std::cerr << file << "(" << line << "): BOOST_QVM_TEST_CLOSE(" << expra << ',' << b << ',' << t\r
+                    << ") failed in function " << function << '\n';\r
+                ++::boost::detail::test_errors();\r
+                return;\r
+                }\r
+            }\r
+\r
+        template <class A,class B,class T,int M,int N>\r
+        void\r
+        test_close_impl( char const * expra, char const * exprb, char const * exprt, char const * file, int line, char const * function, A (&a)[M][N], B (&b)[M][N], T t )\r
+            {\r
+            for( int i=0; i<M; ++i )\r
+                for( int j=0; j<N; ++j )\r
+                    if( !close_at_tolerance(a[i][j],b[i][j],t) )\r
+                        {\r
+                        std::cerr << file << "(" << line << "): BOOST_QVM_TEST_CLOSE(" << expra << ',' << exprb << ',' << exprt\r
+                            << ") failed in function " << function << '\n';\r
+                        dump_ab(a,b);\r
+                        ++::boost::detail::test_errors();\r
+                        return;\r
+                        }\r
+            }\r
+\r
+        template <class A,class B,class T,int D>\r
+        void\r
+        test_close_impl( char const * expra, char const * exprb, char const * exprt, char const * file, int line, char const * function, A (&a)[D], B (&b)[D], T t )\r
+            {\r
+            for( int i=0; i<D; ++i )\r
+                if( !close_at_tolerance(a[i],b[i],t) )\r
+                    {\r
+                    std::cerr << file << "(" << line << "): BOOST_QVM_TEST_CLOSE(" << expra << ',' << exprb << ',' << exprt\r
+                        << ") failed in function " << function << '\n';\r
+                    dump_ab(a,b);\r
+                    ++::boost::detail::test_errors();\r
+                    return;\r
+                    }\r
+            }\r
+\r
+        template <class A,class B,class T>\r
+        void\r
+        test_close_q_impl( char const * expra, char const * exprb, char const * exprt, char const * file, int line, char const * function, A (&a)[4], B (&b)[4], T t )\r
+            {\r
+            int i;\r
+            for( i=0; i<4; ++i )\r
+                if( !close_at_tolerance(a[i],b[i],t) )\r
+                    break;\r
+            if( i==4 )\r
+                return;\r
+            for( i=0; i<4; ++i )\r
+                if( !close_at_tolerance(a[i],-b[i],t) )\r
+                    {\r
+                    std::cerr << file << "(" << line << "): BOOST_QVM_TEST_CLOSE_QUAT(" << expra << ',' << exprb << ',' << exprt\r
+                        << ") failed in function " << function << '\n';\r
+                    dump_ab(a,b);\r
+                    ++::boost::detail::test_errors();\r
+                    return;\r
+                    }\r
+            }\r
+        }\r
+    }\r
+\r
+#endif\r
index 17d8eb863ae857251da979ec0be4ba9ccf2889a4..dff40b2c58a33b56147a50108a29bb1090f07011 100644 (file)
@@ -1,67 +1,67 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/to_string.hpp>
-#include <boost/qvm/quat_operations.hpp>
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include "test_qvm_matrix.hpp"
-#include "test_qvm_quaternion.hpp"
-#include "test_qvm_vector.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols>
-    void
-    test_matrix( std::string const & gold )
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::matrix<M1,Rows,Cols,int> const x(42,1);
-        std::string s=to_string(x);
-        BOOST_TEST(s==gold);
-        }
-
-    template <int Dim>
-    void
-    test_vector( std::string const & gold )
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::vector<V1,Dim,int> const x(42,1);
-        std::string s=to_string(x);
-        BOOST_TEST(s==gold);
-        }
-
-    void
-    test_quaternion( std::string const & gold )
-        {
-        using namespace boost::qvm::sfinae;
-        test_qvm::quaternion<Q1,int> const x(42,1);
-        std::string s=to_string(x);
-        BOOST_TEST(s==gold);
-        }
-    }
-
-int
-main()
-    {
-    test_matrix<1,2>("((42,43))");
-    test_matrix<2,1>("((42)(43))");
-    test_matrix<2,2>("((42,43)(44,45))");
-    test_matrix<1,3>("((42,43,44))");
-    test_matrix<3,1>("((42)(43)(44))");
-    test_matrix<3,3>("((42,43,44)(45,46,47)(48,49,50))");
-    test_matrix<1,4>("((42,43,44,45))");
-    test_matrix<4,1>("((42)(43)(44)(45))");
-    test_matrix<4,4>("((42,43,44,45)(46,47,48,49)(50,51,52,53)(54,55,56,57))");
-    test_matrix<1,5>("((42,43,44,45,46))");
-    test_matrix<5,1>("((42)(43)(44)(45)(46))");
-    test_matrix<5,5>("((42,43,44,45,46)(47,48,49,50,51)(52,53,54,55,56)(57,58,59,60,61)(62,63,64,65,66))");
-    test_vector<2>("(42,43)");
-    test_vector<3>("(42,43,44)");
-    test_vector<4>("(42,43,44,45)");
-    test_vector<5>("(42,43,44,45,46)");
-    test_quaternion("(42,43,44,45)");
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/to_string.hpp>\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "test_qvm_quaternion.hpp"\r
+#include "test_qvm_vector.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols>\r
+    void\r
+    test_matrix( std::string const & gold )\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::matrix<M1,Rows,Cols,int> const x(42,1);\r
+        std::string s=to_string(x);\r
+        BOOST_TEST(s==gold);\r
+        }\r
+\r
+    template <int Dim>\r
+    void\r
+    test_vector( std::string const & gold )\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::vector<V1,Dim,int> const x(42,1);\r
+        std::string s=to_string(x);\r
+        BOOST_TEST(s==gold);\r
+        }\r
+\r
+    void\r
+    test_quaternion( std::string const & gold )\r
+        {\r
+        using namespace boost::qvm::sfinae;\r
+        test_qvm::quaternion<Q1,int> const x(42,1);\r
+        std::string s=to_string(x);\r
+        BOOST_TEST(s==gold);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test_matrix<1,2>("((42,43))");\r
+    test_matrix<2,1>("((42)(43))");\r
+    test_matrix<2,2>("((42,43)(44,45))");\r
+    test_matrix<1,3>("((42,43,44))");\r
+    test_matrix<3,1>("((42)(43)(44))");\r
+    test_matrix<3,3>("((42,43,44)(45,46,47)(48,49,50))");\r
+    test_matrix<1,4>("((42,43,44,45))");\r
+    test_matrix<4,1>("((42)(43)(44)(45))");\r
+    test_matrix<4,4>("((42,43,44,45)(46,47,48,49)(50,51,52,53)(54,55,56,57))");\r
+    test_matrix<1,5>("((42,43,44,45,46))");\r
+    test_matrix<5,1>("((42)(43)(44)(45)(46))");\r
+    test_matrix<5,5>("((42,43,44,45,46)(47,48,49,50,51)(52,53,54,55,56)(57,58,59,60,61)(62,63,64,65,66))");\r
+    test_vector<2>("(42,43)");\r
+    test_vector<3>("(42,43,44)");\r
+    test_vector<4>("(42,43,44,45)");\r
+    test_vector<5>("(42,43,44,45,46)");\r
+    test_quaternion("(42,43,44,45)");\r
+    return boost::report_errors();\r
+    }\r
index 6fed948f7ac1cf34343c3a7b9b71ead378a574ac..654651d01092013f22a8b16d41151ec629fab0b5 100644 (file)
@@ -1,43 +1,43 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include <boost/qvm/vec_mat_operations.hpp>
-#include <boost/qvm/vec_access.hpp>
-#include <boost/qvm/map_mat_mat.hpp>
-#include <boost/qvm/map_mat_vec.hpp>
-#include <boost/qvm/swizzle.hpp>
-#include "test_qvm_matrix.hpp"
-#include "test_qvm_vector.hpp"
-#include "test_qvm.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,4,4> m=rot_mat<4>(test_qvm::vector<V1,3>(1,0),1.0f);
-        X(col<3>(m)) = 42;
-        Y(col<3>(m)) = 42;
-        Z(col<3>(m)) = 42;
-        test_qvm::vector<V1,3> v(42,1);
-        test_qvm::vector<V1,3> mv=transform_vector(m,v);
-        test_qvm::vector<V1,3> mp=transform_point(m,v);
-        test_qvm::vector<V1,3> v3=del_row_col<3,3>(m) * v;
-        test_qvm::vector<V1,3> v4=XYZ(m*XYZ1(v));
-        BOOST_QVM_TEST_EQ(mv.a,v3.a);
-        BOOST_QVM_TEST_EQ(mp.a,v4.a);
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include <boost/qvm/vec_mat_operations.hpp>\r
+#include <boost/qvm/vec_access.hpp>\r
+#include <boost/qvm/map_mat_mat.hpp>\r
+#include <boost/qvm/map_mat_vec.hpp>\r
+#include <boost/qvm/swizzle.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "test_qvm_vector.hpp"\r
+#include "test_qvm.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,4,4> m=rot_mat<4>(test_qvm::vector<V1,3>(1,0),1.0f);\r
+        X(col<3>(m)) = 42;\r
+        Y(col<3>(m)) = 42;\r
+        Z(col<3>(m)) = 42;\r
+        test_qvm::vector<V1,3> v(42,1);\r
+        test_qvm::vector<V1,3> mv=transform_vector(m,v);\r
+        test_qvm::vector<V1,3> mp=transform_point(m,v);\r
+        test_qvm::vector<V1,3> v3=del_row_col<3,3>(m) * v;\r
+        test_qvm::vector<V1,3> v4=XYZ(m*XYZ1(v));\r
+        BOOST_QVM_TEST_EQ(mv.a,v3.a);\r
+        BOOST_QVM_TEST_EQ(mp.a,v4.a);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index 7706f5c16e0d24a54e95d3b24ddd3aa7d3ac732e..824f6ed5ed82e2bda5b501d51240c664a8553473 100644 (file)
@@ -1,42 +1,42 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::vector<V1,Dim-1> x(42,1);
-        float r1[Dim][Dim];
-        test_qvm::translation(r1,x.a);
-        float r2[Dim][Dim];
-        assign(r2,translation_mat(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        test_qvm::scalar_multiply_v(x.b,x.a,2.0f);
-        col<Dim-1>(del_row<Dim-1>(translation_mat(x))) *= 2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        translation_mat(x) + translation_mat(x);
-        -translation_mat(x);
-        }
-    }
-
-int
-main()
-    {
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::vector<V1,Dim-1> x(42,1);\r
+        float r1[Dim][Dim];\r
+        test_qvm::translation(r1,x.a);\r
+        float r2[Dim][Dim];\r
+        assign(r2,translation_mat(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        test_qvm::scalar_multiply_v(x.b,x.a,2.0f);\r
+        col<Dim-1>(del_row<Dim-1>(translation_mat(x))) *= 2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        translation_mat(x) + translation_mat(x);\r
+        -translation_mat(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index be4d3c81c377ae3f64ff7673e37332d361c2d2c1..008eb99886199ef6226d860f091dd2f861acee37 100644 (file)
@@ -1,41 +1,41 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include <boost/qvm/map_mat_vec.hpp>
-#include "test_qvm_matrix.hpp"
-#include "test_qvm_vector.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int D>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,D,D> x(42,1);
-        test_qvm::vector<V1,D-1> y=translation(x);
-        for( int i=0; i!=D-1; ++i )
-            y.b[i]=x.a[i][D-1];
-        BOOST_QVM_TEST_EQ(y.a,y.b);
-        translation(x) *= 2;
-        for( int i=0; i!=D-1; ++i )
-            x.b[i][D-1] *= 2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        translation(x) + translation(x);
-        -translation(x);
-        }
-    }
-
-int
-main()
-    {
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include <boost/qvm/map_mat_vec.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "test_qvm_vector.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int D>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,D,D> x(42,1);\r
+        test_qvm::vector<V1,D-1> y=translation(x);\r
+        for( int i=0; i!=D-1; ++i )\r
+            y.b[i]=x.a[i][D-1];\r
+        BOOST_QVM_TEST_EQ(y.a,y.b);\r
+        translation(x) *= 2;\r
+        for( int i=0; i!=D-1; ++i )\r
+            x.b[i][D-1] *= 2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        translation(x) + translation(x);\r
+        -translation(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 3fffa36f96ed96701f7f7ec71919595ac912eebc..5ed5476534fbad758ff5e725d9a7f2afe94e051a 100644 (file)
@@ -1,52 +1,52 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/map_mat_mat.hpp>
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat_traits_array.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_matrix.hpp"
-#include "gold.hpp"
-
-namespace
-    {
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Rows,Cols> x(42,1);
-        float r1[Cols][Rows];
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols; ++j )
-                r1[j][i]=x.a[i][j];
-        float r2[Cols][Rows];
-        assign(r2,transposed(x));
-        BOOST_QVM_TEST_EQ(r1,r2);
-        test_qvm::scalar_multiply_m(x.b,x.a,2.0f);
-        transposed(x) *= 2;
-        BOOST_QVM_TEST_EQ(x.a,x.b);
-        transposed(x) + transposed(x);
-        -transposed(x);
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/map_mat_mat.hpp>\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat_traits_array.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+#include "gold.hpp"\r
+\r
+namespace\r
+    {\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Rows,Cols> x(42,1);\r
+        float r1[Cols][Rows];\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                r1[j][i]=x.a[i][j];\r
+        float r2[Cols][Rows];\r
+        assign(r2,transposed(x));\r
+        BOOST_QVM_TEST_EQ(r1,r2);\r
+        test_qvm::scalar_multiply_m(x.b,x.a,2.0f);\r
+        transposed(x) *= 2;\r
+        BOOST_QVM_TEST_EQ(x.a,x.b);\r
+        transposed(x) + transposed(x);\r
+        -transposed(x);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    return boost::report_errors();\r
+    }\r
index f5b61c852429d54156d2244c16a098b9e7e97c68..882bc5e76c6d294741b2f879379f2190d1dfc08a 100644 (file)
@@ -1,83 +1,83 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_traits_array.hpp>
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-template <class T,class U>
-struct same_type;
-
-template <class T>
-struct
-same_type<T,T>
-    {
-    };
-
-template <class T,class P>
-void
-test_ref_cast( T & v, P * ptr )
-    {
-    using namespace boost::qvm;
-    BOOST_QVM_STATIC_ASSERT(is_vec<T>::value);
-    BOOST_QVM_STATIC_ASSERT(vec_traits<T>::dim==3);
-    BOOST_TEST(vec_traits<T>::template read_element<0>(v)==ptr[0]);
-    BOOST_TEST(vec_traits<T>::template read_element<1>(v)==ptr[1]);
-    BOOST_TEST(vec_traits<T>::template read_element<2>(v)==ptr[2]);
-    BOOST_TEST(&vec_traits<T>::template write_element<0>(v)==&ptr[0]);
-    BOOST_TEST(&vec_traits<T>::template write_element<1>(v)==&ptr[1]);
-    BOOST_TEST(&vec_traits<T>::template write_element<2>(v)==&ptr[2]);
-    BOOST_TEST(&v[0]==&ptr[0]);
-    BOOST_TEST(&v[1]==&ptr[1]);
-    BOOST_TEST(&v[2]==&ptr[2]);
-    }
-
-int
-main()
-    {
-    using namespace boost::qvm;
-        {
-        BOOST_QVM_STATIC_ASSERT(is_vec<int[3]>::value);
-        BOOST_QVM_STATIC_ASSERT(!is_vec<int[3][3]>::value);
-        BOOST_QVM_STATIC_ASSERT(!is_vec<int[3][3][3]>::value);
-        BOOST_QVM_STATIC_ASSERT((vec_traits<int[3]>::dim==3));
-        same_type<vec_traits<int[3]>::scalar_type,int>();
-        same_type< vec<int,3>, deduce_vec<int[3]>::type >();
-        same_type< vec<int,3>, deduce_vec<int const[3]>::type >();
-        int arr[3] = {0,1,2};
-        BOOST_TEST((vec_traits<int[3]>::read_element<0>(arr)==0));
-        BOOST_TEST((vec_traits<int[3]>::read_element<1>(arr)==1));
-        BOOST_TEST((vec_traits<int[3]>::read_element<2>(arr)==2));
-        BOOST_TEST((vec_traits<int const[3]>::read_element<0>(arr)==0));
-        BOOST_TEST((vec_traits<int const[3]>::read_element<1>(arr)==1));
-        BOOST_TEST((vec_traits<int const[3]>::read_element<2>(arr)==2));
-        BOOST_TEST((vec_traits<int[3]>::read_element_idx(0,arr)==0));
-        BOOST_TEST((vec_traits<int[3]>::read_element_idx(1,arr)==1));
-        BOOST_TEST((vec_traits<int[3]>::read_element_idx(2,arr)==2));
-        BOOST_TEST((vec_traits<int const[3]>::read_element_idx(0,arr)==0));
-        BOOST_TEST((vec_traits<int const[3]>::read_element_idx(1,arr)==1));
-        BOOST_TEST((vec_traits<int const[3]>::read_element_idx(2,arr)==2));
-        BOOST_TEST((&vec_traits<int[3]>::write_element<0>(arr)==&arr[0]));
-        BOOST_TEST((&vec_traits<int[3]>::write_element<1>(arr)==&arr[1]));
-        BOOST_TEST((&vec_traits<int[3]>::write_element<2>(arr)==&arr[2]));
-        BOOST_TEST((&vec_traits<int[3]>::write_element_idx(0,arr)==&arr[0]));
-        BOOST_TEST((&vec_traits<int[3]>::write_element_idx(1,arr)==&arr[1]));
-        BOOST_TEST((&vec_traits<int[3]>::write_element_idx(2,arr)==&arr[2]));
-        }
-        {
-        int arr[42] = {0};
-        int * ptr=arr+5;
-        ptr[0]=42;
-        ptr[1]=43;
-        ptr[2]=44;
-        test_ref_cast(ptr_vref<3>(ptr),ptr);
-        int v[3] = {1,1,1};
-        ptr_vref<3>(ptr) += vref(v);
-        BOOST_TEST(ptr[0]==43);
-        BOOST_TEST(ptr[1]==44);
-        BOOST_TEST(ptr[2]==45);
-        }
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_traits_array.hpp>\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/detail/lightweight_test.hpp>\r
+\r
+template <class T,class U>\r
+struct same_type;\r
+\r
+template <class T>\r
+struct\r
+same_type<T,T>\r
+    {\r
+    };\r
+\r
+template <class T,class P>\r
+void\r
+test_ref_cast( T & v, P * ptr )\r
+    {\r
+    using namespace boost::qvm;\r
+    BOOST_QVM_STATIC_ASSERT(is_vec<T>::value);\r
+    BOOST_QVM_STATIC_ASSERT(vec_traits<T>::dim==3);\r
+    BOOST_TEST(vec_traits<T>::template read_element<0>(v)==ptr[0]);\r
+    BOOST_TEST(vec_traits<T>::template read_element<1>(v)==ptr[1]);\r
+    BOOST_TEST(vec_traits<T>::template read_element<2>(v)==ptr[2]);\r
+    BOOST_TEST(&vec_traits<T>::template write_element<0>(v)==&ptr[0]);\r
+    BOOST_TEST(&vec_traits<T>::template write_element<1>(v)==&ptr[1]);\r
+    BOOST_TEST(&vec_traits<T>::template write_element<2>(v)==&ptr[2]);\r
+    BOOST_TEST(&v[0]==&ptr[0]);\r
+    BOOST_TEST(&v[1]==&ptr[1]);\r
+    BOOST_TEST(&v[2]==&ptr[2]);\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    using namespace boost::qvm;\r
+        {\r
+        BOOST_QVM_STATIC_ASSERT(is_vec<int[3]>::value);\r
+        BOOST_QVM_STATIC_ASSERT(!is_vec<int[3][3]>::value);\r
+        BOOST_QVM_STATIC_ASSERT(!is_vec<int[3][3][3]>::value);\r
+        BOOST_QVM_STATIC_ASSERT((vec_traits<int[3]>::dim==3));\r
+        same_type<vec_traits<int[3]>::scalar_type,int>();\r
+        same_type< vec<int,3>, deduce_vec<int[3]>::type >();\r
+        same_type< vec<int,3>, deduce_vec<int const[3]>::type >();\r
+        int arr[3] = {0,1,2};\r
+        BOOST_TEST((vec_traits<int[3]>::read_element<0>(arr)==0));\r
+        BOOST_TEST((vec_traits<int[3]>::read_element<1>(arr)==1));\r
+        BOOST_TEST((vec_traits<int[3]>::read_element<2>(arr)==2));\r
+        BOOST_TEST((vec_traits<int const[3]>::read_element<0>(arr)==0));\r
+        BOOST_TEST((vec_traits<int const[3]>::read_element<1>(arr)==1));\r
+        BOOST_TEST((vec_traits<int const[3]>::read_element<2>(arr)==2));\r
+        BOOST_TEST((vec_traits<int[3]>::read_element_idx(0,arr)==0));\r
+        BOOST_TEST((vec_traits<int[3]>::read_element_idx(1,arr)==1));\r
+        BOOST_TEST((vec_traits<int[3]>::read_element_idx(2,arr)==2));\r
+        BOOST_TEST((vec_traits<int const[3]>::read_element_idx(0,arr)==0));\r
+        BOOST_TEST((vec_traits<int const[3]>::read_element_idx(1,arr)==1));\r
+        BOOST_TEST((vec_traits<int const[3]>::read_element_idx(2,arr)==2));\r
+        BOOST_TEST((&vec_traits<int[3]>::write_element<0>(arr)==&arr[0]));\r
+        BOOST_TEST((&vec_traits<int[3]>::write_element<1>(arr)==&arr[1]));\r
+        BOOST_TEST((&vec_traits<int[3]>::write_element<2>(arr)==&arr[2]));\r
+        BOOST_TEST((&vec_traits<int[3]>::write_element_idx(0,arr)==&arr[0]));\r
+        BOOST_TEST((&vec_traits<int[3]>::write_element_idx(1,arr)==&arr[1]));\r
+        BOOST_TEST((&vec_traits<int[3]>::write_element_idx(2,arr)==&arr[2]));\r
+        }\r
+        {\r
+        int arr[42] = {0};\r
+        int * ptr=arr+5;\r
+        ptr[0]=42;\r
+        ptr[1]=43;\r
+        ptr[2]=44;\r
+        test_ref_cast(ptr_vref<3>(ptr),ptr);\r
+        int v[3] = {1,1,1};\r
+        ptr_vref<3>(ptr) += vref(v);\r
+        BOOST_TEST(ptr[0]==43);\r
+        BOOST_TEST(ptr[1]==44);\r
+        BOOST_TEST(ptr[2]==45);\r
+        }\r
+    return boost::report_errors();\r
+    }\r
index 363899dbc6c2b1daea878465095315646a21eef0..90d2217834c20c540481e4fa94cd19cd2b9e1c7a 100644 (file)
@@ -1,78 +1,78 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/mat_operations.hpp>
-#include <boost/qvm/mat.hpp>
-#include "test_qvm_matrix.hpp"
-
-namespace
-    {
-    template <class T,class U>
-    struct same_type;
-
-    template <class T>
-    struct
-    same_type<T,T>
-        {
-        };
-
-    template <class T,class U>
-    void
-    check_deduction( T const &, U const & )
-        {
-        same_type<T,typename boost::qvm::deduce_mat<U>::type>();
-        }
-
-    template <int Rows,int Cols>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Rows,Cols> m1=zero_mat<float,Rows,Cols>();
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols; ++j )
-                BOOST_TEST(!m1.a[i][j]);
-        test_qvm::matrix<M2,Rows,Cols> m2(42,1);
-        set_zero(m2);
-        for( int i=0; i!=Rows; ++i )
-            for( int j=0; j!=Cols; ++j )
-                BOOST_TEST(!m2.a[i][j]);
-        check_deduction(mat<float,Rows,Cols>(),zero_mat<float,Rows,Cols>());
-        check_deduction(mat<int,Rows,Cols>(),zero_mat<int,Rows,Cols>());
-        }
-
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::matrix<M1,Dim,Dim> m1=zero_mat<float,Dim>();
-        for( int i=0; i!=Dim; ++i )
-            for( int j=0; j!=Dim; ++j )
-                BOOST_TEST(!m1.a[i][j]);
-        }
-    }
-
-int
-main()
-    {
-    test<1,2>();
-    test<2,1>();
-    test<2,2>();
-    test<1,3>();
-    test<3,1>();
-    test<3,3>();
-    test<1,4>();
-    test<4,1>();
-    test<4,4>();
-    test<1,5>();
-    test<5,1>();
-    test<5,5>();
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/mat_operations.hpp>\r
+#include <boost/qvm/mat.hpp>\r
+#include "test_qvm_matrix.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U>\r
+    struct same_type;\r
+\r
+    template <class T>\r
+    struct\r
+    same_type<T,T>\r
+        {\r
+        };\r
+\r
+    template <class T,class U>\r
+    void\r
+    check_deduction( T const &, U const & )\r
+        {\r
+        same_type<T,typename boost::qvm::deduce_mat<U>::type>();\r
+        }\r
+\r
+    template <int Rows,int Cols>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Rows,Cols> m1=zero_mat<float,Rows,Cols>();\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                BOOST_TEST(!m1.a[i][j]);\r
+        test_qvm::matrix<M2,Rows,Cols> m2(42,1);\r
+        set_zero(m2);\r
+        for( int i=0; i!=Rows; ++i )\r
+            for( int j=0; j!=Cols; ++j )\r
+                BOOST_TEST(!m2.a[i][j]);\r
+        check_deduction(mat<float,Rows,Cols>(),zero_mat<float,Rows,Cols>());\r
+        check_deduction(mat<int,Rows,Cols>(),zero_mat<int,Rows,Cols>());\r
+        }\r
+\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::matrix<M1,Dim,Dim> m1=zero_mat<float,Dim>();\r
+        for( int i=0; i!=Dim; ++i )\r
+            for( int j=0; j!=Dim; ++j )\r
+                BOOST_TEST(!m1.a[i][j]);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<1,2>();\r
+    test<2,1>();\r
+    test<2,2>();\r
+    test<1,3>();\r
+    test<3,1>();\r
+    test<3,3>();\r
+    test<1,4>();\r
+    test<4,1>();\r
+    test<4,4>();\r
+    test<1,5>();\r
+    test<5,1>();\r
+    test<5,5>();\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index 4ee8b67b75ff96ee5d4d4d811d02d2e51f4b3a81..353ed689ed94b386283da1257a24ac97aa71564b 100644 (file)
@@ -1,30 +1,30 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/quat_operations.hpp>
-#include "test_qvm_quaternion.hpp"
-
-namespace
-    {
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::quaternion<Q1> v1=zero_quat<float>();
-        for( int i=0; i!=4; ++i )
-                BOOST_TEST(!v1.a[i]);
-        test_qvm::quaternion<Q2> v2(42,1);
-        set_zero(v2);
-        for( int i=0; i!=4; ++i )
-                BOOST_TEST(!v2.a[i]);
-        }
-    }
-
-int
-main()
-    {
-    test();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/quat_operations.hpp>\r
+#include "test_qvm_quaternion.hpp"\r
+\r
+namespace\r
+    {\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::quaternion<Q1> v1=zero_quat<float>();\r
+        for( int i=0; i!=4; ++i )\r
+                BOOST_TEST(!v1.a[i]);\r
+        test_qvm::quaternion<Q2> v2(42,1);\r
+        set_zero(v2);\r
+        for( int i=0; i!=4; ++i )\r
+                BOOST_TEST(!v2.a[i]);\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test();\r
+    return boost::report_errors();\r
+    }\r
index d742c9aa0c9faba7679be6e68750f931ee659186..010a1d22a19d4256f89a46a6ecbf2e1f5e3bf69c 100644 (file)
@@ -1,53 +1,53 @@
-//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/qvm/vec_operations.hpp>
-#include <boost/qvm/vec.hpp>
-#include "test_qvm_vector.hpp"
-
-namespace
-    {
-    template <class T,class U>
-    struct same_type;
-
-    template <class T>
-    struct
-    same_type<T,T>
-        {
-        };
-
-    template <class T,class U>
-    void
-    check_deduction( T const &, U const & )
-        {
-        same_type<T,typename boost::qvm::deduce_vec<U>::type>();
-        }
-
-    template <int Dim>
-    void
-    test()
-        {
-        using namespace boost::qvm;
-        test_qvm::vector<V1,Dim> v1=zero_vec<float,Dim>();
-        for( int i=0; i!=Dim; ++i )
-                BOOST_TEST(!v1.a[i]);
-        test_qvm::vector<V2,Dim> v2(42,1);
-        set_zero(v2);
-        for( int i=0; i!=Dim; ++i )
-                BOOST_TEST(!v2.a[i]);
-        check_deduction(vec<float,Dim>(),zero_vec<float,Dim>());
-        check_deduction(vec<int,Dim>(),zero_vec<int,Dim>());
-        }
-    }
-
-int
-main()
-    {
-    test<2>();
-    test<3>();
-    test<4>();
-    test<5>();
-    return boost::report_errors();
-    }
+//Copyright (c) 2008-2016 Emil Dotchevski and Reverge Studios, Inc.\r
+\r
+//Distributed under the Boost Software License, Version 1.0. (See accompanying\r
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+#include <boost/qvm/vec_operations.hpp>\r
+#include <boost/qvm/vec.hpp>\r
+#include "test_qvm_vector.hpp"\r
+\r
+namespace\r
+    {\r
+    template <class T,class U>\r
+    struct same_type;\r
+\r
+    template <class T>\r
+    struct\r
+    same_type<T,T>\r
+        {\r
+        };\r
+\r
+    template <class T,class U>\r
+    void\r
+    check_deduction( T const &, U const & )\r
+        {\r
+        same_type<T,typename boost::qvm::deduce_vec<U>::type>();\r
+        }\r
+\r
+    template <int Dim>\r
+    void\r
+    test()\r
+        {\r
+        using namespace boost::qvm;\r
+        test_qvm::vector<V1,Dim> v1=zero_vec<float,Dim>();\r
+        for( int i=0; i!=Dim; ++i )\r
+                BOOST_TEST(!v1.a[i]);\r
+        test_qvm::vector<V2,Dim> v2(42,1);\r
+        set_zero(v2);\r
+        for( int i=0; i!=Dim; ++i )\r
+                BOOST_TEST(!v2.a[i]);\r
+        check_deduction(vec<float,Dim>(),zero_vec<float,Dim>());\r
+        check_deduction(vec<int,Dim>(),zero_vec<int,Dim>());\r
+        }\r
+    }\r
+\r
+int\r
+main()\r
+    {\r
+    test<2>();\r
+    test<3>();\r
+    test<4>();\r
+    test<5>();\r
+    return boost::report_errors();\r
+    }\r
index da650b3880bce7eabc3358cb063916d756dfaf23..9e5d38fc0d38ee29648878cf484bd4adc2ff1118 100644 (file)
@@ -1,42 +1,42 @@
-#  Copyright Steven Ross 2009.
-#
-# Distributed under the Boost Software License, Version 1.0.
-#    (See accompanying file LICENSE_1_0.txt or copy at
-#          http://www.boost.org/LICENSE_1_0.txt)
-#  See http://www.boost.org/libs/sort for library home page.
-
-local properties = ;
-if --tune in [ modules.peek : ARGV ]
-{
-    properties = <location>. <variant>release ;
-}
-
-project spreadsort : source-location example : requirements <include>../.. <include>../../.. $(properties) ;
-
-exe spreadsort : sample.cpp ;
-exe alreadysorted : alreadysorted.cpp ;
-exe mostlysorted : mostlysorted.cpp ;
-exe rightshift : rightshiftsample.cpp ;
-exe reverseintsort : reverseintsample.cpp ;
-exe int64 : int64.cpp ;
-exe floatsort : floatsample.cpp ;
-exe shiftfloatsort : shiftfloatsample.cpp ;
-exe floatfunctorsort : floatfunctorsample.cpp ;
-exe double : double.cpp ;
-exe stringsort : stringsample.cpp ;
-exe wstringsort : wstringsample.cpp ;
-exe reversestringsort : reversestringsample.cpp ;
-exe charstringsort : charstringsample.cpp ;
-exe stringfunctorsort : stringfunctorsample.cpp ;
-exe reversestringfunctorsort : reversestringfunctorsample.cpp ;
-exe keyplusdata : keyplusdatasample.cpp ;
-exe randomgen : randomgen.cpp ;
-exe boostrandomgen : boostrandomgen.cpp ;
-exe alrbreaker : alrbreaker.cpp ;
-exe binaryalrbreaker : binaryalrbreaker.cpp ;
-exe caseinsensitive : caseinsensitive.cpp ;
-exe generalizedstruct : generalizedstruct.cpp ;
-
-# benchmarks need to be built with linkflags="-lboost_system -lboost_thread"
-#exe parallelint : parallelint.cpp boost_system ;
+#  Copyright Steven Ross 2009.\r
+#\r
+# Distributed under the Boost Software License, Version 1.0.\r
+#    (See accompanying file LICENSE_1_0.txt or copy at\r
+#          http://www.boost.org/LICENSE_1_0.txt)\r
+#  See http://www.boost.org/libs/sort for library home page.\r
+\r
+local properties = ;\r
+if --tune in [ modules.peek : ARGV ]\r
+{\r
+    properties = <location>. <variant>release ;\r
+}\r
+\r
+project spreadsort : source-location example : requirements <include>../.. <include>../../.. $(properties) ;\r
+\r
+exe spreadsort : sample.cpp ;\r
+exe alreadysorted : alreadysorted.cpp ;\r
+exe mostlysorted : mostlysorted.cpp ;\r
+exe rightshift : rightshiftsample.cpp ;\r
+exe reverseintsort : reverseintsample.cpp ;\r
+exe int64 : int64.cpp ;\r
+exe floatsort : floatsample.cpp ;\r
+exe shiftfloatsort : shiftfloatsample.cpp ;\r
+exe floatfunctorsort : floatfunctorsample.cpp ;\r
+exe double : double.cpp ;\r
+exe stringsort : stringsample.cpp ;\r
+exe wstringsort : wstringsample.cpp ;\r
+exe reversestringsort : reversestringsample.cpp ;\r
+exe charstringsort : charstringsample.cpp ;\r
+exe stringfunctorsort : stringfunctorsample.cpp ;\r
+exe reversestringfunctorsort : reversestringfunctorsample.cpp ;\r
+exe keyplusdata : keyplusdatasample.cpp ;\r
+exe randomgen : randomgen.cpp ;\r
+exe boostrandomgen : boostrandomgen.cpp ;\r
+exe alrbreaker : alrbreaker.cpp ;\r
+exe binaryalrbreaker : binaryalrbreaker.cpp ;\r
+exe caseinsensitive : caseinsensitive.cpp ;\r
+exe generalizedstruct : generalizedstruct.cpp ;\r
+\r
+# benchmarks need to be built with linkflags="-lboost_system -lboost_thread"\r
+#exe parallelint : parallelint.cpp boost_system ;\r
 #exe parallelstring : parallelstring.cpp ;
\ No newline at end of file
index 8d803673bcfdbbc1b27ba69f33a9254f3c0257ee..f3b39e8e16a0f6d5922b50cfc9f5269062eaad2d 100644 (file)
@@ -1,27 +1,27 @@
-sort
-====
-
-Boost Sort library that includes spreadsort, a hybrid radix sort that is faster than O(n*log(n))
-
-Replace "/" with "\" in paths below if you're using Windows.
-To install, download boost, run bootstrap, and copy this library into <your boost root>/libs/sort.  
-
-Run the unit tests from your boost root:
-./b2 libs/sort/test
-
-Then go to <your boost root>/libs/sort and run tune.pl:
-Then from the same directory verify correctness and speed on small data sets:
-perl tune.pl -small [-windows]
-(it needs the windows option to build for windows)
-This tests sorting on many different distributions and data types, making sure the results are identical to std::sort and showing a speed comparison that is a weighted average across multiple data distributions.
-If you're interested in more accurate speed comparisons, run the same command either without the -small option, or with the -large option instead.  This will take substantially longer.
-
-Documentation is available from the index.html in this same directory, including a description of the algorithm, how to use it, and why it's faster.
-
-Finally, if you have an unusual computing system, you may want to use the -tune option to tune.pl, to tune the constants used by the library for your specific system.  BEWARE that this will overwrite the default boost/sort/spreadsort/detail/constants.hpp provided by the library.  Making a copy first is a good idea.  Also note that it doesn't tune MAX_SPLITS, the most important parameter, because that should only be tuned with the -large option and it can overfit to the specific amount of data passed in.
-
-Feel free to contact spreadsort@gmail.com with any questions about this library.
-
-Copyright 2014-2015 Steven Ross
-Distributed under the Boost Software License, Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt)
-
+sort\r
+====\r
+\r
+Boost Sort library that includes spreadsort, a hybrid radix sort that is faster than O(n*log(n))\r
+\r
+Replace "/" with "\" in paths below if you're using Windows.\r
+To install, download boost, run bootstrap, and copy this library into <your boost root>/libs/sort.  \r
+\r
+Run the unit tests from your boost root:\r
+./b2 libs/sort/test\r
+\r
+Then go to <your boost root>/libs/sort and run tune.pl:\r
+Then from the same directory verify correctness and speed on small data sets:\r
+perl tune.pl -small [-windows]\r
+(it needs the windows option to build for windows)\r
+This tests sorting on many different distributions and data types, making sure the results are identical to std::sort and showing a speed comparison that is a weighted average across multiple data distributions.\r
+If you're interested in more accurate speed comparisons, run the same command either without the -small option, or with the -large option instead.  This will take substantially longer.\r
+\r
+Documentation is available from the index.html in this same directory, including a description of the algorithm, how to use it, and why it's faster.\r
+\r
+Finally, if you have an unusual computing system, you may want to use the -tune option to tune.pl, to tune the constants used by the library for your specific system.  BEWARE that this will overwrite the default boost/sort/spreadsort/detail/constants.hpp provided by the library.  Making a copy first is a good idea.  Also note that it doesn't tune MAX_SPLITS, the most important parameter, because that should only be tuned with the -large option and it can overfit to the specific amount of data passed in.\r
+\r
+Feel free to contact spreadsort@gmail.com with any questions about this library.\r
+\r
+Copyright 2014-2015 Steven Ross\r
+Distributed under the Boost Software License, Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt)\r
+\r
index b93fe89acd2df3bcb8e92eada1da46b391690983..ab766db9f114dee046c17d4088bbf15186044662 100644 (file)
@@ -1,78 +1,78 @@
-// a sorting example that uses the worst-case for conventional MSD radix sorts.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-using namespace boost::sort::spreadsort;
-using namespace std;
-
-#define DATA_TYPE boost::uint64_t
-
-#define ALR_THRESHOLD 3
-
-const unsigned max_count = ALR_THRESHOLD - 1;
-const unsigned bit_shift = detail::rough_log_2_size(max_count) -
-  detail::int_log_mean_bin_size;
-const unsigned radix_threshold = detail::rough_log_2_size(max_count) + 1;
-//Increase this size if too fast to test accurately
-const unsigned top_splits = 12;
-
-const DATA_TYPE typed_one = 1;
-
-void
-fill_vector(vector<DATA_TYPE> & input, const DATA_TYPE base_value,
-            unsigned remaining_bits)
-{
-  if (remaining_bits >= radix_threshold) {
-    input.push_back((base_value << remaining_bits) +
-                    ((typed_one << remaining_bits) - 1));
-    fill_vector(input, base_value << bit_shift, remaining_bits - bit_shift);
-  }
-  else {
-    for (unsigned u = 0; u < max_count; ++u)
-      input.push_back((base_value << remaining_bits) +
-                      (rand() % (1 << remaining_bits)));
-  }
-}
-
-//Tests spreadsort on the worst-case distribution for standard MSD radix sorts.
-int main(int, const char **) {
-  vector<DATA_TYPE> input;
-  for (int ii = (1 << top_splits) - 1; ii >= 0; --ii)
-    fill_vector(input, ii, (sizeof(DATA_TYPE) * 8) - top_splits);
-
-  //Run both std::sort and spreadsort
-  for (unsigned u = 0; u < 2; ++u) {
-    vector<DATA_TYPE> array = input;
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (u)
-      std::sort(array.begin(), array.end());
-    else
-      boost::sort::spreadsort::spreadsort(array.begin(), array.end());
-    end = clock();
-    elapsed = static_cast<double>(end - start);
-    if (u)
-      printf("std::sort elapsed time %f\n", elapsed / CLOCKS_PER_SEC);
-    else
-      printf("spreadsort elapsed time %f\n", elapsed / CLOCKS_PER_SEC);
-    array.clear();
-  }
-  return 0;
-}
+// a sorting example that uses the worst-case for conventional MSD radix sorts.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <sstream>\r
+#include <iostream>\r
+using namespace boost::sort::spreadsort;\r
+using namespace std;\r
+\r
+#define DATA_TYPE boost::uint64_t\r
+\r
+#define ALR_THRESHOLD 3\r
+\r
+const unsigned max_count = ALR_THRESHOLD - 1;\r
+const unsigned bit_shift = detail::rough_log_2_size(max_count) -\r
+  detail::int_log_mean_bin_size;\r
+const unsigned radix_threshold = detail::rough_log_2_size(max_count) + 1;\r
+//Increase this size if too fast to test accurately\r
+const unsigned top_splits = 12;\r
+\r
+const DATA_TYPE typed_one = 1;\r
+\r
+void\r
+fill_vector(vector<DATA_TYPE> & input, const DATA_TYPE base_value,\r
+            unsigned remaining_bits)\r
+{\r
+  if (remaining_bits >= radix_threshold) {\r
+    input.push_back((base_value << remaining_bits) +\r
+                    ((typed_one << remaining_bits) - 1));\r
+    fill_vector(input, base_value << bit_shift, remaining_bits - bit_shift);\r
+  }\r
+  else {\r
+    for (unsigned u = 0; u < max_count; ++u)\r
+      input.push_back((base_value << remaining_bits) +\r
+                      (rand() % (1 << remaining_bits)));\r
+  }\r
+}\r
+\r
+//Tests spreadsort on the worst-case distribution for standard MSD radix sorts.\r
+int main(int, const char **) {\r
+  vector<DATA_TYPE> input;\r
+  for (int ii = (1 << top_splits) - 1; ii >= 0; --ii)\r
+    fill_vector(input, ii, (sizeof(DATA_TYPE) * 8) - top_splits);\r
+\r
+  //Run both std::sort and spreadsort\r
+  for (unsigned u = 0; u < 2; ++u) {\r
+    vector<DATA_TYPE> array = input;\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (u)\r
+      std::sort(array.begin(), array.end());\r
+    else\r
+      boost::sort::spreadsort::spreadsort(array.begin(), array.end());\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start);\r
+    if (u)\r
+      printf("std::sort elapsed time %f\n", elapsed / CLOCKS_PER_SEC);\r
+    else\r
+      printf("spreadsort elapsed time %f\n", elapsed / CLOCKS_PER_SEC);\r
+    array.clear();\r
+  }\r
+  return 0;\r
+}\r
index 8f56d08251f5257a6ee5150c648511b72c42a953..f0c756726add7bd1b588122afafa75ebda601d31 100644 (file)
@@ -1,91 +1,91 @@
-// spreadsort fully sorted data example.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE int
-
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  size_t uCount,uSize=sizeof(DATA_TYPE);
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  //Sorts the data once, then times sorting of already-sorted data
-  loopCount += 1;
-  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);
-  if (input.fail()) {
-    printf("input.txt could not be opened\n");
-    return 1;
-  }
-  double total = 0.0;
-  std::vector<DATA_TYPE> array;
-  input.seekg (0, std::ios_base::end);
-    size_t length = input.tellg();
-  uCount = length/uSize;
-  input.seekg (0, std::ios_base::beg);
-  //Conversion to a vector
-  array.resize(uCount);
-  unsigned v = 0;
-  while (input.good() && v < uCount) // EOF or failure stops the reading
-    input.read(reinterpret_cast<char *>(&(array[v++])), uSize );
-  //Run multiple loops, if requested
-  for (unsigned u = 0; u < loopCount; ++u) {
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      //std::sort(&(array[0]), &(array[0]) + uCount);
-      std::sort(array.begin(), array.end());
-    else {
-      printf("call\n");
-      //integer_sort(&(array[0]), &(array[0]) + uCount);
-      integer_sort(array.begin(), array.end());
-    }
-    end = clock();
-    elapsed = static_cast<double>(end - start) ;
-    std::ofstream ofile;
-    if (stdSort)
-      ofile.open("standard_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    else
-      ofile.open("boost_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    if (ofile.good()) {
-      for (unsigned v = 0; v < array.size(); ++v) {
-        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );
-      }
-      ofile.close();
-    }
-    if (u)
-      total += elapsed;
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// spreadsort fully sorted data example.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <sstream>\r
+#include <iostream>\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE int\r
+\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  size_t uCount,uSize=sizeof(DATA_TYPE);\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  //Sorts the data once, then times sorting of already-sorted data\r
+  loopCount += 1;\r
+  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);\r
+  if (input.fail()) {\r
+    printf("input.txt could not be opened\n");\r
+    return 1;\r
+  }\r
+  double total = 0.0;\r
+  std::vector<DATA_TYPE> array;\r
+  input.seekg (0, std::ios_base::end);\r
+    size_t length = input.tellg();\r
+  uCount = length/uSize;\r
+  input.seekg (0, std::ios_base::beg);\r
+  //Conversion to a vector\r
+  array.resize(uCount);\r
+  unsigned v = 0;\r
+  while (input.good() && v < uCount) // EOF or failure stops the reading\r
+    input.read(reinterpret_cast<char *>(&(array[v++])), uSize );\r
+  //Run multiple loops, if requested\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      //std::sort(&(array[0]), &(array[0]) + uCount);\r
+      std::sort(array.begin(), array.end());\r
+    else {\r
+      printf("call\n");\r
+      //integer_sort(&(array[0]), &(array[0]) + uCount);\r
+      integer_sort(array.begin(), array.end());\r
+    }\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start) ;\r
+    std::ofstream ofile;\r
+    if (stdSort)\r
+      ofile.open("standard_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      ofile.open("boost_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    if (ofile.good()) {\r
+      for (unsigned v = 0; v < array.size(); ++v) {\r
+        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );\r
+      }\r
+      ofile.close();\r
+    }\r
+    if (u)\r
+      total += elapsed;\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index c5a163f790f23225ad5c1cf175ad74f132739b53..15ac54629aea2775baa9573c8d548d7e7a52fc6d 100644 (file)
-// a sorting example that uses the worst-case distribution for spreadsort.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-using namespace boost::sort::spreadsort;
-using namespace std;
-
-#define DATA_TYPE boost::uint64_t
-
-#define ALR_THRESHOLD 3
-
-const unsigned max_count = ALR_THRESHOLD - 1;
-const unsigned bit_shift = detail::rough_log_2_size(max_count) -
-  detail::int_log_mean_bin_size;
-const unsigned radix_threshold = detail::rough_log_2_size(max_count) + 1;
-
-const DATA_TYPE typed_one = 1;
-
-void
-fill_vector(vector<DATA_TYPE> & input, const DATA_TYPE base_value,
-            unsigned remaining_bits, const vector<unsigned> & indices,
-            int index)
-{
-  if (index < 0) {
-    for (unsigned u = 0; u < max_count; ++u)
-      input.push_back((base_value << remaining_bits) +
-                      (rand() % (1 << remaining_bits)));
-  }
-  else {
-    unsigned shift = indices[index];
-    fill_vector(input, (base_value << shift) + ((1 << shift) - 1),
-                remaining_bits - shift, indices, index - 1);
-    fill_vector(input, base_value << shift, remaining_bits - shift, indices,
-                index - 1);
-  }
-}
-
-//Generates a random index from 0 up to but not including count.
-unsigned
-get_index(unsigned count)
-{
-  unsigned result = unsigned((rand() % (1 << 16))*uint64_t(count)/(1 << 16));
-  if (result >= count)
-    return count - 1;
-  return result;
-}
-
-//Tests std::sort vs boost::sort::spreadsort on boost::sort's worst distribution.
-int main(int, const char **) {
-  unsigned total_length = sizeof(DATA_TYPE) * 8;
-  double std_sort_time = 0;
-  double spreadsort_time = 0;
-  for (int repetition = 0; repetition < 10; ++repetition) {
-    vector<DATA_TYPE> input;
-    vector<unsigned> offsets;
-    unsigned bit_length = total_length - radix_threshold;
-    unsigned bit_offset = bit_shift;
-    for (; bit_length >= ++bit_offset; bit_length -= bit_offset)
-      offsets.push_back(bit_offset);
-    for (int ii = (1 << bit_length) - 1; ii >= 0; --ii)
-      fill_vector(input, ii, total_length - bit_length,
-                  offsets, offsets.size() - 1);
-
-    //Randomize the inputs slightly so they aren't in reverse-sorted order, for
-    //which std::sort is very fast.
-    for (unsigned u = 0; u < input.size() / 10; ++u)
-      std::swap(input[get_index(input.size())], input[get_index(input.size())]);
-
-    //Run both std::sort and boost::sort::spreadsort.
-    for (unsigned u = 0; u < 2; ++u) {
-      vector<DATA_TYPE> array = input;
-      clock_t start, end;
-      double elapsed;
-      start = clock();
-      if (u)
-        std::sort(array.begin(), array.end());
-      else
-        boost::sort::spreadsort::spreadsort(array.begin(), array.end());
-      end = clock();
-      elapsed = static_cast<double>(end - start);
-      if (u)
-        std_sort_time += elapsed / CLOCKS_PER_SEC;
-      else
-        spreadsort_time += elapsed / CLOCKS_PER_SEC;
-      array.clear();
-    }
-  }
-
-  printf("std::sort elapsed time %f\n", std_sort_time);
-  printf("spreadsort elapsed time %f\n", spreadsort_time);
-  return 0;
-}
+// a sorting example that uses the worst-case distribution for spreadsort.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <sstream>\r
+#include <iostream>\r
+using namespace boost::sort::spreadsort;\r
+using namespace std;\r
+\r
+#define DATA_TYPE boost::uint64_t\r
+\r
+#define ALR_THRESHOLD 3\r
+\r
+const unsigned max_count = ALR_THRESHOLD - 1;\r
+const unsigned bit_shift = detail::rough_log_2_size(max_count) -\r
+  detail::int_log_mean_bin_size;\r
+const unsigned radix_threshold = detail::rough_log_2_size(max_count) + 1;\r
+\r
+const DATA_TYPE typed_one = 1;\r
+\r
+void\r
+fill_vector(vector<DATA_TYPE> & input, const DATA_TYPE base_value,\r
+            unsigned remaining_bits, const vector<unsigned> & indices,\r
+            int index)\r
+{\r
+  if (index < 0) {\r
+    for (unsigned u = 0; u < max_count; ++u)\r
+      input.push_back((base_value << remaining_bits) +\r
+                      (rand() % (1 << remaining_bits)));\r
+  }\r
+  else {\r
+    unsigned shift = indices[index];\r
+    fill_vector(input, (base_value << shift) + ((1 << shift) - 1),\r
+                remaining_bits - shift, indices, index - 1);\r
+    fill_vector(input, base_value << shift, remaining_bits - shift, indices,\r
+                index - 1);\r
+  }\r
+}\r
+\r
+//Generates a random index from 0 up to but not including count.\r
+unsigned\r
+get_index(unsigned count)\r
+{\r
+  unsigned result = unsigned((rand() % (1 << 16))*uint64_t(count)/(1 << 16));\r
+  if (result >= count)\r
+    return count - 1;\r
+  return result;\r
+}\r
+\r
+//Tests std::sort vs boost::sort::spreadsort on boost::sort's worst distribution.\r
+int main(int, const char **) {\r
+  unsigned total_length = sizeof(DATA_TYPE) * 8;\r
+  double std_sort_time = 0;\r
+  double spreadsort_time = 0;\r
+  for (int repetition = 0; repetition < 10; ++repetition) {\r
+    vector<DATA_TYPE> input;\r
+    vector<unsigned> offsets;\r
+    unsigned bit_length = total_length - radix_threshold;\r
+    unsigned bit_offset = bit_shift;\r
+    for (; bit_length >= ++bit_offset; bit_length -= bit_offset)\r
+      offsets.push_back(bit_offset);\r
+    for (int ii = (1 << bit_length) - 1; ii >= 0; --ii)\r
+      fill_vector(input, ii, total_length - bit_length,\r
+                  offsets, offsets.size() - 1);\r
+\r
+    //Randomize the inputs slightly so they aren't in reverse-sorted order, for\r
+    //which std::sort is very fast.\r
+    for (unsigned u = 0; u < input.size() / 10; ++u)\r
+      std::swap(input[get_index(input.size())], input[get_index(input.size())]);\r
+\r
+    //Run both std::sort and boost::sort::spreadsort.\r
+    for (unsigned u = 0; u < 2; ++u) {\r
+      vector<DATA_TYPE> array = input;\r
+      clock_t start, end;\r
+      double elapsed;\r
+      start = clock();\r
+      if (u)\r
+        std::sort(array.begin(), array.end());\r
+      else\r
+        boost::sort::spreadsort::spreadsort(array.begin(), array.end());\r
+      end = clock();\r
+      elapsed = static_cast<double>(end - start);\r
+      if (u)\r
+        std_sort_time += elapsed / CLOCKS_PER_SEC;\r
+      else\r
+        spreadsort_time += elapsed / CLOCKS_PER_SEC;\r
+      array.clear();\r
+    }\r
+  }\r
+\r
+  printf("std::sort elapsed time %f\n", std_sort_time);\r
+  printf("spreadsort elapsed time %f\n", spreadsort_time);\r
+  return 0;\r
+}\r
index a34320cd01d36a12a50096d1925a3d9c0fd27ca2..75e455757a08952ea71c68ec6f8bf269649c2788 100644 (file)
@@ -1,69 +1,69 @@
-// a random number generator supporting different distributions.
-//
-//  Copyright Steven Ross 2009.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <stdio.h>
-#include "stdlib.h"
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <string>
-#include <boost/random.hpp>
-
-using namespace std;
-using namespace boost;
-
-int main(int argc, const char ** argv) {
-  //Always seed with the same value, to get the same results
-  srand(1);
-  //defaults
-  int mod_shift = 32;
-  unsigned count = 1000000;
-  //Reading in user arguments
-  if (argc > 2)
-    count = atoi(argv[2]);
-  if (argc > 1)
-    mod_shift = atoi(argv[1]) - 1;
-  std::ofstream ofile;
-  ofile.open("input.txt", std::ios_base::out | std::ios_base::binary |
-             std::ios_base::trunc);
-  if (ofile.bad()) {
-    printf("could not open input.txt for writing!\n");
-    return 1;
-  }
-  int min_int = (numeric_limits<int>::min)();
-  int max_int = (numeric_limits<int>::max)();
-  if (mod_shift < 31 && mod_shift >= 0) {
-    max_int %= 1 << mod_shift;
-    if (-max_int > min_int)
-      min_int = -max_int;
-  }
-  std::vector<int> result;
-  result.resize(count);
-  mt19937 rng;
-  if (argc > 3 && (string(argv[3]) == "-normal")) {
-    normal_distribution<> everything(0, max_int/4);      
-    variate_generator<mt19937&,normal_distribution<> > gen(rng, everything);
-    generate(result.begin(), result.end(), gen);
-  }
-  else if (argc > 3 && (string(argv[3]) == "-lognormal")) {
-    lognormal_distribution<> everything(max_int/2, max_int/4);      
-    variate_generator<mt19937&,lognormal_distribution<> > gen(rng, everything);
-    generate(result.begin(), result.end(), gen);
-  }
-  else {
-    uniform_int<> everything(min_int, max_int);
-    variate_generator<mt19937&,uniform_int<> > gen(rng, everything);
-    generate(result.begin(), result.end(), gen);
-  }
-  ofile.write(reinterpret_cast<char *>(&(result[0])), result.size() * 
-              sizeof(int));
-  ofile.close();
-  return 0;
-}
+// a random number generator supporting different distributions.\r
+//\r
+//  Copyright Steven Ross 2009.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <stdio.h>\r
+#include "stdlib.h"\r
+#include <fstream>\r
+#include <iostream>\r
+#include <vector>\r
+#include <string>\r
+#include <boost/random.hpp>\r
+\r
+using namespace std;\r
+using namespace boost;\r
+\r
+int main(int argc, const char ** argv) {\r
+  //Always seed with the same value, to get the same results\r
+  srand(1);\r
+  //defaults\r
+  int mod_shift = 32;\r
+  unsigned count = 1000000;\r
+  //Reading in user arguments\r
+  if (argc > 2)\r
+    count = atoi(argv[2]);\r
+  if (argc > 1)\r
+    mod_shift = atoi(argv[1]) - 1;\r
+  std::ofstream ofile;\r
+  ofile.open("input.txt", std::ios_base::out | std::ios_base::binary |\r
+             std::ios_base::trunc);\r
+  if (ofile.bad()) {\r
+    printf("could not open input.txt for writing!\n");\r
+    return 1;\r
+  }\r
+  int min_int = (numeric_limits<int>::min)();\r
+  int max_int = (numeric_limits<int>::max)();\r
+  if (mod_shift < 31 && mod_shift >= 0) {\r
+    max_int %= 1 << mod_shift;\r
+    if (-max_int > min_int)\r
+      min_int = -max_int;\r
+  }\r
+  std::vector<int> result;\r
+  result.resize(count);\r
+  mt19937 rng;\r
+  if (argc > 3 && (string(argv[3]) == "-normal")) {\r
+    normal_distribution<> everything(0, max_int/4);      \r
+    variate_generator<mt19937&,normal_distribution<> > gen(rng, everything);\r
+    generate(result.begin(), result.end(), gen);\r
+  }\r
+  else if (argc > 3 && (string(argv[3]) == "-lognormal")) {\r
+    lognormal_distribution<> everything(max_int/2, max_int/4);      \r
+    variate_generator<mt19937&,lognormal_distribution<> > gen(rng, everything);\r
+    generate(result.begin(), result.end(), gen);\r
+  }\r
+  else {\r
+    uniform_int<> everything(min_int, max_int);\r
+    variate_generator<mt19937&,uniform_int<> > gen(rng, everything);\r
+    generate(result.begin(), result.end(), gen);\r
+  }\r
+  ofile.write(reinterpret_cast<char *>(&(result[0])), result.size() * \r
+              sizeof(int));\r
+  ofile.close();\r
+  return 0;\r
+}\r
index 26d1c4f093fa35f8834535a30933957a42183866..63a785b10462389d0956f1c351d19cd534e94472 100644 (file)
-// Example of sorting a struct using a case-insensitive string key.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/algorithm/string.hpp>
-#include <boost/sort/spreadsort/string_sort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <string>
-using std::string;
-using namespace boost::sort::spreadsort;
-
-struct DATA_TYPE {
-    string a;
-};
-
-struct lessthan {
-  inline bool operator()(const DATA_TYPE &x, const DATA_TYPE &y) const { 
-    return boost::algorithm::ilexicographical_compare(x.a, y.a);
-  }
-};
-
-struct bracket {
-  inline unsigned char operator()(const DATA_TYPE &x, size_t offset) const {
-    return toupper(x.a[offset]);
-  }
-};
-
-struct getsize {
-  inline size_t operator()(const DATA_TYPE &x) const{ return x.a.size(); }
-};
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  std::ifstream indata;
-  std::ofstream outfile;
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  double total = 0.0;
-  //Run multiple loops, if requested
-  std::vector<DATA_TYPE> array;
-  for (unsigned u = 0; u < loopCount; ++u) {
-    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);  
-    if (indata.bad()) {
-      printf("input.txt could not be opened\n");
-      return 1;
-    }
-    DATA_TYPE inval;
-    indata >> inval.a;
-    while (!indata.eof() ) {
-      array.push_back(inval);
-      indata >> inval.a;
-    }
-      
-    indata.close();
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      std::sort(array.begin(), array.end(), lessthan());
-    else
-      string_sort(array.begin(), array.end(), bracket(), getsize(), lessthan());
-    end = clock();
-    elapsed = static_cast<double>(end - start);
-    if (stdSort)
-      outfile.open("standard_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    else
-      outfile.open("boost_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    if (outfile.good()) {
-      for (unsigned u = 0; u < array.size(); ++u)
-        outfile << array[u].a << "\n";
-      outfile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// Example of sorting a struct using a case-insensitive string key.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/algorithm/string.hpp>\r
+#include <boost/sort/spreadsort/string_sort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <iostream>\r
+#include <fstream>\r
+#include <string>\r
+using std::string;\r
+using namespace boost::sort::spreadsort;\r
+\r
+struct DATA_TYPE {\r
+    string a;\r
+};\r
+\r
+struct lessthan {\r
+  inline bool operator()(const DATA_TYPE &x, const DATA_TYPE &y) const { \r
+    return boost::algorithm::ilexicographical_compare(x.a, y.a);\r
+  }\r
+};\r
+\r
+struct bracket {\r
+  inline unsigned char operator()(const DATA_TYPE &x, size_t offset) const {\r
+    return toupper(x.a[offset]);\r
+  }\r
+};\r
+\r
+struct getsize {\r
+  inline size_t operator()(const DATA_TYPE &x) const{ return x.a.size(); }\r
+};\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  std::ifstream indata;\r
+  std::ofstream outfile;\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  double total = 0.0;\r
+  //Run multiple loops, if requested\r
+  std::vector<DATA_TYPE> array;\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);  \r
+    if (indata.bad()) {\r
+      printf("input.txt could not be opened\n");\r
+      return 1;\r
+    }\r
+    DATA_TYPE inval;\r
+    indata >> inval.a;\r
+    while (!indata.eof() ) {\r
+      array.push_back(inval);\r
+      indata >> inval.a;\r
+    }\r
+      \r
+    indata.close();\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      std::sort(array.begin(), array.end(), lessthan());\r
+    else\r
+      string_sort(array.begin(), array.end(), bracket(), getsize(), lessthan());\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start);\r
+    if (stdSort)\r
+      outfile.open("standard_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      outfile.open("boost_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    if (outfile.good()) {\r
+      for (unsigned u = 0; u < array.size(); ++u)\r
+        outfile << array[u].a << "\n";\r
+      outfile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index 4f4487d8a0d1e4e1f4b32b0950fdf5a19c77b22e..2ea8649229027761467e912ceb630930b96d2be2 100644 (file)
-// Example of sorting structs with a string key and indexing functors.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/string_sort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <string>
-using std::string;
-using namespace boost::sort::spreadsort;
-
-struct DATA_TYPE {
-    string a;
-    inline bool operator<(const DATA_TYPE &y) const { return a < y.a;}
-};
-
-
-struct bracket {
-  inline unsigned char operator()(const DATA_TYPE &x, size_t offset) const {
-    return x.a[offset];
-  }
-};
-
-struct getsize {
-  inline size_t operator()(const DATA_TYPE &x) const{ return x.a.size(); }
-};
-
-
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  std::ifstream indata;
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  double total = 0.0;
-  //Run multiple loops, if requested
-  std::vector<DATA_TYPE> array;
-  for (unsigned u = 0; u < loopCount; ++u) {
-    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);  
-    if (indata.bad()) {
-      printf("input.txt could not be opened\n");
-      return 1;
-    }
-    DATA_TYPE inval;
-    indata >> inval.a;
-    while (!indata.eof() ) {
-      array.push_back(inval);
-      indata >> inval.a;
-    }
-      
-    indata.close();
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort) {
-      std::sort(array.begin(), array.end());
-    } else {
-//[bracket_1
-      string_sort(array.begin(), array.end(), bracket(), getsize());
-//] [/bracket_1]
-    }
-    end = clock();
-    elapsed = static_cast<double>(end - start);
-    std::ofstream ofile;
-    if (stdSort)
-      ofile.open("standard_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    else
-      ofile.open("boost_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    if (ofile.good()) {
-      for (unsigned u = 0; u < array.size(); ++u)
-        ofile << array[u].a << "\n";
-      ofile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// Example of sorting structs with a string key and indexing functors.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/string_sort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <iostream>\r
+#include <fstream>\r
+#include <string>\r
+using std::string;\r
+using namespace boost::sort::spreadsort;\r
+\r
+struct DATA_TYPE {\r
+    string a;\r
+    inline bool operator<(const DATA_TYPE &y) const { return a < y.a;}\r
+};\r
+\r
+\r
+struct bracket {\r
+  inline unsigned char operator()(const DATA_TYPE &x, size_t offset) const {\r
+    return x.a[offset];\r
+  }\r
+};\r
+\r
+struct getsize {\r
+  inline size_t operator()(const DATA_TYPE &x) const{ return x.a.size(); }\r
+};\r
+\r
+\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  std::ifstream indata;\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  double total = 0.0;\r
+  //Run multiple loops, if requested\r
+  std::vector<DATA_TYPE> array;\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);  \r
+    if (indata.bad()) {\r
+      printf("input.txt could not be opened\n");\r
+      return 1;\r
+    }\r
+    DATA_TYPE inval;\r
+    indata >> inval.a;\r
+    while (!indata.eof() ) {\r
+      array.push_back(inval);\r
+      indata >> inval.a;\r
+    }\r
+      \r
+    indata.close();\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort) {\r
+      std::sort(array.begin(), array.end());\r
+    } else {\r
+//[bracket_1\r
+      string_sort(array.begin(), array.end(), bracket(), getsize());\r
+//] [/bracket_1]\r
+    }\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start);\r
+    std::ofstream ofile;\r
+    if (stdSort)\r
+      ofile.open("standard_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      ofile.open("boost_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    if (ofile.good()) {\r
+      for (unsigned u = 0; u < array.size(); ++u)\r
+        ofile << array[u].a << "\n";\r
+      ofile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index eff1295e78333f9a78d5e62e1c06e001dcd4b152..81f236ca881f8fd339e2d273172c0bd93bef2b00 100644 (file)
-// spreadsort double sorting example.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <iostream>
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE double
-#define CAST_TYPE boost::int64_t
-
-//Pass in an argument to test std::sort
-//Note that this converts NaNs and -0.0 to 0.0, so that sorting results are
-//identical every time
-int main(int argc, const char ** argv) {
-  size_t uCount,uSize=sizeof(DATA_TYPE);
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);
-  if (input.fail()) {
-    printf("input.txt could not be opened\n");
-    return 1;
-  }
-  double total = 0.0;
-  std::vector<DATA_TYPE> array;
-  input.seekg (0, std::ios_base::end);
-  size_t length = input.tellg();
-  uCount = length/uSize;
-  //Using this to support compilers that don't support 64-bit constants
-  CAST_TYPE exponent_mask = 0x7ff00000;
-  exponent_mask <<= 32;
-  CAST_TYPE top_exponent_bit = 0x40000000;
-  top_exponent_bit <<= 32;
-  //Run multiple loops, if requested
-  for (unsigned u = 0; u < loopCount; ++u) {
-    input.seekg (0, std::ios_base::beg);
-    //Conversion to a vector
-    array.resize(uCount);
-    unsigned v = 0;
-    while (input.good() && v < uCount) {
-      input.read(reinterpret_cast<char *>(&(array[v])), uSize );
-     //Checking for denormalized numbers
-     if (!(float_mem_cast<DATA_TYPE, CAST_TYPE>(array[v]) & exponent_mask)) {
-       //Make the top exponent bit high
-       CAST_TYPE temp = top_exponent_bit |
-         float_mem_cast<DATA_TYPE, CAST_TYPE>(array[v]);
-       memcpy(&(array[v]), &temp, sizeof(DATA_TYPE));
-     }
-     //Testcase doesn't sort NaNs; they just cause confusion
-     if (!(array[v] < 0.0) && !(0.0 < array[v]))
-      array[v] = 0.0;
-     ++v;
-    }
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      //std::sort(&(array[0]), &(array[0]) + uCount);
-      std::sort(array.begin(), array.end());
-    else
-      //float_sort(&(array[0]), &(array[0]) + uCount);
-      float_sort(array.begin(), array.end());
-    end = clock();
-    elapsed = static_cast<double>(end - start) ;
-    std::ofstream ofile;
-    if (stdSort)
-      ofile.open("standard_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    else
-      ofile.open("boost_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    if (ofile.good()) {
-      for (unsigned v = 0; v < array.size(); ++v) {
-        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );
-      }
-      ofile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// spreadsort double sorting example.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <iostream>\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE double\r
+#define CAST_TYPE boost::int64_t\r
+\r
+//Pass in an argument to test std::sort\r
+//Note that this converts NaNs and -0.0 to 0.0, so that sorting results are\r
+//identical every time\r
+int main(int argc, const char ** argv) {\r
+  size_t uCount,uSize=sizeof(DATA_TYPE);\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);\r
+  if (input.fail()) {\r
+    printf("input.txt could not be opened\n");\r
+    return 1;\r
+  }\r
+  double total = 0.0;\r
+  std::vector<DATA_TYPE> array;\r
+  input.seekg (0, std::ios_base::end);\r
+  size_t length = input.tellg();\r
+  uCount = length/uSize;\r
+  //Using this to support compilers that don't support 64-bit constants\r
+  CAST_TYPE exponent_mask = 0x7ff00000;\r
+  exponent_mask <<= 32;\r
+  CAST_TYPE top_exponent_bit = 0x40000000;\r
+  top_exponent_bit <<= 32;\r
+  //Run multiple loops, if requested\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    input.seekg (0, std::ios_base::beg);\r
+    //Conversion to a vector\r
+    array.resize(uCount);\r
+    unsigned v = 0;\r
+    while (input.good() && v < uCount) {\r
+      input.read(reinterpret_cast<char *>(&(array[v])), uSize );\r
+     //Checking for denormalized numbers\r
+     if (!(float_mem_cast<DATA_TYPE, CAST_TYPE>(array[v]) & exponent_mask)) {\r
+       //Make the top exponent bit high\r
+       CAST_TYPE temp = top_exponent_bit |\r
+         float_mem_cast<DATA_TYPE, CAST_TYPE>(array[v]);\r
+       memcpy(&(array[v]), &temp, sizeof(DATA_TYPE));\r
+     }\r
+     //Testcase doesn't sort NaNs; they just cause confusion\r
+     if (!(array[v] < 0.0) && !(0.0 < array[v]))\r
+      array[v] = 0.0;\r
+     ++v;\r
+    }\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      //std::sort(&(array[0]), &(array[0]) + uCount);\r
+      std::sort(array.begin(), array.end());\r
+    else\r
+      //float_sort(&(array[0]), &(array[0]) + uCount);\r
+      float_sort(array.begin(), array.end());\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start) ;\r
+    std::ofstream ofile;\r
+    if (stdSort)\r
+      ofile.open("standard_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      ofile.open("boost_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    if (ofile.good()) {\r
+      for (unsigned v = 0; v < array.size(); ++v) {\r
+        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );\r
+      }\r
+      ofile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index e930fee4895546e348f1aec02e60891cd003f2dd..461f6b9f0ed0f889b5f37d0cdd33271163762f39 100644 (file)
-// spreadsort float functor sorting example.
-//
-//  Copyright Steven Ross 2009.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-// Caution: this file contains Quickbook markup as well as code
-// and comments, don't change any of the special comment markups!
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-
-using namespace boost::sort::spreadsort;
-
-//[float_functor_types
-#define CAST_TYPE int
-#define KEY_TYPE float
-//] [/float_functor_types]
-
-
-//[float_functor_datatypes
-struct DATA_TYPE {
-    KEY_TYPE key;
-    std::string data;
-};
-//] [/float_functor_datatypes]
-
-
-//[float_functor_rightshift
-// Casting to an integer before bitshifting
-struct rightshift {
-  int operator()(const DATA_TYPE &x, const unsigned offset) const {
-    return float_mem_cast<KEY_TYPE, CAST_TYPE>(x.key) >> offset;
-  }
-};
-//] [/float_functor_rightshift]
-
-//[float_functor_lessthan
-struct lessthan {
-  bool operator()(const DATA_TYPE &x, const DATA_TYPE &y) const {
-    return x.key < y.key;
-  }
-};
-//] [/float_functor_lessthan]
-
-// Pass in an argument to test std::sort
-// Note that this converts NaNs and -0.0 to 0.0, so that sorting results are
-// identical every time
-int main(int argc, const char ** argv) {
-  size_t uCount,uSize=sizeof(DATA_TYPE);
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);
-  if (input.fail()) {
-    printf("input.txt could not be opened\n");
-    return 1;
-  }
-  double total = 0.0;
-  std::vector<DATA_TYPE> array;
-  input.seekg (0, std::ios_base::end);
-    size_t length = input.tellg();
-  uCount = length/uSize;
-  //Run multiple loops, if requested
-  for (unsigned u = 0; u < loopCount; ++u) {
-    input.seekg (0, std::ios_base::beg);
-    //Conversion to a vector
-    array.resize(uCount);
-    unsigned v = 0;
-    while (input.good() && v < uCount) {
-      input.read(reinterpret_cast<char *>(&(array[v].key)),
-                 sizeof(array[v].key));
-     //Checking for denormalized numbers; float_sort looks too fast on them.
-     if (!(float_mem_cast<KEY_TYPE, CAST_TYPE>(array[v].key) & 0x7f800000)) {
-       //Make the top exponent bit high
-       CAST_TYPE temp = 0x40000000 |
-         float_mem_cast<KEY_TYPE, CAST_TYPE>(array[v].key);
-       memcpy(&(array[v].key), &temp, sizeof(KEY_TYPE));
-     }
-     //Testcase doesn't sort NaNs; they just cause confusion
-     if (!(array[v].key < 0.0) && !(0.0 < array[v].key))
-       array[v].key = 0.0;
-     //Adding the data, in this case a string
-     std::stringstream intstr;
-     intstr << array[v].key;
-     array[v].data = intstr.str();
-     ++v;
-    }
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      std::sort(array.begin(), array.end(), lessthan());
-    else
-      float_sort(array.begin(), array.end(), rightshift(), lessthan());
-    end = clock();
-    elapsed = static_cast<double>(end - start) ;
-    std::ofstream ofile;
-    if (stdSort)
-      ofile.open("standard_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    else
-      ofile.open("boost_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    if (ofile.good()) {
-      for (unsigned v = 0; v < array.size(); ++v) {
-        ofile.write(reinterpret_cast<char *>(&(array[v].key)),
-                    sizeof(array[v].key));
-        ofile << array[v].data;
-      }
-      ofile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// spreadsort float functor sorting example.\r
+//\r
+//  Copyright Steven Ross 2009.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+// Caution: this file contains Quickbook markup as well as code\r
+// and comments, don't change any of the special comment markups!\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <sstream>\r
+#include <iostream>\r
+\r
+using namespace boost::sort::spreadsort;\r
+\r
+//[float_functor_types\r
+#define CAST_TYPE int\r
+#define KEY_TYPE float\r
+//] [/float_functor_types]\r
+\r
+\r
+//[float_functor_datatypes\r
+struct DATA_TYPE {\r
+    KEY_TYPE key;\r
+    std::string data;\r
+};\r
+//] [/float_functor_datatypes]\r
+\r
+\r
+//[float_functor_rightshift\r
+// Casting to an integer before bitshifting\r
+struct rightshift {\r
+  int operator()(const DATA_TYPE &x, const unsigned offset) const {\r
+    return float_mem_cast<KEY_TYPE, CAST_TYPE>(x.key) >> offset;\r
+  }\r
+};\r
+//] [/float_functor_rightshift]\r
+\r
+//[float_functor_lessthan\r
+struct lessthan {\r
+  bool operator()(const DATA_TYPE &x, const DATA_TYPE &y) const {\r
+    return x.key < y.key;\r
+  }\r
+};\r
+//] [/float_functor_lessthan]\r
+\r
+// Pass in an argument to test std::sort\r
+// Note that this converts NaNs and -0.0 to 0.0, so that sorting results are\r
+// identical every time\r
+int main(int argc, const char ** argv) {\r
+  size_t uCount,uSize=sizeof(DATA_TYPE);\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);\r
+  if (input.fail()) {\r
+    printf("input.txt could not be opened\n");\r
+    return 1;\r
+  }\r
+  double total = 0.0;\r
+  std::vector<DATA_TYPE> array;\r
+  input.seekg (0, std::ios_base::end);\r
+    size_t length = input.tellg();\r
+  uCount = length/uSize;\r
+  //Run multiple loops, if requested\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    input.seekg (0, std::ios_base::beg);\r
+    //Conversion to a vector\r
+    array.resize(uCount);\r
+    unsigned v = 0;\r
+    while (input.good() && v < uCount) {\r
+      input.read(reinterpret_cast<char *>(&(array[v].key)),\r
+                 sizeof(array[v].key));\r
+     //Checking for denormalized numbers; float_sort looks too fast on them.\r
+     if (!(float_mem_cast<KEY_TYPE, CAST_TYPE>(array[v].key) & 0x7f800000)) {\r
+       //Make the top exponent bit high\r
+       CAST_TYPE temp = 0x40000000 |\r
+         float_mem_cast<KEY_TYPE, CAST_TYPE>(array[v].key);\r
+       memcpy(&(array[v].key), &temp, sizeof(KEY_TYPE));\r
+     }\r
+     //Testcase doesn't sort NaNs; they just cause confusion\r
+     if (!(array[v].key < 0.0) && !(0.0 < array[v].key))\r
+       array[v].key = 0.0;\r
+     //Adding the data, in this case a string\r
+     std::stringstream intstr;\r
+     intstr << array[v].key;\r
+     array[v].data = intstr.str();\r
+     ++v;\r
+    }\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      std::sort(array.begin(), array.end(), lessthan());\r
+    else\r
+      float_sort(array.begin(), array.end(), rightshift(), lessthan());\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start) ;\r
+    std::ofstream ofile;\r
+    if (stdSort)\r
+      ofile.open("standard_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      ofile.open("boost_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    if (ofile.good()) {\r
+      for (unsigned v = 0; v < array.size(); ++v) {\r
+        ofile.write(reinterpret_cast<char *>(&(array[v].key)),\r
+                    sizeof(array[v].key));\r
+        ofile << array[v].data;\r
+      }\r
+      ofile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index 1de3f650bfca5ddc318b5bf94254fd5c0616ced9..1243117f9f55b7abc55432c7061e74d3a2918693 100644 (file)
-// spreadsort float sorting example.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <iostream>
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE float
-#define CAST_TYPE int
-
-//Pass in an argument to test std::sort
-//Note that this converts NaNs and -0.0 to 0.0, so that sorting results are
-//identical every time
-int main(int argc, const char ** argv) {
-  size_t uCount,uSize=sizeof(DATA_TYPE);
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);
-  if (input.fail()) {
-    printf("input.txt could not be opened\n");
-    return 1;
-  }
-  double total = 0.0;
-  std::vector<DATA_TYPE> array;
-  input.seekg (0, std::ios_base::end);
-  size_t length = input.tellg();
-  uCount = length/uSize;
-  //Run multiple loops, if requested
-  for (unsigned u = 0; u < loopCount; ++u) {
-    input.seekg (0, std::ios_base::beg);
-    //Conversion to a vector
-    array.resize(uCount);
-    unsigned v = 0;
-    while (input.good() && v < uCount) {
-      input.read(reinterpret_cast<char *>(&(array[v])), uSize );
-     //Checking for denormalized numbers
-     if (!(float_mem_cast<float, int>(array[v]) & 0x7f800000)) {
-       //Make the top exponent bit high
-       CAST_TYPE temp = 0x40000000 | float_mem_cast<float, int>(array[v]);
-       memcpy(&(array[v]), &temp, sizeof(DATA_TYPE));
-     }
-     //Testcase doesn't sort NaNs; they just cause confusion
-     if (!(array[v] < 0.0) && !(0.0 < array[v]))
-      array[v] = 0.0;
-     ++v;
-    }
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      //std::sort(&(array[0]), &(array[0]) + uCount);
-      std::sort(array.begin(), array.end());
-    else
-      //boost::sort::spreadsort::spreadsort(&(array[0]), &(array[0]) + uCount);
-      boost::sort::spreadsort::spreadsort(array.begin(), array.end());
-    end = clock();
-    elapsed = static_cast<double>(end - start) ;
-    std::ofstream ofile;
-    if (stdSort)
-      ofile.open("standard_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    else
-      ofile.open("boost_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    if (ofile.good()) {
-      for (unsigned v = 0; v < array.size(); ++v) {
-        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );
-      }
-      ofile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  input.close();
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// spreadsort float sorting example.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <iostream>\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE float\r
+#define CAST_TYPE int\r
+\r
+//Pass in an argument to test std::sort\r
+//Note that this converts NaNs and -0.0 to 0.0, so that sorting results are\r
+//identical every time\r
+int main(int argc, const char ** argv) {\r
+  size_t uCount,uSize=sizeof(DATA_TYPE);\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);\r
+  if (input.fail()) {\r
+    printf("input.txt could not be opened\n");\r
+    return 1;\r
+  }\r
+  double total = 0.0;\r
+  std::vector<DATA_TYPE> array;\r
+  input.seekg (0, std::ios_base::end);\r
+  size_t length = input.tellg();\r
+  uCount = length/uSize;\r
+  //Run multiple loops, if requested\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    input.seekg (0, std::ios_base::beg);\r
+    //Conversion to a vector\r
+    array.resize(uCount);\r
+    unsigned v = 0;\r
+    while (input.good() && v < uCount) {\r
+      input.read(reinterpret_cast<char *>(&(array[v])), uSize );\r
+     //Checking for denormalized numbers\r
+     if (!(float_mem_cast<float, int>(array[v]) & 0x7f800000)) {\r
+       //Make the top exponent bit high\r
+       CAST_TYPE temp = 0x40000000 | float_mem_cast<float, int>(array[v]);\r
+       memcpy(&(array[v]), &temp, sizeof(DATA_TYPE));\r
+     }\r
+     //Testcase doesn't sort NaNs; they just cause confusion\r
+     if (!(array[v] < 0.0) && !(0.0 < array[v]))\r
+      array[v] = 0.0;\r
+     ++v;\r
+    }\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      //std::sort(&(array[0]), &(array[0]) + uCount);\r
+      std::sort(array.begin(), array.end());\r
+    else\r
+      //boost::sort::spreadsort::spreadsort(&(array[0]), &(array[0]) + uCount);\r
+      boost::sort::spreadsort::spreadsort(array.begin(), array.end());\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start) ;\r
+    std::ofstream ofile;\r
+    if (stdSort)\r
+      ofile.open("standard_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      ofile.open("boost_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    if (ofile.good()) {\r
+      for (unsigned v = 0; v < array.size(); ++v) {\r
+        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );\r
+      }\r
+      ofile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  input.close();\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index eed82c9e91111873fb94f0d42c3eded3ff022e3a..a8d4bd7890d84ce7fe8ed07bf3689dc5acf772a4 100644 (file)
-// This example shows how to sort structs using complex multiple part keys using
-// string_sort.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/string_sort.hpp>
-#include <boost/sort/spreadsort/float_sort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <string>
-using std::string;
-using namespace boost::sort::spreadsort;
-
-//[generalized_functors
-struct DATA_TYPE {
-  time_t birth;
-  float net_worth;
-  string first_name;
-  string last_name;
-};
-
-static const int birth_size = sizeof(time_t);
-static const int first_name_offset = birth_size + sizeof(float);
-static const boost::uint64_t base_mask = 0xff;
-
-struct lessthan {
-  inline bool operator()(const DATA_TYPE &x, const DATA_TYPE &y) const {
-    if (x.birth != y.birth) {
-      return x.birth < y.birth;
-    }
-    if (x.net_worth != y.net_worth) {
-      return x.net_worth < y.net_worth;
-    }
-    if (x.first_name != y.first_name) {
-      return x.first_name < y.first_name;
-    }
-    return x.last_name < y.last_name;
-  }
-};
-
-struct bracket {
-  inline unsigned char operator()(const DATA_TYPE &x, size_t offset) const {
-    // Sort date as a signed int, returning the appropriate byte.
-    if (offset < birth_size) {
-      const int bit_shift = 8 * (birth_size - offset - 1);
-      unsigned char result = (x.birth & (base_mask << bit_shift)) >> bit_shift;
-      // Handling the sign bit.  Unnecessary if the data is always positive.
-      if (offset == 0) {
-        return result ^ 128;
-      }
-
-      return result;
-    }
-
-    // Sort a signed float.  This requires reversing the order of negatives
-    // because of the way floats are represented in bits.
-    if (offset < first_name_offset) {
-      const int bit_shift = 8 * (first_name_offset - offset - 1);
-      unsigned key = float_mem_cast<float, unsigned>(x.net_worth);
-      unsigned char result = (key & (base_mask << bit_shift)) >> bit_shift;
-      // Handling the sign.
-      if (x.net_worth < 0) {
-        return 255 - result;
-      }
-      // Increasing positives so they are higher than negatives.
-      if (offset == birth_size) {
-        return 128 + result;
-      }
-
-      return result;
-    }
-
-    // Sort a string that is before the end.  This approach supports embedded
-    // nulls.  If embedded nulls are not required, then just delete the "* 2"
-    // and the inside of the following if just becomes:
-    // return x.first_name[offset - first_name_offset];
-    const unsigned first_name_end_offset =
-      first_name_offset + x.first_name.size() * 2;
-    if (offset < first_name_end_offset) {
-      int char_offset = offset - first_name_offset;
-      // This signals that the string continues.
-      if (!(char_offset & 1)) {
-        return 1;
-      }
-      return x.first_name[char_offset >> 1];
-    }
-
-    // This signals that the string has ended, so that shorter strings come
-    // before longer ones.
-    if (offset == first_name_end_offset) {
-      return 0;
-    }
-
-    // The final string needs no special consideration.
-    return x.last_name[offset - first_name_end_offset - 1];
-  }
-};
-
-struct getsize {
-  inline size_t operator()(const DATA_TYPE &x) const {
-    return first_name_offset + x.first_name.size() * 2 + 1 +
-      x.last_name.size();
-  }
-};
-//] [/generalized_functors]
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  std::ifstream indata;
-  std::ofstream outfile;
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  double total = 0.0;
-  //Run multiple loops, if requested
-  std::vector<DATA_TYPE> array;
-  for (unsigned u = 0; u < loopCount; ++u) {
-    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);
-    if (indata.bad()) {
-      printf("input.txt could not be opened\n");
-      return 1;
-    }
-
-    // Read in the data.
-    DATA_TYPE inval;
-    while (!indata.eof() ) {
-      indata >> inval.first_name;
-      indata >> inval.last_name;
-      indata.read(reinterpret_cast<char *>(&(inval.birth)), birth_size);
-      indata.read(reinterpret_cast<char *>(&(inval.net_worth)), sizeof(float));
-      // Handling nan.
-      if (inval.net_worth != inval.net_worth) {
-        inval.net_worth = 0;
-      }
-      if (indata.eof())
-        break;
-      array.push_back(inval);
-    }
-    indata.close();
-
-    // Sort the data.
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort) {
-      std::sort(array.begin(), array.end(), lessthan());
-    } else {
-//[generalized_functors_call
-      string_sort(array.begin(), array.end(), bracket(), getsize(), lessthan());
-//] [/generalized_functors_call]
-    }
-    end = clock();
-    elapsed = static_cast<double>(end - start);
-    if (stdSort) {
-      outfile.open("standard_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    } else {
-      outfile.open("boost_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    }
-    if (outfile.good()) {
-      for (unsigned u = 0; u < array.size(); ++u)
-        outfile << array[u].birth << " " << array[u].net_worth << " "
-                << array[u].first_name << " " << array[u].last_name << "\n";
-      outfile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort) {
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  } else {
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  }
-  return 0;
-}
+// This example shows how to sort structs using complex multiple part keys using\r
+// string_sort.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/string_sort.hpp>\r
+#include <boost/sort/spreadsort/float_sort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <iostream>\r
+#include <fstream>\r
+#include <string>\r
+using std::string;\r
+using namespace boost::sort::spreadsort;\r
+\r
+//[generalized_functors\r
+struct DATA_TYPE {\r
+  time_t birth;\r
+  float net_worth;\r
+  string first_name;\r
+  string last_name;\r
+};\r
+\r
+static const int birth_size = sizeof(time_t);\r
+static const int first_name_offset = birth_size + sizeof(float);\r
+static const boost::uint64_t base_mask = 0xff;\r
+\r
+struct lessthan {\r
+  inline bool operator()(const DATA_TYPE &x, const DATA_TYPE &y) const {\r
+    if (x.birth != y.birth) {\r
+      return x.birth < y.birth;\r
+    }\r
+    if (x.net_worth != y.net_worth) {\r
+      return x.net_worth < y.net_worth;\r
+    }\r
+    if (x.first_name != y.first_name) {\r
+      return x.first_name < y.first_name;\r
+    }\r
+    return x.last_name < y.last_name;\r
+  }\r
+};\r
+\r
+struct bracket {\r
+  inline unsigned char operator()(const DATA_TYPE &x, size_t offset) const {\r
+    // Sort date as a signed int, returning the appropriate byte.\r
+    if (offset < birth_size) {\r
+      const int bit_shift = 8 * (birth_size - offset - 1);\r
+      unsigned char result = (x.birth & (base_mask << bit_shift)) >> bit_shift;\r
+      // Handling the sign bit.  Unnecessary if the data is always positive.\r
+      if (offset == 0) {\r
+        return result ^ 128;\r
+      }\r
+\r
+      return result;\r
+    }\r
+\r
+    // Sort a signed float.  This requires reversing the order of negatives\r
+    // because of the way floats are represented in bits.\r
+    if (offset < first_name_offset) {\r
+      const int bit_shift = 8 * (first_name_offset - offset - 1);\r
+      unsigned key = float_mem_cast<float, unsigned>(x.net_worth);\r
+      unsigned char result = (key & (base_mask << bit_shift)) >> bit_shift;\r
+      // Handling the sign.\r
+      if (x.net_worth < 0) {\r
+        return 255 - result;\r
+      }\r
+      // Increasing positives so they are higher than negatives.\r
+      if (offset == birth_size) {\r
+        return 128 + result;\r
+      }\r
+\r
+      return result;\r
+    }\r
+\r
+    // Sort a string that is before the end.  This approach supports embedded\r
+    // nulls.  If embedded nulls are not required, then just delete the "* 2"\r
+    // and the inside of the following if just becomes:\r
+    // return x.first_name[offset - first_name_offset];\r
+    const unsigned first_name_end_offset =\r
+      first_name_offset + x.first_name.size() * 2;\r
+    if (offset < first_name_end_offset) {\r
+      int char_offset = offset - first_name_offset;\r
+      // This signals that the string continues.\r
+      if (!(char_offset & 1)) {\r
+        return 1;\r
+      }\r
+      return x.first_name[char_offset >> 1];\r
+    }\r
+\r
+    // This signals that the string has ended, so that shorter strings come\r
+    // before longer ones.\r
+    if (offset == first_name_end_offset) {\r
+      return 0;\r
+    }\r
+\r
+    // The final string needs no special consideration.\r
+    return x.last_name[offset - first_name_end_offset - 1];\r
+  }\r
+};\r
+\r
+struct getsize {\r
+  inline size_t operator()(const DATA_TYPE &x) const {\r
+    return first_name_offset + x.first_name.size() * 2 + 1 +\r
+      x.last_name.size();\r
+  }\r
+};\r
+//] [/generalized_functors]\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  std::ifstream indata;\r
+  std::ofstream outfile;\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  double total = 0.0;\r
+  //Run multiple loops, if requested\r
+  std::vector<DATA_TYPE> array;\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);\r
+    if (indata.bad()) {\r
+      printf("input.txt could not be opened\n");\r
+      return 1;\r
+    }\r
+\r
+    // Read in the data.\r
+    DATA_TYPE inval;\r
+    while (!indata.eof() ) {\r
+      indata >> inval.first_name;\r
+      indata >> inval.last_name;\r
+      indata.read(reinterpret_cast<char *>(&(inval.birth)), birth_size);\r
+      indata.read(reinterpret_cast<char *>(&(inval.net_worth)), sizeof(float));\r
+      // Handling nan.\r
+      if (inval.net_worth != inval.net_worth) {\r
+        inval.net_worth = 0;\r
+      }\r
+      if (indata.eof())\r
+        break;\r
+      array.push_back(inval);\r
+    }\r
+    indata.close();\r
+\r
+    // Sort the data.\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort) {\r
+      std::sort(array.begin(), array.end(), lessthan());\r
+    } else {\r
+//[generalized_functors_call\r
+      string_sort(array.begin(), array.end(), bracket(), getsize(), lessthan());\r
+//] [/generalized_functors_call]\r
+    }\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start);\r
+    if (stdSort) {\r
+      outfile.open("standard_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    } else {\r
+      outfile.open("boost_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    }\r
+    if (outfile.good()) {\r
+      for (unsigned u = 0; u < array.size(); ++u)\r
+        outfile << array[u].birth << " " << array[u].net_worth << " "\r
+                << array[u].first_name << " " << array[u].last_name << "\n";\r
+      outfile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort) {\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  } else {\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  }\r
+  return 0;\r
+}\r
index e01ce5c706aa6169b1b7610309c69f0d6d6a0223..272fd66ff16ba3e6b5468e6f234e298b82451468 100644 (file)
@@ -1,93 +1,93 @@
-// spreadsort 64-bit integer sorting example.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-using namespace boost::sort::spreadsort;
-
-//[int64bit_1
-#define DATA_TYPE boost::int64_t
-//] [/int64bit_1]
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  size_t uCount,uSize=sizeof(DATA_TYPE);
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);
-  if (input.fail()) {
-    printf("input.txt could not be opened\n");
-    return 1;
-  }
-  double total = 0.0;
-  std::vector<DATA_TYPE> array;
-  input.seekg (0, std::ios_base::end);
-    size_t length = input.tellg();
-  uCount = length/uSize;
-  //Run multiple loops, if requested
-  for (unsigned u = 0; u < loopCount; ++u) {
-    input.seekg (0, std::ios_base::beg);
-    //Conversion to a vector
-    array.resize(uCount);
-    unsigned v = 0;
-    while (input.good() && v < uCount)
-      input.read(reinterpret_cast<char *>(&(array[v++])), uSize );
-    if (v < uCount)
-      array.resize(v);
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      //std::sort(&(array[0]), &(array[0]) + uCount);
-      std::sort(array.begin(), array.end());
-    else
-      //boost::sort::spreadsort::spreadsort(&(array[0]), &(array[0]) + uCount);
-//[int64bit_2
-      boost::sort::spreadsort::spreadsort(array.begin(), array.end());
-//] [/int64bit_2]
-    end = clock();
-    elapsed = static_cast<double>(end - start) ;
-    std::ofstream ofile;
-    if (stdSort)
-      ofile.open("standard_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    else
-      ofile.open("boost_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    if (ofile.good()) {
-      for (unsigned v = 0; v < array.size(); ++v) {
-        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );
-      }
-      ofile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  input.close();
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// spreadsort 64-bit integer sorting example.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <sstream>\r
+#include <iostream>\r
+using namespace boost::sort::spreadsort;\r
+\r
+//[int64bit_1\r
+#define DATA_TYPE boost::int64_t\r
+//] [/int64bit_1]\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  size_t uCount,uSize=sizeof(DATA_TYPE);\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);\r
+  if (input.fail()) {\r
+    printf("input.txt could not be opened\n");\r
+    return 1;\r
+  }\r
+  double total = 0.0;\r
+  std::vector<DATA_TYPE> array;\r
+  input.seekg (0, std::ios_base::end);\r
+    size_t length = input.tellg();\r
+  uCount = length/uSize;\r
+  //Run multiple loops, if requested\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    input.seekg (0, std::ios_base::beg);\r
+    //Conversion to a vector\r
+    array.resize(uCount);\r
+    unsigned v = 0;\r
+    while (input.good() && v < uCount)\r
+      input.read(reinterpret_cast<char *>(&(array[v++])), uSize );\r
+    if (v < uCount)\r
+      array.resize(v);\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      //std::sort(&(array[0]), &(array[0]) + uCount);\r
+      std::sort(array.begin(), array.end());\r
+    else\r
+      //boost::sort::spreadsort::spreadsort(&(array[0]), &(array[0]) + uCount);\r
+//[int64bit_2\r
+      boost::sort::spreadsort::spreadsort(array.begin(), array.end());\r
+//] [/int64bit_2]\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start) ;\r
+    std::ofstream ofile;\r
+    if (stdSort)\r
+      ofile.open("standard_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      ofile.open("boost_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    if (ofile.good()) {\r
+      for (unsigned v = 0; v < array.size(); ++v) {\r
+        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );\r
+      }\r
+      ofile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  input.close();\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index bb6d30c6f7688247b271b770e1cd1f6e45d222b2..d5d819374052ef8fdc7f8e1bd98a24906fd2d1a6 100644 (file)
-// spreadsort key and data sorting example.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-using namespace boost::sort::spreadsort;
-
-struct DATA_TYPE {
-    int key;
-    std::string data;
-    };
-//functor example
-struct lessthan {
-  inline bool operator()(const DATA_TYPE &x, const DATA_TYPE &y) const {
-    return x.key < y.key;
-  }
-};
-
-struct rightshift {
-  inline int operator()(const DATA_TYPE &x, const unsigned offset) {
-    return x.key >> offset;
-  }
-};
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  size_t uSize = sizeof(int);
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);
-  if (input.fail()) {
-    printf("input.txt could not be opened\n");
-    return 1;
-  }
-  input.seekg (0, std::ios_base::end);
-    size_t length = input.tellg();
-  double total = 0.0;
-  std::vector<DATA_TYPE> array;
-  array.reserve(length/uSize);
-  unsigned uCount = length/uSize;
-  //Run multiple loops, if requested
-  for (unsigned u = 0; u < loopCount; ++u) {
-    input.seekg (0, std::ios_base::beg);
-    unsigned v = 0;
-    while (input.good() && v++ < uCount) { // EOF or failure stops the reading
-     DATA_TYPE element;
-     input.read(reinterpret_cast<char *>(&(element.key)), sizeof(element.key));
-     std::stringstream intstr;
-         intstr << element.key;
-         element.data = intstr.str();
-         array.push_back(element);
-    }  
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      std::sort(array.begin(), array.end(), lessthan());
-    else
-      integer_sort(array.begin(), array.end(), rightshift(), lessthan());
-    end = clock();
-    elapsed = static_cast<double>(end - start) ;
-    std::ofstream ofile;
-    if (stdSort)
-      ofile.open("standard_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    else
-      ofile.open("boost_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    if (ofile.good()) {
-      for (unsigned v = 0; v < array.size(); ++v) {
-        ofile.write(reinterpret_cast<char *>(&(array[v].key)), 
-                    sizeof(array[v].key));
-        ofile << array[v].data;
-      }
-      ofile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  input.close();
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// spreadsort key and data sorting example.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <sstream>\r
+#include <iostream>\r
+using namespace boost::sort::spreadsort;\r
+\r
+struct DATA_TYPE {\r
+    int key;\r
+    std::string data;\r
+    };\r
+//functor example\r
+struct lessthan {\r
+  inline bool operator()(const DATA_TYPE &x, const DATA_TYPE &y) const {\r
+    return x.key < y.key;\r
+  }\r
+};\r
+\r
+struct rightshift {\r
+  inline int operator()(const DATA_TYPE &x, const unsigned offset) {\r
+    return x.key >> offset;\r
+  }\r
+};\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  size_t uSize = sizeof(int);\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);\r
+  if (input.fail()) {\r
+    printf("input.txt could not be opened\n");\r
+    return 1;\r
+  }\r
+  input.seekg (0, std::ios_base::end);\r
+    size_t length = input.tellg();\r
+  double total = 0.0;\r
+  std::vector<DATA_TYPE> array;\r
+  array.reserve(length/uSize);\r
+  unsigned uCount = length/uSize;\r
+  //Run multiple loops, if requested\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    input.seekg (0, std::ios_base::beg);\r
+    unsigned v = 0;\r
+    while (input.good() && v++ < uCount) { // EOF or failure stops the reading\r
+     DATA_TYPE element;\r
+     input.read(reinterpret_cast<char *>(&(element.key)), sizeof(element.key));\r
+     std::stringstream intstr;\r
+         intstr << element.key;\r
+         element.data = intstr.str();\r
+         array.push_back(element);\r
+    }  \r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      std::sort(array.begin(), array.end(), lessthan());\r
+    else\r
+      integer_sort(array.begin(), array.end(), rightshift(), lessthan());\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start) ;\r
+    std::ofstream ofile;\r
+    if (stdSort)\r
+      ofile.open("standard_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      ofile.open("boost_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    if (ofile.good()) {\r
+      for (unsigned v = 0; v < array.size(); ++v) {\r
+        ofile.write(reinterpret_cast<char *>(&(array[v].key)), \r
+                    sizeof(array[v].key));\r
+        ofile << array[v].data;\r
+      }\r
+      ofile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  input.close();\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index b609cbdba38b37bf4613bec31141e793f387908c..34e6e87ed814ef7e76c92cd0b1628fe2efd54cd6 100644 (file)
-// spreadsort on a mostly sorted array example.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE int
-
-unsigned
-get_index(unsigned count)
-{
-  unsigned result = unsigned((rand() % (1 << 16))*uint64_t(count)/(1 << 16));
-  if (result >= count || result < 0)
-    result = count - 1;
-  return result;
-}
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  srand(1);
-  size_t uCount,uSize=sizeof(DATA_TYPE);
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  //Sorts the data once, then times sorting of already-sorted data
-  loopCount += 1;
-  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);
-  if (input.fail()) {
-    printf("input.txt could not be opened\n");
-    return 1;
-  }
-  double total = 0.0;
-  std::vector<DATA_TYPE> array;
-  input.seekg (0, std::ios_base::end);
-    size_t length = input.tellg();
-  uCount = length/uSize;
-  input.seekg (0, std::ios_base::beg);
-  //Conversion to a vector
-  array.resize(uCount);
-  unsigned v = 0;
-  while (input.good() && v < uCount) // EOF or failure stops the reading
-    input.read(reinterpret_cast<char *>(&(array[v++])), uSize );
-  //Run multiple loops, if requested
-  for (unsigned u = 0; u < loopCount; ++u) {
-    for (unsigned v = 0; v < uCount/10; ++v)
-      std::swap(array[get_index(uCount)], array[get_index(uCount)]);
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      //std::sort(&(array[0]), &(array[0]) + uCount);
-      std::sort(array.begin(), array.end());
-    else
-      //integer_sort(&(array[0]), &(array[0]) + uCount);
-      integer_sort(array.begin(), array.end());
-    end = clock();
-    elapsed = static_cast<double>(end - start) ;
-    std::ofstream ofile;
-    if (stdSort)
-      ofile.open("standard_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    else
-      ofile.open("boost_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    if (ofile.good()) {
-      for (unsigned v = 0; v < array.size(); ++v) {
-        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );
-      }
-      ofile.close();
-    }
-    if (u)
-      total += elapsed;
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// spreadsort on a mostly sorted array example.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <sstream>\r
+#include <iostream>\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE int\r
+\r
+unsigned\r
+get_index(unsigned count)\r
+{\r
+  unsigned result = unsigned((rand() % (1 << 16))*uint64_t(count)/(1 << 16));\r
+  if (result >= count || result < 0)\r
+    result = count - 1;\r
+  return result;\r
+}\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  srand(1);\r
+  size_t uCount,uSize=sizeof(DATA_TYPE);\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  //Sorts the data once, then times sorting of already-sorted data\r
+  loopCount += 1;\r
+  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);\r
+  if (input.fail()) {\r
+    printf("input.txt could not be opened\n");\r
+    return 1;\r
+  }\r
+  double total = 0.0;\r
+  std::vector<DATA_TYPE> array;\r
+  input.seekg (0, std::ios_base::end);\r
+    size_t length = input.tellg();\r
+  uCount = length/uSize;\r
+  input.seekg (0, std::ios_base::beg);\r
+  //Conversion to a vector\r
+  array.resize(uCount);\r
+  unsigned v = 0;\r
+  while (input.good() && v < uCount) // EOF or failure stops the reading\r
+    input.read(reinterpret_cast<char *>(&(array[v++])), uSize );\r
+  //Run multiple loops, if requested\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    for (unsigned v = 0; v < uCount/10; ++v)\r
+      std::swap(array[get_index(uCount)], array[get_index(uCount)]);\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      //std::sort(&(array[0]), &(array[0]) + uCount);\r
+      std::sort(array.begin(), array.end());\r
+    else\r
+      //integer_sort(&(array[0]), &(array[0]) + uCount);\r
+      integer_sort(array.begin(), array.end());\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start) ;\r
+    std::ofstream ofile;\r
+    if (stdSort)\r
+      ofile.open("standard_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      ofile.open("boost_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    if (ofile.good()) {\r
+      for (unsigned v = 0; v < array.size(); ++v) {\r
+        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );\r
+      }\r
+      ofile.close();\r
+    }\r
+    if (u)\r
+      total += elapsed;\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index e7806617c3e623b9f2b324c1d020913af45fbdd6..b925f494fe1745472f26d6e07567fb3e09b70d10 100644 (file)
-//  Benchmark for integer sorting speed across parallel threads.
-//
-//  Copyright Steven Ross 2014
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <boost/thread.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE int
-
-bool is_sorted(const std::vector<DATA_TYPE> &array) {
-  for (unsigned u = 0; u + 1 < array.size(); ++u) {
-    if (array[u] > array[u + 1]) {
-      return false;
-    }
-  }
-  return true;
-}
-
-void sort_loop(const std::vector<DATA_TYPE> &base_array, bool stdSort, 
-               unsigned loopCount) {
-  std::vector<DATA_TYPE> array(base_array);
-  for (unsigned u = 0; u < loopCount; ++u) {
-    for (unsigned v = 0; v < base_array.size(); ++v) {
-      array[v] = base_array[v];
-    }
-    if (stdSort)
-      std::sort(array.begin(), array.end());
-    else
-      boost::sort::spreadsort::spreadsort(array.begin(), array.end());
-    if (!is_sorted(array)) {
-      fprintf(stderr, "sort failed!\n");
-      exit(1);
-    }
-  }
-}
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  size_t uCount,uSize=sizeof(DATA_TYPE);
-  bool stdSort = false;
-  int threadCount = -1;
-  unsigned loopCount = 0;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else if(threadCount < 0)
-      threadCount = atoi(argv[u]);
-    else
-      loopCount = atoi(argv[u]);
-  }
-  if (!loopCount) {
-    loopCount = 1;
-  }
-  printf("threads: %d loops: %d\n", threadCount, loopCount);
-
-  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);
-  if (input.fail()) {
-    printf("input.txt could not be opened\n");
-    return 1;
-  }
-  std::vector<DATA_TYPE> base_array;
-  input.seekg (0, std::ios_base::end);
-  size_t length = input.tellg();
-  uCount = length/uSize;
-  input.seekg (0, std::ios_base::beg);
-  //Conversion to a vector
-  base_array.resize(uCount);
-  unsigned v = 0;
-  while (input.good() && v < uCount)
-    input.read(reinterpret_cast<char *>(&(base_array[v++])), uSize );
-  input.close();
-  if (v < uCount)
-    base_array.resize(v);
-  //Run multiple loops, if requested
-  clock_t start, end;
-  double elapsed;
-  std::vector<boost::thread *> workers;
-  start = clock();
-  if (threadCount == 0) {
-    sort_loop(base_array, stdSort, loopCount);
-  } else {
-    for (int i = 0; i < threadCount; ++i) {
-      workers.push_back(new boost::thread(sort_loop, base_array, stdSort, 
-                                          loopCount));
-    }
-    for (int i = 0; i < threadCount; ++i) {
-      workers[i]->join();
-      delete workers[i];
-    }
-  }
-  end = clock();
-  elapsed = static_cast<double>(end - start) ;
-  
-  if (stdSort)
-    printf("std::sort clock time %lf\n", elapsed/CLOCKS_PER_SEC/threadCount);
-  else
-    printf("spreadsort clock time %lf\n", elapsed/CLOCKS_PER_SEC/threadCount);
-  return 0;
-}
+//  Benchmark for integer sorting speed across parallel threads.\r
+//\r
+//  Copyright Steven Ross 2014\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <boost/thread.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <sstream>\r
+#include <iostream>\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE int\r
+\r
+bool is_sorted(const std::vector<DATA_TYPE> &array) {\r
+  for (unsigned u = 0; u + 1 < array.size(); ++u) {\r
+    if (array[u] > array[u + 1]) {\r
+      return false;\r
+    }\r
+  }\r
+  return true;\r
+}\r
+\r
+void sort_loop(const std::vector<DATA_TYPE> &base_array, bool stdSort, \r
+               unsigned loopCount) {\r
+  std::vector<DATA_TYPE> array(base_array);\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    for (unsigned v = 0; v < base_array.size(); ++v) {\r
+      array[v] = base_array[v];\r
+    }\r
+    if (stdSort)\r
+      std::sort(array.begin(), array.end());\r
+    else\r
+      boost::sort::spreadsort::spreadsort(array.begin(), array.end());\r
+    if (!is_sorted(array)) {\r
+      fprintf(stderr, "sort failed!\n");\r
+      exit(1);\r
+    }\r
+  }\r
+}\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  size_t uCount,uSize=sizeof(DATA_TYPE);\r
+  bool stdSort = false;\r
+  int threadCount = -1;\r
+  unsigned loopCount = 0;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else if(threadCount < 0)\r
+      threadCount = atoi(argv[u]);\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  if (!loopCount) {\r
+    loopCount = 1;\r
+  }\r
+  printf("threads: %d loops: %d\n", threadCount, loopCount);\r
+\r
+  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);\r
+  if (input.fail()) {\r
+    printf("input.txt could not be opened\n");\r
+    return 1;\r
+  }\r
+  std::vector<DATA_TYPE> base_array;\r
+  input.seekg (0, std::ios_base::end);\r
+  size_t length = input.tellg();\r
+  uCount = length/uSize;\r
+  input.seekg (0, std::ios_base::beg);\r
+  //Conversion to a vector\r
+  base_array.resize(uCount);\r
+  unsigned v = 0;\r
+  while (input.good() && v < uCount)\r
+    input.read(reinterpret_cast<char *>(&(base_array[v++])), uSize );\r
+  input.close();\r
+  if (v < uCount)\r
+    base_array.resize(v);\r
+  //Run multiple loops, if requested\r
+  clock_t start, end;\r
+  double elapsed;\r
+  std::vector<boost::thread *> workers;\r
+  start = clock();\r
+  if (threadCount == 0) {\r
+    sort_loop(base_array, stdSort, loopCount);\r
+  } else {\r
+    for (int i = 0; i < threadCount; ++i) {\r
+      workers.push_back(new boost::thread(sort_loop, base_array, stdSort, \r
+                                          loopCount));\r
+    }\r
+    for (int i = 0; i < threadCount; ++i) {\r
+      workers[i]->join();\r
+      delete workers[i];\r
+    }\r
+  }\r
+  end = clock();\r
+  elapsed = static_cast<double>(end - start) ;\r
+  \r
+  if (stdSort)\r
+    printf("std::sort clock time %lf\n", elapsed/CLOCKS_PER_SEC/threadCount);\r
+  else\r
+    printf("spreadsort clock time %lf\n", elapsed/CLOCKS_PER_SEC/threadCount);\r
+  return 0;\r
+}\r
index fb86604aae98a3b7b39a490bab7f61e0166f742d..f710802bf9026f1bd9e851dcaf5b9fb92450f476 100644 (file)
-//  Benchmark for integer sorting speed across parallel threads.
-//
-//  Copyright Steven Ross 2014
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/random/uniform_int_distribution.hpp>
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <boost/thread.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <string>
-using std::string;
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE string
-
-static bool is_sorted(const std::vector<DATA_TYPE> &array) {
-  for (unsigned u = 0; u + 1 < array.size(); ++u) {
-    if (array[u] > array[u + 1]) {
-      return false;
-    }
-  }
-  return true;
-}
-
-static void sort_core(std::vector<DATA_TYPE> &array, bool stdSort,
-               unsigned loopCount) {
-  if (stdSort)
-    std::sort(array.begin(), array.end());
-  else
-    boost::sort::spreadsort::spreadsort(array.begin(), array.end());
-  if (!is_sorted(array)) {
-    fprintf(stderr, "sort failed!\n");
-    exit(1);
-  }
-}
-
-static void sort_loop(const std::vector<DATA_TYPE> &base_array, bool stdSort,
-               unsigned loopCount) {
-  std::vector<DATA_TYPE> array(base_array);
-  for (unsigned u = 0; u < loopCount; ++u) {
-    for (unsigned v = 0; v < base_array.size(); ++v) {
-      array[v] = base_array[v];
-    }
-    sort_core(array, stdSort, loopCount);
-  }
-}
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  std::ifstream indata;
-  std::ofstream outfile;
-  bool stdSort = false;
-  int constant_to_random_ratio = -1;
-  int threadCount = -1;
-  unsigned loopCount = 0;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else if(threadCount < 0)
-      threadCount = atoi(argv[u]);
-    else if (!loopCount)
-      loopCount = atoi(argv[u]);
-    else
-      constant_to_random_ratio = atoi(argv[u]);
-  }
-  if (!loopCount) {
-    loopCount = 1;
-  }
-  printf("threads: %d loops: %d\n", threadCount, loopCount);
-
-  std::vector<DATA_TYPE> base_array;
-  if (constant_to_random_ratio >= 0) {
-    //Test for random data with gaps of identical data.
-    random::mt19937 generator;
-    random::uniform_int_distribution<int> distribution(0,255);
-    const int constant_to_random_count = 1000000;
-    const int string_length = 1000;
-    for (int i = 0; i < constant_to_random_count; ++i) {
-      DATA_TYPE temp(string_length, 'x');  // fill with default character.
-      for (int j = constant_to_random_ratio; j < string_length;) {
-        int val = distribution(generator);
-        temp[j] = val;
-        j += (val * constant_to_random_ratio)/128 + 1;
-      }
-      base_array.push_back(temp);
-    }
-  } else {
-    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);
-    if (indata.bad()) {
-      printf("input.txt could not be opened\n");
-      return 1;
-    }
-    DATA_TYPE inval;
-    while (!indata.eof() ) {
-      indata >> inval;
-      base_array.push_back(inval);
-    }
-  }
-
-  // Sort the input
-  clock_t start, end;
-  double elapsed;
-  std::vector<boost::thread *> workers;
-  start = clock();
-  if (threadCount == 0) {
-    if (loopCount > 1) {
-      sort_loop(base_array, stdSort, loopCount);
-    } else {
-      sort_core(base_array, stdSort, loopCount);
-    }
-    threadCount = 1;
-  } else {
-    for (int i = 0; i < threadCount; ++i) {
-      workers.push_back(new boost::thread(sort_loop, base_array, stdSort,
-                                          loopCount));
-    }
-    for (int i = 0; i < threadCount; ++i) {
-      workers[i]->join();
-      delete workers[i];
-    }
-  }
-  end = clock();
-  elapsed = static_cast<double>(end - start) ;
-
-  printf("for %lu strings\n", base_array.size());
-  if (stdSort)
-    printf("std::sort clock time %lf\n", elapsed/CLOCKS_PER_SEC/threadCount);
-  else
-    printf("spreadsort clock time %lf\n", elapsed/CLOCKS_PER_SEC/threadCount);
-  return 0;
-}
+//  Benchmark for integer sorting speed across parallel threads.\r
+//\r
+//  Copyright Steven Ross 2014\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/random/mersenne_twister.hpp>\r
+#include <boost/random/uniform_int_distribution.hpp>\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <boost/thread.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <iostream>\r
+#include <fstream>\r
+#include <string>\r
+using std::string;\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE string\r
+\r
+static bool is_sorted(const std::vector<DATA_TYPE> &array) {\r
+  for (unsigned u = 0; u + 1 < array.size(); ++u) {\r
+    if (array[u] > array[u + 1]) {\r
+      return false;\r
+    }\r
+  }\r
+  return true;\r
+}\r
+\r
+static void sort_core(std::vector<DATA_TYPE> &array, bool stdSort,\r
+               unsigned loopCount) {\r
+  if (stdSort)\r
+    std::sort(array.begin(), array.end());\r
+  else\r
+    boost::sort::spreadsort::spreadsort(array.begin(), array.end());\r
+  if (!is_sorted(array)) {\r
+    fprintf(stderr, "sort failed!\n");\r
+    exit(1);\r
+  }\r
+}\r
+\r
+static void sort_loop(const std::vector<DATA_TYPE> &base_array, bool stdSort,\r
+               unsigned loopCount) {\r
+  std::vector<DATA_TYPE> array(base_array);\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    for (unsigned v = 0; v < base_array.size(); ++v) {\r
+      array[v] = base_array[v];\r
+    }\r
+    sort_core(array, stdSort, loopCount);\r
+  }\r
+}\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  std::ifstream indata;\r
+  std::ofstream outfile;\r
+  bool stdSort = false;\r
+  int constant_to_random_ratio = -1;\r
+  int threadCount = -1;\r
+  unsigned loopCount = 0;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else if(threadCount < 0)\r
+      threadCount = atoi(argv[u]);\r
+    else if (!loopCount)\r
+      loopCount = atoi(argv[u]);\r
+    else\r
+      constant_to_random_ratio = atoi(argv[u]);\r
+  }\r
+  if (!loopCount) {\r
+    loopCount = 1;\r
+  }\r
+  printf("threads: %d loops: %d\n", threadCount, loopCount);\r
+\r
+  std::vector<DATA_TYPE> base_array;\r
+  if (constant_to_random_ratio >= 0) {\r
+    //Test for random data with gaps of identical data.\r
+    random::mt19937 generator;\r
+    random::uniform_int_distribution<int> distribution(0,255);\r
+    const int constant_to_random_count = 1000000;\r
+    const int string_length = 1000;\r
+    for (int i = 0; i < constant_to_random_count; ++i) {\r
+      DATA_TYPE temp(string_length, 'x');  // fill with default character.\r
+      for (int j = constant_to_random_ratio; j < string_length;) {\r
+        int val = distribution(generator);\r
+        temp[j] = val;\r
+        j += (val * constant_to_random_ratio)/128 + 1;\r
+      }\r
+      base_array.push_back(temp);\r
+    }\r
+  } else {\r
+    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);\r
+    if (indata.bad()) {\r
+      printf("input.txt could not be opened\n");\r
+      return 1;\r
+    }\r
+    DATA_TYPE inval;\r
+    while (!indata.eof() ) {\r
+      indata >> inval;\r
+      base_array.push_back(inval);\r
+    }\r
+  }\r
+\r
+  // Sort the input\r
+  clock_t start, end;\r
+  double elapsed;\r
+  std::vector<boost::thread *> workers;\r
+  start = clock();\r
+  if (threadCount == 0) {\r
+    if (loopCount > 1) {\r
+      sort_loop(base_array, stdSort, loopCount);\r
+    } else {\r
+      sort_core(base_array, stdSort, loopCount);\r
+    }\r
+    threadCount = 1;\r
+  } else {\r
+    for (int i = 0; i < threadCount; ++i) {\r
+      workers.push_back(new boost::thread(sort_loop, base_array, stdSort,\r
+                                          loopCount));\r
+    }\r
+    for (int i = 0; i < threadCount; ++i) {\r
+      workers[i]->join();\r
+      delete workers[i];\r
+    }\r
+  }\r
+  end = clock();\r
+  elapsed = static_cast<double>(end - start) ;\r
+\r
+  printf("for %lu strings\n", base_array.size());\r
+  if (stdSort)\r
+    printf("std::sort clock time %lf\n", elapsed/CLOCKS_PER_SEC/threadCount);\r
+  else\r
+    printf("spreadsort clock time %lf\n", elapsed/CLOCKS_PER_SEC/threadCount);\r
+  return 0;\r
+}\r
index aaa1f8505a5a878b36f0d0a36147c89c08e7b40c..661435ecf29059eeb5d67b2907ef83d7d78a5f8a 100644 (file)
@@ -1,69 +1,69 @@
-// flexible random number generator providing multiple distributions.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/random/uniform_int_distribution.hpp>
-#include <stdio.h>
-#include "stdlib.h"
-#include <fstream>
-#include <iostream>
-using namespace boost;
-
-int main(int argc, const char ** argv) {
-  random::mt19937 generator;
-  random::uniform_int_distribution<unsigned> distribution;
-  //defaults
-  unsigned high_shift = 16;
-  unsigned low_shift = 16;
-  unsigned count = 1000000;
-  //Reading in user arguments
-  if (argc > 1)
-    high_shift = atoi(argv[1]);
-  if (argc > 2)
-    low_shift = atoi(argv[2]);
-  if (argc > 3)
-    count = atoi(argv[3]);
-  if (high_shift > 16)
-    high_shift = 16;
-  if (low_shift > 16)
-    low_shift = 16;
-  std::ofstream ofile;
-  ofile.open("input.txt", std::ios_base::out | std::ios_base::binary |
-             std::ios_base::trunc);
-  if (ofile.bad()) {
-    printf("could not open input.txt for writing!\n");
-    return 1;
-  }
-  //buffering file output for speed
-  unsigned uDivideFactor = 1000;
-  //Skipping buffering for small files
-  if (count < uDivideFactor * 100)
-    uDivideFactor = count;
-  unsigned * pNumbers = static_cast<unsigned *>(malloc(uDivideFactor * 
-                                                       sizeof(unsigned)));
-  //Generating semirandom numbers
-  unsigned mask = 0;
-  unsigned one = 1;
-  for (unsigned u = 0; u < low_shift; ++u) {
-    mask += one << u;
-  }
-  for (unsigned u = 0; u < high_shift; ++u) {
-    mask += one << (16 + u);
-  }
-  for (unsigned u = 0; u < count/uDivideFactor; ++u) {
-    unsigned i = 0;
-    for (; i< uDivideFactor; ++i) {
-      pNumbers[i] = distribution(generator) & mask;
-    }
-    ofile.write(reinterpret_cast<char *>(pNumbers), uDivideFactor * 4 );
-  }
-  ofile.close();
-  return 0;
-}
+// flexible random number generator providing multiple distributions.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/random/mersenne_twister.hpp>\r
+#include <boost/random/uniform_int_distribution.hpp>\r
+#include <stdio.h>\r
+#include "stdlib.h"\r
+#include <fstream>\r
+#include <iostream>\r
+using namespace boost;\r
+\r
+int main(int argc, const char ** argv) {\r
+  random::mt19937 generator;\r
+  random::uniform_int_distribution<unsigned> distribution;\r
+  //defaults\r
+  unsigned high_shift = 16;\r
+  unsigned low_shift = 16;\r
+  unsigned count = 1000000;\r
+  //Reading in user arguments\r
+  if (argc > 1)\r
+    high_shift = atoi(argv[1]);\r
+  if (argc > 2)\r
+    low_shift = atoi(argv[2]);\r
+  if (argc > 3)\r
+    count = atoi(argv[3]);\r
+  if (high_shift > 16)\r
+    high_shift = 16;\r
+  if (low_shift > 16)\r
+    low_shift = 16;\r
+  std::ofstream ofile;\r
+  ofile.open("input.txt", std::ios_base::out | std::ios_base::binary |\r
+             std::ios_base::trunc);\r
+  if (ofile.bad()) {\r
+    printf("could not open input.txt for writing!\n");\r
+    return 1;\r
+  }\r
+  //buffering file output for speed\r
+  unsigned uDivideFactor = 1000;\r
+  //Skipping buffering for small files\r
+  if (count < uDivideFactor * 100)\r
+    uDivideFactor = count;\r
+  unsigned * pNumbers = static_cast<unsigned *>(malloc(uDivideFactor * \r
+                                                       sizeof(unsigned)));\r
+  //Generating semirandom numbers\r
+  unsigned mask = 0;\r
+  unsigned one = 1;\r
+  for (unsigned u = 0; u < low_shift; ++u) {\r
+    mask += one << u;\r
+  }\r
+  for (unsigned u = 0; u < high_shift; ++u) {\r
+    mask += one << (16 + u);\r
+  }\r
+  for (unsigned u = 0; u < count/uDivideFactor; ++u) {\r
+    unsigned i = 0;\r
+    for (; i< uDivideFactor; ++i) {\r
+      pNumbers[i] = distribution(generator) & mask;\r
+    }\r
+    ofile.write(reinterpret_cast<char *>(pNumbers), uDivideFactor * 4 );\r
+  }\r
+  ofile.close();\r
+  return 0;\r
+}\r
index c4777be9388f4803b0ff6828141f2f8fce2de201..fe31edf8cc78bb8db310949181171067ea73ac0d 100644 (file)
-//! \file
-//! \brief integer sort with a rightshift functor reverse sorting example.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-// Caution: this file contains Quickbook markup as well as code
-// and comments, don't change any of the special comment markups!
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <functional>
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE int
-
-struct negrightshift {
-  inline int operator()(const int &x, const unsigned offset) {
-    return -(x >> offset);
-  }
-};
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  size_t uCount,uSize=sizeof(DATA_TYPE);
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);
-  if (input.fail()) {
-    printf("input.txt could not be opened\n");
-    return 1;
-  }
-  double total = 0.0;
-  std::vector<DATA_TYPE> array;
-  input.seekg (0, std::ios_base::end);
-    size_t length = input.tellg();
-  uCount = length/uSize;
-  //Run multiple loops, if requested
-  for (unsigned u = 0; u < loopCount; ++u) {
-    input.seekg (0, std::ios_base::beg);
-    //Conversion to a vector
-    array.resize(uCount);
-    unsigned v = 0;
-    while (input.good() && v < uCount)
-      input.read(reinterpret_cast<char *>(&(array[v++])), uSize );
-    if (v < uCount)
-      array.resize(v);
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-
-//[reverse_int_1
-      std::sort(array.begin(), array.end(), std::greater<DATA_TYPE>());
-//] [/reverse_int_1]
-    else
-//[reverse_int_2
-      integer_sort(array.begin(), array.end(), negrightshift(), std::greater<DATA_TYPE>());
-//] [/reverse_int_2]
-    end = clock();
-    elapsed = static_cast<double>(end - start) ;
-    std::ofstream ofile;
-    if (stdSort)
-      ofile.open("standard_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    else
-      ofile.open("boost_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    if (ofile.good()) {
-      for (unsigned v = 0; v < array.size(); ++v) {
-        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]));
-      }
-      ofile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+//! \file\r
+//! \brief integer sort with a rightshift functor reverse sorting example.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+// Caution: this file contains Quickbook markup as well as code\r
+// and comments, don't change any of the special comment markups!\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <iostream>\r
+#include <functional>\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE int\r
+\r
+struct negrightshift {\r
+  inline int operator()(const int &x, const unsigned offset) {\r
+    return -(x >> offset);\r
+  }\r
+};\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  size_t uCount,uSize=sizeof(DATA_TYPE);\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);\r
+  if (input.fail()) {\r
+    printf("input.txt could not be opened\n");\r
+    return 1;\r
+  }\r
+  double total = 0.0;\r
+  std::vector<DATA_TYPE> array;\r
+  input.seekg (0, std::ios_base::end);\r
+    size_t length = input.tellg();\r
+  uCount = length/uSize;\r
+  //Run multiple loops, if requested\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    input.seekg (0, std::ios_base::beg);\r
+    //Conversion to a vector\r
+    array.resize(uCount);\r
+    unsigned v = 0;\r
+    while (input.good() && v < uCount)\r
+      input.read(reinterpret_cast<char *>(&(array[v++])), uSize );\r
+    if (v < uCount)\r
+      array.resize(v);\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+\r
+//[reverse_int_1\r
+      std::sort(array.begin(), array.end(), std::greater<DATA_TYPE>());\r
+//] [/reverse_int_1]\r
+    else\r
+//[reverse_int_2\r
+      integer_sort(array.begin(), array.end(), negrightshift(), std::greater<DATA_TYPE>());\r
+//] [/reverse_int_2]\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start) ;\r
+    std::ofstream ofile;\r
+    if (stdSort)\r
+      ofile.open("standard_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      ofile.open("boost_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    if (ofile.good()) {\r
+      for (unsigned v = 0; v < array.size(); ++v) {\r
+        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]));\r
+      }\r
+      ofile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index 6066f2814bd737938adaa120ffce150911d39c28..62c6c9491ca0502bbec38d8b1f8424f19229ea0e 100644 (file)
-// spreadsort string functor reverse sorting example.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/string_sort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <string>
-using std::string;
-using namespace boost::sort::spreadsort;
-
-struct DATA_TYPE {
-    string a;
-    };
-
-struct greaterthan {
-  inline bool operator()(const DATA_TYPE &x, const DATA_TYPE &y) const {
-    return x.a > y.a;
-  }
-};
-
-struct bracket {
-  inline unsigned char operator()(const DATA_TYPE &x, size_t offset) const {
-    return x.a[offset];
-  }
-};
-
-struct getsize {
-  inline size_t operator()(const DATA_TYPE &x) const{ return x.a.size(); }
-};
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  std::ifstream indata;
-  std::ofstream outfile;
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  double total = 0.0;
-  //Run multiple loops, if requested
-  std::vector<DATA_TYPE> array;
-  for (unsigned u = 0; u < loopCount; ++u) {
-    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);  
-    if (!indata) {
-      printf("input.txt could not be opened\n");
-      return 1;
-    }
-    DATA_TYPE inval;
-    indata >> inval.a;
-    while (!indata.eof() ) {
-      array.push_back(inval);
-      //Inserting embedded nulls and empty strings
-      if (!(array.size() % 100)) {
-        if (inval.a.empty() || !(array.size() % 1000)) {
-          inval.a = "";
-          array.push_back(inval);
-        }
-        else {
-          inval.a[0] = '\0';
-          array.push_back(inval);
-        }
-      }
-      indata >> inval.a;
-    }
-      
-    indata.close();
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      std::sort(array.begin(), array.end(), greaterthan());
-    else
-      reverse_string_sort(array.begin(), array.end(), bracket(), getsize(),
-                          greaterthan());
-    end = clock();
-    elapsed = static_cast<double>(end - start);
-    if (stdSort)
-      outfile.open("standard_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    else
-      outfile.open("boost_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    if (outfile.good()) {
-      for (unsigned u = 0; u < array.size(); ++u)
-        outfile << array[u].a << "\n";
-      outfile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// spreadsort string functor reverse sorting example.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/string_sort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <iostream>\r
+#include <fstream>\r
+#include <string>\r
+using std::string;\r
+using namespace boost::sort::spreadsort;\r
+\r
+struct DATA_TYPE {\r
+    string a;\r
+    };\r
+\r
+struct greaterthan {\r
+  inline bool operator()(const DATA_TYPE &x, const DATA_TYPE &y) const {\r
+    return x.a > y.a;\r
+  }\r
+};\r
+\r
+struct bracket {\r
+  inline unsigned char operator()(const DATA_TYPE &x, size_t offset) const {\r
+    return x.a[offset];\r
+  }\r
+};\r
+\r
+struct getsize {\r
+  inline size_t operator()(const DATA_TYPE &x) const{ return x.a.size(); }\r
+};\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  std::ifstream indata;\r
+  std::ofstream outfile;\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  double total = 0.0;\r
+  //Run multiple loops, if requested\r
+  std::vector<DATA_TYPE> array;\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);  \r
+    if (!indata) {\r
+      printf("input.txt could not be opened\n");\r
+      return 1;\r
+    }\r
+    DATA_TYPE inval;\r
+    indata >> inval.a;\r
+    while (!indata.eof() ) {\r
+      array.push_back(inval);\r
+      //Inserting embedded nulls and empty strings\r
+      if (!(array.size() % 100)) {\r
+        if (inval.a.empty() || !(array.size() % 1000)) {\r
+          inval.a = "";\r
+          array.push_back(inval);\r
+        }\r
+        else {\r
+          inval.a[0] = '\0';\r
+          array.push_back(inval);\r
+        }\r
+      }\r
+      indata >> inval.a;\r
+    }\r
+      \r
+    indata.close();\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      std::sort(array.begin(), array.end(), greaterthan());\r
+    else\r
+      reverse_string_sort(array.begin(), array.end(), bracket(), getsize(),\r
+                          greaterthan());\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start);\r
+    if (stdSort)\r
+      outfile.open("standard_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      outfile.open("boost_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    if (outfile.good()) {\r
+      for (unsigned u = 0; u < array.size(); ++u)\r
+        outfile << array[u].a << "\n";\r
+      outfile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index 9fa04c4631ec15e279b658389651d523d1b9b1a6..89cf9c1e8c132f4f131f084c46ca0cb307925be3 100644 (file)
@@ -1,98 +1,98 @@
-// spreadsort reverse string sorting example.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/string_sort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <string>
-using std::string;
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE string
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  std::ifstream indata;
-  std::ofstream outfile;
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  double total = 0.0;
-  //Run multiple loops, if requested
-  std::vector<DATA_TYPE> array;
-  for (unsigned u = 0; u < loopCount; ++u) {
-    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);  
-    if (!indata) {
-      printf("input.txt could not be opened\n");
-      return 1;
-    }
-    DATA_TYPE inval;
-    indata >> inval;
-    while (!indata.eof() ) {
-      //testing substrings
-      if (!(array.size() % 2))
-        inval = "prefix" + inval;
-      else
-        inval += "suffix";
-      array.push_back(inval);
-      //Inserting embedded nulls and empty strings
-      if (!(array.size() % 100)) {
-        if (inval.empty() || !(array.size() % 1000))
-          array.push_back("");
-        else {
-          inval[0] = '\0';
-          array.push_back(inval);
-        }
-      }
-      indata >> inval;
-    }
-      
-    indata.close();
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      //std::sort(&(array[0]), &(array[0]) + uCount);
-      std::sort(array.begin(), array.end(), std::greater<string>());
-    else
-      //string_sort(&(array[0]), &(array[0]) + uCount);
-      reverse_string_sort(array.begin(), array.end(), std::greater<string>());
-    end = clock();
-    elapsed = static_cast<double>(end - start);
-    if (stdSort)
-      outfile.open("standard_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    else
-      outfile.open("boost_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    if (outfile.good()) {
-      for (unsigned u = 0; u < array.size(); ++u)
-        outfile << array[u] << "\n";
-      outfile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// spreadsort reverse string sorting example.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/string_sort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <iostream>\r
+#include <fstream>\r
+#include <string>\r
+using std::string;\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE string\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  std::ifstream indata;\r
+  std::ofstream outfile;\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  double total = 0.0;\r
+  //Run multiple loops, if requested\r
+  std::vector<DATA_TYPE> array;\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);  \r
+    if (!indata) {\r
+      printf("input.txt could not be opened\n");\r
+      return 1;\r
+    }\r
+    DATA_TYPE inval;\r
+    indata >> inval;\r
+    while (!indata.eof() ) {\r
+      //testing substrings\r
+      if (!(array.size() % 2))\r
+        inval = "prefix" + inval;\r
+      else\r
+        inval += "suffix";\r
+      array.push_back(inval);\r
+      //Inserting embedded nulls and empty strings\r
+      if (!(array.size() % 100)) {\r
+        if (inval.empty() || !(array.size() % 1000))\r
+          array.push_back("");\r
+        else {\r
+          inval[0] = '\0';\r
+          array.push_back(inval);\r
+        }\r
+      }\r
+      indata >> inval;\r
+    }\r
+      \r
+    indata.close();\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      //std::sort(&(array[0]), &(array[0]) + uCount);\r
+      std::sort(array.begin(), array.end(), std::greater<string>());\r
+    else\r
+      //string_sort(&(array[0]), &(array[0]) + uCount);\r
+      reverse_string_sort(array.begin(), array.end(), std::greater<string>());\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start);\r
+    if (stdSort)\r
+      outfile.open("standard_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      outfile.open("boost_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    if (outfile.good()) {\r
+      for (unsigned u = 0; u < array.size(); ++u)\r
+        outfile << array[u] << "\n";\r
+      outfile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index 33da64f73f7ead2e792871342616a1dea1e0d9ca..91cebc31c78488e18c28b6d58403762ffe816a5d 100644 (file)
@@ -1,98 +1,98 @@
-//! \brief Integer sort with a rightshift functor sorting example.
-//! \file
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-// Caution: this file contains Quickbook markup as well as code
-// and comments, don't change any of the special comment markups!
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <iostream>
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE int
-
-//[rightshift_int_functor
-struct rightshift {
-  inline int operator()(DATA_TYPE x, unsigned offset) { return x >> offset; }
-};
-//] [/rightshift_int_functor]
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  size_t uCount,uSize=sizeof(DATA_TYPE);
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);
-  if (input.fail()) {
-    printf("input.txt could not be opened\n");
-    return 1;
-  }
-  double total = 0.0;
-  std::vector<DATA_TYPE> array;
-  input.seekg (0, std::ios_base::end);
-    size_t length = input.tellg();
-  uCount = length/uSize;
-  //Run multiple loops, if requested
-  for (unsigned u = 0; u < loopCount; ++u) {
-    input.seekg (0, std::ios_base::beg);
-    //Conversion to a vector
-    array.resize(uCount);
-    unsigned v = 0;
-    while (input.good() && v < uCount)
-      input.read(reinterpret_cast<char *>(&(array[v++])), uSize );
-    if (v < uCount)
-      array.resize(v);
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort) {
-      std::sort(array.begin(), array.end());
-    } else {
-//[rightshift_1
-      integer_sort(array.begin(), array.end(), rightshift());
-//] [/rightshift_1]
-    }
-    end = clock();
-    elapsed = static_cast<double>(end - start) ;
-    std::ofstream ofile;
-    if (stdSort)
-      ofile.open("standard_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    else
-      ofile.open("boost_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    if (ofile.good()) {
-      for (unsigned v = 0; v < array.size(); ++v) {
-        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );
-      }
-      ofile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+//! \brief Integer sort with a rightshift functor sorting example.\r
+//! \file\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+// Caution: this file contains Quickbook markup as well as code\r
+// and comments, don't change any of the special comment markups!\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <iostream>\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE int\r
+\r
+//[rightshift_int_functor\r
+struct rightshift {\r
+  inline int operator()(DATA_TYPE x, unsigned offset) { return x >> offset; }\r
+};\r
+//] [/rightshift_int_functor]\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  size_t uCount,uSize=sizeof(DATA_TYPE);\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);\r
+  if (input.fail()) {\r
+    printf("input.txt could not be opened\n");\r
+    return 1;\r
+  }\r
+  double total = 0.0;\r
+  std::vector<DATA_TYPE> array;\r
+  input.seekg (0, std::ios_base::end);\r
+    size_t length = input.tellg();\r
+  uCount = length/uSize;\r
+  //Run multiple loops, if requested\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    input.seekg (0, std::ios_base::beg);\r
+    //Conversion to a vector\r
+    array.resize(uCount);\r
+    unsigned v = 0;\r
+    while (input.good() && v < uCount)\r
+      input.read(reinterpret_cast<char *>(&(array[v++])), uSize );\r
+    if (v < uCount)\r
+      array.resize(v);\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort) {\r
+      std::sort(array.begin(), array.end());\r
+    } else {\r
+//[rightshift_1\r
+      integer_sort(array.begin(), array.end(), rightshift());\r
+//] [/rightshift_1]\r
+    }\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start) ;\r
+    std::ofstream ofile;\r
+    if (stdSort)\r
+      ofile.open("standard_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      ofile.open("boost_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    if (ofile.good()) {\r
+      for (unsigned v = 0; v < array.size(); ++v) {\r
+        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );\r
+      }\r
+      ofile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index 1da89368b68fdf2a9aed1214b7e2ecaafce2c52c..9d7b751891ff643d5b09531f89f1ba2ae00b519d 100644 (file)
@@ -1,88 +1,88 @@
-// spreadsort sorting example
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE int
-
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  size_t uCount,uSize=sizeof(DATA_TYPE);
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);
-  if (input.fail()) {
-    printf("input.txt could not be opened\n");
-    return 1;
-  }
-  double total = 0.0;
-  std::vector<DATA_TYPE> array;
-  input.seekg (0, std::ios_base::end);
-    size_t length = input.tellg();
-  uCount = length/uSize;
-  //Run multiple loops, if requested
-  for (unsigned u = 0; u < loopCount; ++u) {
-    input.seekg (0, std::ios_base::beg);
-    //Conversion to a vector
-    array.resize(uCount);
-    unsigned v = 0;
-    while (input.good() && v < uCount)
-      input.read(reinterpret_cast<char *>(&(array[v++])), uSize );
-    if (v < uCount)
-      array.resize(v);
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      std::sort(array.begin(), array.end());
-    else
-      boost::sort::spreadsort::spreadsort(array.begin(), array.end());
-    end = clock();
-    elapsed = static_cast<double>(end - start);
-    std::ofstream ofile;
-    if (stdSort)
-      ofile.open("standard_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    else
-      ofile.open("boost_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    if (ofile.good()) {
-      for (unsigned v = 0; v < array.size(); ++v) {
-        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );
-      }
-      ofile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  input.close();
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// spreadsort sorting example\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <sstream>\r
+#include <iostream>\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE int\r
+\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  size_t uCount,uSize=sizeof(DATA_TYPE);\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);\r
+  if (input.fail()) {\r
+    printf("input.txt could not be opened\n");\r
+    return 1;\r
+  }\r
+  double total = 0.0;\r
+  std::vector<DATA_TYPE> array;\r
+  input.seekg (0, std::ios_base::end);\r
+    size_t length = input.tellg();\r
+  uCount = length/uSize;\r
+  //Run multiple loops, if requested\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    input.seekg (0, std::ios_base::beg);\r
+    //Conversion to a vector\r
+    array.resize(uCount);\r
+    unsigned v = 0;\r
+    while (input.good() && v < uCount)\r
+      input.read(reinterpret_cast<char *>(&(array[v++])), uSize );\r
+    if (v < uCount)\r
+      array.resize(v);\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      std::sort(array.begin(), array.end());\r
+    else\r
+      boost::sort::spreadsort::spreadsort(array.begin(), array.end());\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start);\r
+    std::ofstream ofile;\r
+    if (stdSort)\r
+      ofile.open("standard_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      ofile.open("boost_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    if (ofile.good()) {\r
+      for (unsigned v = 0; v < array.size(); ++v) {\r
+        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );\r
+      }\r
+      ofile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  input.close();\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index 5f752745dd18a127d5444a87bb42efea856e5d49..5488688c985ab53d6d689848d1d2da287e1975ec 100644 (file)
-// float_sort rightshift functor sorting example
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <iostream>
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE float
-#define CAST_TYPE int
-
-//Casting to an integer before bitshifting
-struct rightshift {
-  inline int operator()(const DATA_TYPE &x, const unsigned offset) const {
-    return float_mem_cast<DATA_TYPE, int>(x) >> offset;
-  }
-};
-
-
-//Pass in an argument to test std::sort
-//Note that this converts NaNs and -0.0 to 0.0, so that sorting results are
-//identical every time
-int main(int argc, const char ** argv) {
-  size_t uCount,uSize=sizeof(DATA_TYPE);
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);
-  if (input.fail()) {
-    printf("input.txt could not be opened\n");
-    return 1;
-  }
-  double total = 0.0;
-  std::vector<DATA_TYPE> array;
-  input.seekg (0, std::ios_base::end);
-    size_t length = input.tellg();
-  uCount = length/uSize;
-  //Run multiple loops, if requested
-  for (unsigned u = 0; u < loopCount; ++u) {
-    input.seekg (0, std::ios_base::beg);
-    //Conversion to a vector
-    array.resize(uCount);
-    unsigned v = 0;
-    while (input.good() && v < uCount) {
-      input.read(reinterpret_cast<char *>(&(array[v])), uSize );
-     //Testcase doesn't sort NaNs; they just cause confusion
-     if (!(array[v] < 0.0) && !(0.0 < array[v]))
-      array[v] = 0.0;
-     //Checking for denormalized numbers
-     if (!(float_mem_cast<float, int>(array[v]) & 0x7f800000)) {
-       //Make the top exponent bit high
-       CAST_TYPE temp = 0x40000000 | float_mem_cast<float, int>(array[v]);
-       memcpy(&(array[v]), &temp, sizeof(DATA_TYPE));
-     }
-     ++v;
-    }
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      //std::sort(&(array[0]), &(array[0]) + uCount);
-      std::sort(array.begin(), array.end());
-    else
-      //float_sort(&(array[0]), &(array[0]) + uCount, rightshift());
-      float_sort(array.begin(), array.end(), rightshift());
-    end = clock();
-    elapsed = static_cast<double>(end - start) ;
-    std::ofstream ofile;
-    if (stdSort)
-      ofile.open("standard_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    else
-      ofile.open("boost_sort_out.txt", std::ios_base::out |
-                 std::ios_base::binary | std::ios_base::trunc);
-    if (ofile.good()) {
-      for (unsigned v = 0; v < array.size(); ++v) {
-        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );
-      }
-      ofile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// float_sort rightshift functor sorting example\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <string>\r
+#include <fstream>\r
+#include <iostream>\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE float\r
+#define CAST_TYPE int\r
+\r
+//Casting to an integer before bitshifting\r
+struct rightshift {\r
+  inline int operator()(const DATA_TYPE &x, const unsigned offset) const {\r
+    return float_mem_cast<DATA_TYPE, int>(x) >> offset;\r
+  }\r
+};\r
+\r
+\r
+//Pass in an argument to test std::sort\r
+//Note that this converts NaNs and -0.0 to 0.0, so that sorting results are\r
+//identical every time\r
+int main(int argc, const char ** argv) {\r
+  size_t uCount,uSize=sizeof(DATA_TYPE);\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  std::ifstream input("input.txt", std::ios_base::in | std::ios_base::binary);\r
+  if (input.fail()) {\r
+    printf("input.txt could not be opened\n");\r
+    return 1;\r
+  }\r
+  double total = 0.0;\r
+  std::vector<DATA_TYPE> array;\r
+  input.seekg (0, std::ios_base::end);\r
+    size_t length = input.tellg();\r
+  uCount = length/uSize;\r
+  //Run multiple loops, if requested\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    input.seekg (0, std::ios_base::beg);\r
+    //Conversion to a vector\r
+    array.resize(uCount);\r
+    unsigned v = 0;\r
+    while (input.good() && v < uCount) {\r
+      input.read(reinterpret_cast<char *>(&(array[v])), uSize );\r
+     //Testcase doesn't sort NaNs; they just cause confusion\r
+     if (!(array[v] < 0.0) && !(0.0 < array[v]))\r
+      array[v] = 0.0;\r
+     //Checking for denormalized numbers\r
+     if (!(float_mem_cast<float, int>(array[v]) & 0x7f800000)) {\r
+       //Make the top exponent bit high\r
+       CAST_TYPE temp = 0x40000000 | float_mem_cast<float, int>(array[v]);\r
+       memcpy(&(array[v]), &temp, sizeof(DATA_TYPE));\r
+     }\r
+     ++v;\r
+    }\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      //std::sort(&(array[0]), &(array[0]) + uCount);\r
+      std::sort(array.begin(), array.end());\r
+    else\r
+      //float_sort(&(array[0]), &(array[0]) + uCount, rightshift());\r
+      float_sort(array.begin(), array.end(), rightshift());\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start) ;\r
+    std::ofstream ofile;\r
+    if (stdSort)\r
+      ofile.open("standard_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      ofile.open("boost_sort_out.txt", std::ios_base::out |\r
+                 std::ios_base::binary | std::ios_base::trunc);\r
+    if (ofile.good()) {\r
+      for (unsigned v = 0; v < array.size(); ++v) {\r
+        ofile.write(reinterpret_cast<char *>(&(array[v])), sizeof(array[v]) );\r
+      }\r
+      ofile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index 0ef9bf4e2f07786720f696a695e8fe0cc174b48f..d785814b5087565a780c916a86099ef51db73aae 100644 (file)
-//! \brief spreadsort string functor sorting example.
-//! \file
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-// Caution: this file contains Quickbook markup as well as code
-// and comments, don't change any of the special comment markups!
-
-#include <boost/sort/spreadsort/string_sort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <string>
-using std::string;
-using namespace boost::sort::spreadsort;
-
-struct DATA_TYPE {
-    string a;
-};
-
-//[lessthan_functor
-
-struct lessthan {
-  inline bool operator()(const DATA_TYPE &x, const DATA_TYPE &y) const {
-    return x.a < y.a;
-  }
-};
-//] [/lessthan_functor]
-
-//[bracket_functor
-struct bracket {
-  inline unsigned char operator()(const DATA_TYPE &x, size_t offset) const {
-    return x.a[offset];
-  }
-};
-//] [/bracket_functor]
-
-//[getsize_functor
-struct getsize {
-  inline size_t operator()(const DATA_TYPE &x) const{ return x.a.size(); }
-};
-//] [/getsize_functor]
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  std::ifstream indata;
-  std::ofstream outfile;
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  double total = 0.0;
-  //Run multiple loops, if requested
-  std::vector<DATA_TYPE> array;
-  for (unsigned u = 0; u < loopCount; ++u) {
-    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);
-    if (indata.bad()) {
-      printf("input.txt could not be opened\n");
-      return 1;
-    }
-    DATA_TYPE inval;
-    indata >> inval.a;
-    while (!indata.eof() ) {
-      array.push_back(inval);
-      //Inserting embedded nulls and empty strings
-      if (!(array.size() % 100)) {
-        if (inval.a.empty() || !(array.size() % 1000)) {
-          inval.a = "";
-          array.push_back(inval);
-        }
-        else {
-          inval.a[0] = '\0';
-          array.push_back(inval);
-        }
-      }
-      indata >> inval.a;
-    }
-
-    indata.close();
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort) {
-      std::sort(array.begin(), array.end(), lessthan());
-    } else {
-//[stringsort_functors_call
-      string_sort(array.begin(), array.end(), bracket(), getsize(), lessthan());
-//] [/stringsort_functors_call]
-    }
-    end = clock();
-    elapsed = static_cast<double>(end - start);
-    if (stdSort) {
-      outfile.open("standard_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    } else {
-      outfile.open("boost_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    }
-    if (outfile.good()) {
-      for (unsigned u = 0; u < array.size(); ++u)
-        outfile << array[u].a << "\n";
-      outfile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort) {
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  } else {
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  }
-  return 0;
-}
+//! \brief spreadsort string functor sorting example.\r
+//! \file\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+// Caution: this file contains Quickbook markup as well as code\r
+// and comments, don't change any of the special comment markups!\r
+\r
+#include <boost/sort/spreadsort/string_sort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <iostream>\r
+#include <fstream>\r
+#include <string>\r
+using std::string;\r
+using namespace boost::sort::spreadsort;\r
+\r
+struct DATA_TYPE {\r
+    string a;\r
+};\r
+\r
+//[lessthan_functor\r
+\r
+struct lessthan {\r
+  inline bool operator()(const DATA_TYPE &x, const DATA_TYPE &y) const {\r
+    return x.a < y.a;\r
+  }\r
+};\r
+//] [/lessthan_functor]\r
+\r
+//[bracket_functor\r
+struct bracket {\r
+  inline unsigned char operator()(const DATA_TYPE &x, size_t offset) const {\r
+    return x.a[offset];\r
+  }\r
+};\r
+//] [/bracket_functor]\r
+\r
+//[getsize_functor\r
+struct getsize {\r
+  inline size_t operator()(const DATA_TYPE &x) const{ return x.a.size(); }\r
+};\r
+//] [/getsize_functor]\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  std::ifstream indata;\r
+  std::ofstream outfile;\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  double total = 0.0;\r
+  //Run multiple loops, if requested\r
+  std::vector<DATA_TYPE> array;\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);\r
+    if (indata.bad()) {\r
+      printf("input.txt could not be opened\n");\r
+      return 1;\r
+    }\r
+    DATA_TYPE inval;\r
+    indata >> inval.a;\r
+    while (!indata.eof() ) {\r
+      array.push_back(inval);\r
+      //Inserting embedded nulls and empty strings\r
+      if (!(array.size() % 100)) {\r
+        if (inval.a.empty() || !(array.size() % 1000)) {\r
+          inval.a = "";\r
+          array.push_back(inval);\r
+        }\r
+        else {\r
+          inval.a[0] = '\0';\r
+          array.push_back(inval);\r
+        }\r
+      }\r
+      indata >> inval.a;\r
+    }\r
+\r
+    indata.close();\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort) {\r
+      std::sort(array.begin(), array.end(), lessthan());\r
+    } else {\r
+//[stringsort_functors_call\r
+      string_sort(array.begin(), array.end(), bracket(), getsize(), lessthan());\r
+//] [/stringsort_functors_call]\r
+    }\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start);\r
+    if (stdSort) {\r
+      outfile.open("standard_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    } else {\r
+      outfile.open("boost_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    }\r
+    if (outfile.good()) {\r
+      for (unsigned u = 0; u < array.size(); ++u)\r
+        outfile << array[u].a << "\n";\r
+      outfile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort) {\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  } else {\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  }\r
+  return 0;\r
+}\r
index eb30033827bb61256711aa399492b2c6fd983541..17299d1136472347518a365e32da42a5e0d78ac0 100644 (file)
@@ -1,85 +1,85 @@
-// spreadsort string sorting example.
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/string_sort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <string>
-using std::string;
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE string
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  std::ifstream indata;
-  std::ofstream outfile;
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  double total = 0.0;
-  //Run multiple loops, if requested
-  std::vector<DATA_TYPE> array;
-  for (unsigned u = 0; u < loopCount; ++u) {
-    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);  
-    if (indata.bad()) {
-      printf("input.txt could not be opened\n");
-      return 1;
-    }
-    DATA_TYPE inval;
-    while (!indata.eof() ) {
-      indata >> inval;
-      array.push_back(inval);
-    }
-      
-    indata.close();
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    if (stdSort)
-      //std::sort(&(array[0]), &(array[0]) + uCount);
-      std::sort(array.begin(), array.end());
-    else
-      //string_sort(&(array[0]), &(array[0]) + uCount);
-      string_sort(array.begin(), array.end());
-    end = clock();
-    elapsed = static_cast<double>(end - start);
-    if (stdSort)
-      outfile.open("standard_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    else
-      outfile.open("boost_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    if (outfile.good()) {
-      for (unsigned u = 0; u < array.size(); ++u)
-        outfile << array[u] << "\n";
-      outfile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
-
-
+// spreadsort string sorting example.\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/string_sort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <iostream>\r
+#include <fstream>\r
+#include <string>\r
+using std::string;\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE string\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  std::ifstream indata;\r
+  std::ofstream outfile;\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  double total = 0.0;\r
+  //Run multiple loops, if requested\r
+  std::vector<DATA_TYPE> array;\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);  \r
+    if (indata.bad()) {\r
+      printf("input.txt could not be opened\n");\r
+      return 1;\r
+    }\r
+    DATA_TYPE inval;\r
+    while (!indata.eof() ) {\r
+      indata >> inval;\r
+      array.push_back(inval);\r
+    }\r
+      \r
+    indata.close();\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    if (stdSort)\r
+      //std::sort(&(array[0]), &(array[0]) + uCount);\r
+      std::sort(array.begin(), array.end());\r
+    else\r
+      //string_sort(&(array[0]), &(array[0]) + uCount);\r
+      string_sort(array.begin(), array.end());\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start);\r
+    if (stdSort)\r
+      outfile.open("standard_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      outfile.open("boost_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    if (outfile.good()) {\r
+      for (unsigned u = 0; u < array.size(); ++u)\r
+        outfile << array[u] << "\n";\r
+      outfile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
+\r
+\r
index 6775bbe7d162bee1c40f889f41c028149662922f..064bc9ace088097ca6a8a2516c2b9d9686a92446 100644 (file)
@@ -1,96 +1,96 @@
-// spreadsort wstring sorting example
-//
-//  Copyright Steven Ross 2009-2014.
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/string_sort.hpp>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <string>
-using std::wstring;
-using namespace boost::sort::spreadsort;
-
-#define DATA_TYPE wstring
-
-//Pass in an argument to test std::sort
-int main(int argc, const char ** argv) {
-  std::ifstream indata;
-  std::ofstream outfile;
-  bool stdSort = false;
-  unsigned loopCount = 1;
-  for (int u = 1; u < argc; ++u) {
-    if (std::string(argv[u]) == "-std")
-      stdSort = true;
-    else
-      loopCount = atoi(argv[u]);
-  }
-  double total = 0.0;
-  //Run multiple loops, if requested
-  std::vector<DATA_TYPE> array;
-  for (unsigned u = 0; u < loopCount; ++u) {
-    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);  
-    if (indata.bad()) {
-      printf("input.txt could not be opened\n");
-      return 1;
-    }
-    unsigned short inval;
-    DATA_TYPE current;
-    while (indata.good()) {
-      indata.read(reinterpret_cast<char *>(&inval), sizeof(inval));
-      current.push_back(inval);
-      //32 characters is a moderately long string
-      if (static_cast<int>(current.size()) > inval || current.size() >= 32) {
-        array.push_back(current);
-        current.clear();
-      }
-    }
-    //adding the last string
-    if (!current.empty())
-      array.push_back(current);
-      
-    indata.close();
-    clock_t start, end;
-    double elapsed;
-    start = clock();
-    wchar_t cast_type = 0;
-    if (stdSort)
-      //std::sort(&(array[0]), &(array[0]) + uCount);
-      std::sort(array.begin(), array.end());
-    else
-      //string_sort(&(array[0]), &(array[0]) + uCount, cast_type);
-      string_sort(array.begin(), array.end(), cast_type);
-    end = clock();
-    elapsed = static_cast<double>(end - start);
-    if (stdSort)
-      outfile.open("standard_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    else
-      outfile.open("boost_sort_out.txt", std::ios_base::out |
-                   std::ios_base::binary | std::ios_base::trunc);
-    if (outfile.good()) {
-      for (unsigned u = 0; u < array.size(); ++u){
-        for (unsigned v = 0; v < array[u].size(); ++v)
-          outfile << array[u][v];
-        outfile << "\n";
-      }
-      outfile.close();
-    }
-    total += elapsed;
-    array.clear();
-  }
-  if (stdSort)
-    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  else
-    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);
-  return 0;
-}
+// spreadsort wstring sorting example\r
+//\r
+//  Copyright Steven Ross 2009-2014.\r
+//\r
+// Distributed under the Boost Software License, Version 1.0.\r
+//    (See accompanying file LICENSE_1_0.txt or copy at\r
+//          http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/string_sort.hpp>\r
+#include <time.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <algorithm>\r
+#include <vector>\r
+#include <iostream>\r
+#include <fstream>\r
+#include <string>\r
+using std::wstring;\r
+using namespace boost::sort::spreadsort;\r
+\r
+#define DATA_TYPE wstring\r
+\r
+//Pass in an argument to test std::sort\r
+int main(int argc, const char ** argv) {\r
+  std::ifstream indata;\r
+  std::ofstream outfile;\r
+  bool stdSort = false;\r
+  unsigned loopCount = 1;\r
+  for (int u = 1; u < argc; ++u) {\r
+    if (std::string(argv[u]) == "-std")\r
+      stdSort = true;\r
+    else\r
+      loopCount = atoi(argv[u]);\r
+  }\r
+  double total = 0.0;\r
+  //Run multiple loops, if requested\r
+  std::vector<DATA_TYPE> array;\r
+  for (unsigned u = 0; u < loopCount; ++u) {\r
+    indata.open("input.txt", std::ios_base::in | std::ios_base::binary);  \r
+    if (indata.bad()) {\r
+      printf("input.txt could not be opened\n");\r
+      return 1;\r
+    }\r
+    unsigned short inval;\r
+    DATA_TYPE current;\r
+    while (indata.good()) {\r
+      indata.read(reinterpret_cast<char *>(&inval), sizeof(inval));\r
+      current.push_back(inval);\r
+      //32 characters is a moderately long string\r
+      if (static_cast<int>(current.size()) > inval || current.size() >= 32) {\r
+        array.push_back(current);\r
+        current.clear();\r
+      }\r
+    }\r
+    //adding the last string\r
+    if (!current.empty())\r
+      array.push_back(current);\r
+      \r
+    indata.close();\r
+    clock_t start, end;\r
+    double elapsed;\r
+    start = clock();\r
+    wchar_t cast_type = 0;\r
+    if (stdSort)\r
+      //std::sort(&(array[0]), &(array[0]) + uCount);\r
+      std::sort(array.begin(), array.end());\r
+    else\r
+      //string_sort(&(array[0]), &(array[0]) + uCount, cast_type);\r
+      string_sort(array.begin(), array.end(), cast_type);\r
+    end = clock();\r
+    elapsed = static_cast<double>(end - start);\r
+    if (stdSort)\r
+      outfile.open("standard_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    else\r
+      outfile.open("boost_sort_out.txt", std::ios_base::out |\r
+                   std::ios_base::binary | std::ios_base::trunc);\r
+    if (outfile.good()) {\r
+      for (unsigned u = 0; u < array.size(); ++u){\r
+        for (unsigned v = 0; v < array[u].size(); ++v)\r
+          outfile << array[u][v];\r
+        outfile << "\n";\r
+      }\r
+      outfile.close();\r
+    }\r
+    total += elapsed;\r
+    array.clear();\r
+  }\r
+  if (stdSort)\r
+    printf("std::sort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  else\r
+    printf("spreadsort elapsed time %f\n", total / CLOCKS_PER_SEC);\r
+  return 0;\r
+}\r
index 7d5f937b1daae81ae8ecb879c7bc3cf14d7e1aac..c285ee5deaeac639e8c635908222ad5b1dde954f 100644 (file)
@@ -1,15 +1,15 @@
-<!-- Automatic redirection to Quickbook/Doxygen version of documentation. -->
-<html>
-<head>
-<meta http-equiv="refresh" content="0; URL=doc/html/index.html">
-</head>
-<body>
-Automatic redirection failed, please go to
-<a href="doc/html/index.html">doc/html/index.html</a> 
-&nbsp;<hr>
-<p>© Copyright Steven Ross 2009-2014</p>
-<p>Distributed under the Boost Software License, Version 1.0. (See accompanying 
-file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy 
-at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
-</body>
-</html>
+<!-- Automatic redirection to Quickbook/Doxygen version of documentation. -->\r
+<html>\r
+<head>\r
+<meta http-equiv="refresh" content="0; URL=doc/html/index.html">\r
+</head>\r
+<body>\r
+Automatic redirection failed, please go to\r
+<a href="doc/html/index.html">doc/html/index.html</a> \r
+&nbsp;<hr>\r
+<p>© Copyright Steven Ross 2009-2014</p>\r
+<p>Distributed under the Boost Software License, Version 1.0. (See accompanying \r
+file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy \r
+at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>\r
+</body>\r
+</html>\r
index 1af3df15708df81a5c5e2fce708f9f4fcaa18476..32c1815c718751784c9a31468d1feab018a2420f 100644 (file)
@@ -1,25 +1,25 @@
-#  Boost sorting_algo library test suite Jamfile  ----------------------------
-#
-#  Copyright Steven Ross 2009. Use, modification and
-#  distribution is subject to the Boost Software License, Version
-#  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-#  http://www.boost.org/LICENSE_1_0.txt)
-#
-#  See http://www.boost.org/libs/sort for library home page.
-
-import testing ;
-
-{
-  test-suite "sort"
-    : [ run integer_sort_test.cpp
-       : : : : integer_sort ]   
-  [ run float_sort_test.cpp
-       : : : : float_sort ]   
-  [ run string_sort_test.cpp
-       : : : : string_sort ]  
-  [ run sort_detail_test.cpp
-       : : : : sort_detail ] 
-  
-  
-   ;
-}
+#  Boost sorting_algo library test suite Jamfile  ----------------------------\r
+#\r
+#  Copyright Steven Ross 2009. Use, modification and\r
+#  distribution is subject to the Boost Software License, Version\r
+#  1.0. (See accompanying file LICENSE_1_0.txt or copy at\r
+#  http://www.boost.org/LICENSE_1_0.txt)\r
+#\r
+#  See http://www.boost.org/libs/sort for library home page.\r
+\r
+import testing ;\r
+\r
+{\r
+  test-suite "sort"\r
+    : [ run integer_sort_test.cpp\r
+       : : : : integer_sort ]   \r
+  [ run float_sort_test.cpp\r
+       : : : : float_sort ]   \r
+  [ run string_sort_test.cpp\r
+       : : : : string_sort ]  \r
+  [ run sort_detail_test.cpp\r
+       : : : : sort_detail ] \r
+  \r
+  \r
+   ;\r
+}\r
index 304a4fcac8f2a28eea1c1337fcee7308ba12973f..e479aabf2c6258f50982d91a86058a9d4667d79c 100644 (file)
-//  Boost Sort library float_sort_test.cpp file  -----------------------------//
-
-//  Copyright Steven Ross 2014. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/spreadsort.hpp>
-// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
-#include <boost/test/test_tools.hpp>
-#include <vector>
-
-
-using namespace std;
-using namespace boost::sort::spreadsort;
-
-//Casting to an integer before bitshifting
-struct rightshift {
-  int operator()(const float &x, const unsigned offset) const { 
-    return float_mem_cast<float, int>(x) >> offset; 
-  }
-};
-
-struct rightshift_64 {
-  boost::int64_t operator()(const double &x, const boost::uint64_t offset) const
-  { 
-    return float_mem_cast<double, boost::int64_t>(x) >> offset; 
-  }
-};
-
-boost::int32_t 
-rand_32(bool sign = true) {
-   boost::int32_t result = rand() | (rand()<< 16);
-   if (rand() % 2)
-     result |= 1 << 15;
-   //Adding the sign bit
-   if (sign && (rand() % 2))
-     result *= -1;
-   return result;
-}
-
-static const unsigned input_count = 1000000;
-
-// Helper class to run tests across all float_sort interface variants.
-template<class FloatType, class RightShift>
-void test_vector(vector<FloatType> base_vec, RightShift shifter) {
-  vector<FloatType> sorted_vec = base_vec;
-  vector<FloatType> test_vec = base_vec;
-  std::sort(sorted_vec.begin(), sorted_vec.end());
-  //Testing boost::sort::spreadsort version
-  test_vec = base_vec;
-  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());
-  BOOST_CHECK(test_vec == sorted_vec);
-  //One functor
-  test_vec = base_vec;
-  float_sort(test_vec.begin(), test_vec.end(), shifter);
-  BOOST_CHECK(test_vec == sorted_vec);
-  //Both functors
-  test_vec = base_vec;
-  float_sort(test_vec.begin(), test_vec.end(), shifter, less<FloatType>());
-  BOOST_CHECK(test_vec == sorted_vec);
-}
-
-void float_test()
-{
-  // Prepare inputs
-  vector<float> base_vec;
-
-  //Generating semirandom numbers that will work for basic testing
-  for (unsigned u = 0; u < input_count; ++u) {
-    float val = float(rand_32());
-    //As std::sort gives arbitrary results for NaNs and 0.0 vs. -0.0, treat all
-    //those as just 0.0 for testing
-    if (!(val < 0.0) && !(0.0 < val))
-      base_vec.push_back(0.0);
-    else
-      base_vec.push_back(val);
-  }
-  test_vector(base_vec, rightshift());
-
-  // Trying both positive and negative sorted and reverse sorted data.
-  base_vec.clear();
-  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(-i);
-  test_vector(base_vec, rightshift());
-  base_vec.clear();
-  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(i - input_count);
-  test_vector(base_vec, rightshift());
-  base_vec.clear();
-  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(input_count - i);
-  test_vector(base_vec, rightshift());
-  base_vec.clear();
-  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(i);
-  test_vector(base_vec, rightshift());
-  base_vec.clear();
-  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(i);
-  for (size_t i = 0; i < input_count; i += 2) base_vec[i] *= -1;
-  test_vector(base_vec, rightshift());
-}
-
-void double_test() {
-  vector<double> base_vec;
-  for (unsigned u = 0; u < input_count; ++u) {
-    double val = double
-    ((((boost::int64_t)rand_32()) << ((8 * sizeof(int)) -1)) + rand_32(false));
-    //As std::sort gives arbitrary results for NaNs and 0.0 vs. -0.0, 
-    //treat all those as just 0.0 for testing
-    if (!(val < 0.0) && !(0.0 < val))
-      base_vec.push_back(0.0);
-    else
-      base_vec.push_back(val);
-  }
-  test_vector(base_vec, rightshift_64());
-
-  // Trying both positive and negative sorted and reverse sorted data.
-  base_vec.clear();
-  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(-i);
-  test_vector(base_vec, rightshift_64());
-  base_vec.clear();
-  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(i - input_count);
-  test_vector(base_vec, rightshift_64());
-  base_vec.clear();
-  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(input_count - i);
-  test_vector(base_vec, rightshift_64());
-  base_vec.clear();
-  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(i);
-  test_vector(base_vec, rightshift_64());
-  base_vec.clear();
-  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(i);
-  for (size_t i = 0; i < input_count; i += 2) base_vec[i] *= -1;
-  test_vector(base_vec, rightshift_64());
-}
-
-// Verify that 0 and 1 elements work correctly.
-void corner_test() {
-  vector<float> test_vec;
-  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());
-  const float test_value = -0.0;
-  test_vec.push_back(test_value);
-  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());
-  BOOST_CHECK(test_vec.size() == 1);
-  BOOST_CHECK(test_vec[0] == test_value);
-}
-
-// test main 
-int test_main( int, char*[] )
-{
-  srand(1);
-  float_test();
-  double_test();
-  corner_test();
-  return 0;
-}
+//  Boost Sort library float_sort_test.cpp file  -----------------------------//\r
+\r
+//  Copyright Steven Ross 2014. Use, modification and\r
+//  distribution is subject to the Boost Software License, Version\r
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at\r
+//  http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+// Include unit test framework\r
+#include <boost/test/included/test_exec_monitor.hpp>\r
+#include <boost/test/test_tools.hpp>\r
+#include <vector>\r
+\r
+\r
+using namespace std;\r
+using namespace boost::sort::spreadsort;\r
+\r
+//Casting to an integer before bitshifting\r
+struct rightshift {\r
+  int operator()(const float &x, const unsigned offset) const { \r
+    return float_mem_cast<float, int>(x) >> offset; \r
+  }\r
+};\r
+\r
+struct rightshift_64 {\r
+  boost::int64_t operator()(const double &x, const boost::uint64_t offset) const\r
+  { \r
+    return float_mem_cast<double, boost::int64_t>(x) >> offset; \r
+  }\r
+};\r
+\r
+boost::int32_t \r
+rand_32(bool sign = true) {\r
+   boost::int32_t result = rand() | (rand()<< 16);\r
+   if (rand() % 2)\r
+     result |= 1 << 15;\r
+   //Adding the sign bit\r
+   if (sign && (rand() % 2))\r
+     result *= -1;\r
+   return result;\r
+}\r
+\r
+static const unsigned input_count = 1000000;\r
+\r
+// Helper class to run tests across all float_sort interface variants.\r
+template<class FloatType, class RightShift>\r
+void test_vector(vector<FloatType> base_vec, RightShift shifter) {\r
+  vector<FloatType> sorted_vec = base_vec;\r
+  vector<FloatType> test_vec = base_vec;\r
+  std::sort(sorted_vec.begin(), sorted_vec.end());\r
+  //Testing boost::sort::spreadsort version\r
+  test_vec = base_vec;\r
+  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+  //One functor\r
+  test_vec = base_vec;\r
+  float_sort(test_vec.begin(), test_vec.end(), shifter);\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+  //Both functors\r
+  test_vec = base_vec;\r
+  float_sort(test_vec.begin(), test_vec.end(), shifter, less<FloatType>());\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+}\r
+\r
+void float_test()\r
+{\r
+  // Prepare inputs\r
+  vector<float> base_vec;\r
+\r
+  //Generating semirandom numbers that will work for basic testing\r
+  for (unsigned u = 0; u < input_count; ++u) {\r
+    float val = float(rand_32());\r
+    //As std::sort gives arbitrary results for NaNs and 0.0 vs. -0.0, treat all\r
+    //those as just 0.0 for testing\r
+    if (!(val < 0.0) && !(0.0 < val))\r
+      base_vec.push_back(0.0);\r
+    else\r
+      base_vec.push_back(val);\r
+  }\r
+  test_vector(base_vec, rightshift());\r
+\r
+  // Trying both positive and negative sorted and reverse sorted data.\r
+  base_vec.clear();\r
+  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(-i);\r
+  test_vector(base_vec, rightshift());\r
+  base_vec.clear();\r
+  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(i - input_count);\r
+  test_vector(base_vec, rightshift());\r
+  base_vec.clear();\r
+  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(input_count - i);\r
+  test_vector(base_vec, rightshift());\r
+  base_vec.clear();\r
+  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(i);\r
+  test_vector(base_vec, rightshift());\r
+  base_vec.clear();\r
+  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(i);\r
+  for (size_t i = 0; i < input_count; i += 2) base_vec[i] *= -1;\r
+  test_vector(base_vec, rightshift());\r
+}\r
+\r
+void double_test() {\r
+  vector<double> base_vec;\r
+  for (unsigned u = 0; u < input_count; ++u) {\r
+    double val = double\r
+    ((((boost::int64_t)rand_32()) << ((8 * sizeof(int)) -1)) + rand_32(false));\r
+    //As std::sort gives arbitrary results for NaNs and 0.0 vs. -0.0, \r
+    //treat all those as just 0.0 for testing\r
+    if (!(val < 0.0) && !(0.0 < val))\r
+      base_vec.push_back(0.0);\r
+    else\r
+      base_vec.push_back(val);\r
+  }\r
+  test_vector(base_vec, rightshift_64());\r
+\r
+  // Trying both positive and negative sorted and reverse sorted data.\r
+  base_vec.clear();\r
+  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(-i);\r
+  test_vector(base_vec, rightshift_64());\r
+  base_vec.clear();\r
+  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(i - input_count);\r
+  test_vector(base_vec, rightshift_64());\r
+  base_vec.clear();\r
+  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(input_count - i);\r
+  test_vector(base_vec, rightshift_64());\r
+  base_vec.clear();\r
+  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(i);\r
+  test_vector(base_vec, rightshift_64());\r
+  base_vec.clear();\r
+  for (size_t i = 0; i < input_count; ++i) base_vec.push_back(i);\r
+  for (size_t i = 0; i < input_count; i += 2) base_vec[i] *= -1;\r
+  test_vector(base_vec, rightshift_64());\r
+}\r
+\r
+// Verify that 0 and 1 elements work correctly.\r
+void corner_test() {\r
+  vector<float> test_vec;\r
+  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());\r
+  const float test_value = -0.0;\r
+  test_vec.push_back(test_value);\r
+  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());\r
+  BOOST_CHECK(test_vec.size() == 1);\r
+  BOOST_CHECK(test_vec[0] == test_value);\r
+}\r
+\r
+// test main \r
+int test_main( int, char*[] )\r
+{\r
+  srand(1);\r
+  float_test();\r
+  double_test();\r
+  corner_test();\r
+  return 0;\r
+}\r
index 2a97de01596c464cc00663422f161d4a65119740..69f510b170a7b78e0c501323e6afc1f1bba5c8f1 100644 (file)
-//  Boost Sort library int_test.cpp file  ------------------------------------//
-
-//  Copyright Steven Ross 2009-2014. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/cstdint.hpp>
-#include <boost/sort/spreadsort/spreadsort.hpp>
-// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
-#include <boost/test/test_tools.hpp>
-#include <vector>
-
-#include <iostream>
-
-
-using namespace std;
-using namespace boost::sort::spreadsort;
-
-struct rightshift {
-  int operator()(int x, unsigned offset) { return x >> offset; }
-};
-
-struct rightshift_max {
-  boost::intmax_t operator()(const boost::intmax_t &x, unsigned offset) {
-    return x >> offset;
-  }
-};
-
-struct negrightshift {
-  int operator()(const int &x, const unsigned offset) { return -(x >> offset); }
-};
-
-struct negrightshift_max {
-  boost::intmax_t operator()(const boost::intmax_t &x, const unsigned offset) {
-    return -(x >> offset);
-  }
-};
-
-boost::int32_t 
-rand_32(bool sign = true) {
-   boost::int32_t result = rand() | (rand()<< 16);
-   if (rand() % 2)
-     result |= 1 << 15;
-   //Adding the sign bit
-   if (sign && (rand() % 2))
-     result *= -1;
-   return result;
-}
-
-void int_test()
-{
-  // Prepare inputs
-  vector<int> base_vec;
-  unsigned count = 100000;
-  srand(1);
-  //Generating semirandom numbers
-  for (unsigned u = 0; u < count; ++u)
-    base_vec.push_back(rand_32());
-  vector<int> sorted_vec = base_vec;
-  vector<int> test_vec = base_vec;
-  std::sort(sorted_vec.begin(), sorted_vec.end());
-  //Testing basic call
-  integer_sort(test_vec.begin(), test_vec.end());
-  BOOST_CHECK(test_vec == sorted_vec);
-  //boost::sort::spreadsort variant
-  test_vec = base_vec;
-  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());
-  BOOST_CHECK(test_vec == sorted_vec);
-  //One functor
-  test_vec = base_vec;
-  integer_sort(test_vec.begin(), test_vec.end(), rightshift());
-  BOOST_CHECK(test_vec == sorted_vec);
-  //Both functors
-  test_vec = base_vec;
-  integer_sort(test_vec.begin(), test_vec.end(), rightshift(), less<int>());
-  BOOST_CHECK(test_vec == sorted_vec);
-  //reverse order
-  std::sort(sorted_vec.begin(), sorted_vec.end(), greater<int>());
-  integer_sort(test_vec.begin(), test_vec.end(), negrightshift(),
-               greater<int>());
-  BOOST_CHECK(test_vec == sorted_vec);
-
-  //Making sure we're correctly sorting boost::intmax_ts; should use std::sort
-  vector<boost::intmax_t> long_base_vec;
-  for (unsigned u = 0; u < base_vec.size(); ++u)
-    long_base_vec.push_back((((boost::intmax_t)rand_32()) <<
-                             ((8 * sizeof(int)) -1)) + rand_32(false));
-  vector<boost::intmax_t> long_sorted_vec = long_base_vec;
-  vector<boost::intmax_t> long_test_vec = long_base_vec;
-  integer_sort(long_test_vec.begin(), long_test_vec.end());
-  std::sort(long_sorted_vec.begin(), long_sorted_vec.end());
-  BOOST_CHECK(long_test_vec == long_sorted_vec);
-  //One functor
-  long_test_vec = long_base_vec;
-  integer_sort(long_test_vec.begin(), long_test_vec.end(), rightshift_max());
-  BOOST_CHECK(long_test_vec == long_sorted_vec);
-  //Both functors
-  long_test_vec = long_base_vec;
-  integer_sort(long_test_vec.begin(), long_test_vec.end(), rightshift_max(),
-               less<boost::intmax_t>());
-  BOOST_CHECK(long_test_vec == long_sorted_vec);
-  //reverse order
-  std::sort(long_sorted_vec.begin(), long_sorted_vec.end(),
-            greater<boost::intmax_t>());
-  integer_sort(long_test_vec.begin(), long_test_vec.end(), negrightshift_max(),
-               greater<boost::intmax_t>());
-  BOOST_CHECK(long_test_vec == long_sorted_vec);
-}
-
-// Verify that 0 and 1 elements work correctly.
-void corner_test() {
-  vector<int> test_vec;
-  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());
-  const int test_value = 42;
-  test_vec.push_back(test_value);
-  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());
-  BOOST_CHECK(test_vec.size() == 1);
-  BOOST_CHECK(test_vec[0] == test_value);
-}
-
-// test main 
-int test_main( int, char*[] )
-{
-  int_test();
-  corner_test();    
-  return 0;
-}
+//  Boost Sort library int_test.cpp file  ------------------------------------//\r
+\r
+//  Copyright Steven Ross 2009-2014. Use, modification and\r
+//  distribution is subject to the Boost Software License, Version\r
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at\r
+//  http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/cstdint.hpp>\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+// Include unit test framework\r
+#include <boost/test/included/test_exec_monitor.hpp>\r
+#include <boost/test/test_tools.hpp>\r
+#include <vector>\r
+\r
+#include <iostream>\r
+\r
+\r
+using namespace std;\r
+using namespace boost::sort::spreadsort;\r
+\r
+struct rightshift {\r
+  int operator()(int x, unsigned offset) { return x >> offset; }\r
+};\r
+\r
+struct rightshift_max {\r
+  boost::intmax_t operator()(const boost::intmax_t &x, unsigned offset) {\r
+    return x >> offset;\r
+  }\r
+};\r
+\r
+struct negrightshift {\r
+  int operator()(const int &x, const unsigned offset) { return -(x >> offset); }\r
+};\r
+\r
+struct negrightshift_max {\r
+  boost::intmax_t operator()(const boost::intmax_t &x, const unsigned offset) {\r
+    return -(x >> offset);\r
+  }\r
+};\r
+\r
+boost::int32_t \r
+rand_32(bool sign = true) {\r
+   boost::int32_t result = rand() | (rand()<< 16);\r
+   if (rand() % 2)\r
+     result |= 1 << 15;\r
+   //Adding the sign bit\r
+   if (sign && (rand() % 2))\r
+     result *= -1;\r
+   return result;\r
+}\r
+\r
+void int_test()\r
+{\r
+  // Prepare inputs\r
+  vector<int> base_vec;\r
+  unsigned count = 100000;\r
+  srand(1);\r
+  //Generating semirandom numbers\r
+  for (unsigned u = 0; u < count; ++u)\r
+    base_vec.push_back(rand_32());\r
+  vector<int> sorted_vec = base_vec;\r
+  vector<int> test_vec = base_vec;\r
+  std::sort(sorted_vec.begin(), sorted_vec.end());\r
+  //Testing basic call\r
+  integer_sort(test_vec.begin(), test_vec.end());\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+  //boost::sort::spreadsort variant\r
+  test_vec = base_vec;\r
+  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+  //One functor\r
+  test_vec = base_vec;\r
+  integer_sort(test_vec.begin(), test_vec.end(), rightshift());\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+  //Both functors\r
+  test_vec = base_vec;\r
+  integer_sort(test_vec.begin(), test_vec.end(), rightshift(), less<int>());\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+  //reverse order\r
+  std::sort(sorted_vec.begin(), sorted_vec.end(), greater<int>());\r
+  integer_sort(test_vec.begin(), test_vec.end(), negrightshift(),\r
+               greater<int>());\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+\r
+  //Making sure we're correctly sorting boost::intmax_ts; should use std::sort\r
+  vector<boost::intmax_t> long_base_vec;\r
+  for (unsigned u = 0; u < base_vec.size(); ++u)\r
+    long_base_vec.push_back((((boost::intmax_t)rand_32()) <<\r
+                             ((8 * sizeof(int)) -1)) + rand_32(false));\r
+  vector<boost::intmax_t> long_sorted_vec = long_base_vec;\r
+  vector<boost::intmax_t> long_test_vec = long_base_vec;\r
+  integer_sort(long_test_vec.begin(), long_test_vec.end());\r
+  std::sort(long_sorted_vec.begin(), long_sorted_vec.end());\r
+  BOOST_CHECK(long_test_vec == long_sorted_vec);\r
+  //One functor\r
+  long_test_vec = long_base_vec;\r
+  integer_sort(long_test_vec.begin(), long_test_vec.end(), rightshift_max());\r
+  BOOST_CHECK(long_test_vec == long_sorted_vec);\r
+  //Both functors\r
+  long_test_vec = long_base_vec;\r
+  integer_sort(long_test_vec.begin(), long_test_vec.end(), rightshift_max(),\r
+               less<boost::intmax_t>());\r
+  BOOST_CHECK(long_test_vec == long_sorted_vec);\r
+  //reverse order\r
+  std::sort(long_sorted_vec.begin(), long_sorted_vec.end(),\r
+            greater<boost::intmax_t>());\r
+  integer_sort(long_test_vec.begin(), long_test_vec.end(), negrightshift_max(),\r
+               greater<boost::intmax_t>());\r
+  BOOST_CHECK(long_test_vec == long_sorted_vec);\r
+}\r
+\r
+// Verify that 0 and 1 elements work correctly.\r
+void corner_test() {\r
+  vector<int> test_vec;\r
+  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());\r
+  const int test_value = 42;\r
+  test_vec.push_back(test_value);\r
+  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());\r
+  BOOST_CHECK(test_vec.size() == 1);\r
+  BOOST_CHECK(test_vec[0] == test_value);\r
+}\r
+\r
+// test main \r
+int test_main( int, char*[] )\r
+{\r
+  int_test();\r
+  corner_test();    \r
+  return 0;\r
+}\r
index c7e7c55884bdaacba336016f736edf6f7317749c..0d989bce50e503a8724bf8a3b4c8e346ae8f1253 100644 (file)
-//  Boost Sort library tests for integer_sort and float_sort details.
-
-//  Copyright Steven Ross 2014. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/cstdint.hpp>
-#include <boost/sort/spreadsort/detail/spreadsort_common.hpp>
-#include <boost/sort/spreadsort/detail/integer_sort.hpp>
-#include <boost/sort/spreadsort/detail/float_sort.hpp>
-#include <boost/sort/spreadsort/detail/string_sort.hpp>
-#include <boost/sort/spreadsort/float_sort.hpp>
-// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
-#include <boost/test/test_tools.hpp>
-#include <vector>
-
-#include <iostream>
-
-
-using namespace std;
-using namespace boost::sort::spreadsort;
-using namespace boost::sort::spreadsort::detail;
-
-namespace {
-
-struct int_right_shift {
-  int operator()(const int x, const unsigned offset) const { 
-    return x >> offset; 
-  }
-};
-
-struct float_right_shift {
-  int operator()(const float x, const unsigned offset) const { 
-    return float_mem_cast<float, int>(x) >> offset; 
-  }
-};
-
-const int max_int_bits = sizeof(boost::uintmax_t) * 8;
-const int max_size_bits = sizeof(size_t) * 8;
-const boost::uintmax_t one = 1;
-
-// spreadsort won't recurse for inputs smaller than min_count.
-const int int_min_log_count = 
-  (std::min)((int)int_log_finishing_count, 
-             (int)int_log_mean_bin_size + int_log_min_split_count);
-const int float_min_log_count = 
-  (std::min)((int)float_log_finishing_count,
-             (int)float_log_mean_bin_size + float_log_min_split_count);
-const unsigned absolute_min_count = (std::min)(1 << int_min_log_count, 
-                                               1 << float_min_log_count);
-
-// Verify that roughlog2 is floor(log base 2) + 1.
-void roughlog2_test()
-{
-  for (boost::uintmax_t i = 0; i < max_int_bits; ++i) {
-    BOOST_CHECK(detail::rough_log_2_size(one << i) == i + 1);
-    BOOST_CHECK(detail::rough_log_2_size((one << i) - 1) == i);
-  }
-}
-
-// Test the worst-case performance handling, and assure that is using the
-// correct formula for the worst-case number of radix iterations.
-template<unsigned log_mean_bin_size, unsigned log_min_split_count,
-         unsigned log_finishing_count>
-void get_min_count_test()
-{
-  const unsigned min_log_size = log_mean_bin_size + log_min_split_count;
-  size_t prev_min_count = absolute_min_count;
-  for (int log_range = 0; log_range <= max_int_bits; ++log_range) {
-    size_t min_count = get_min_count<log_mean_bin_size, log_min_split_count, 
-                                     log_finishing_count>(log_range);
-    BOOST_CHECK(min_count >= prev_min_count);
-    prev_min_count = min_count;
-    // When the range is really small, the radix sort will complete in one
-    // iteration and worst-case handling doesn't apply.  The code below 
-    // guarantees the worst-case number of radix sorting iteration.
-    if (log_range > min_log_size) {
-      BOOST_CHECK(min_count >= (1 << min_log_size));
-      int iterations = rough_log_2_size(min_count) - min_log_size;
-      BOOST_CHECK(iterations >= 1);
-      int base_iterations = max_splits - log_min_split_count;
-      int covered_log_range = 0;
-      if (iterations > base_iterations) {
-        covered_log_range += max_splits * (iterations - base_iterations);
-      } else {
-        base_iterations = iterations;
-      }
-      // sum of n to n + x = ((x + 1) * (n + (n + x)))/2 + log_mean_bin_size
-      covered_log_range +=
-        (base_iterations * (log_min_split_count * 2 + base_iterations - 1))/2 +
-        log_mean_bin_size;
-      BOOST_CHECK(covered_log_range >= log_range);
-      BOOST_CHECK(covered_log_range - max_splits < log_range);
-    }
-  }
-}
-
-// Test the decision of how many pieces to split up the radix sort into
-// (roughly 2^(log_range - log_divisor)) to make sure the results are logical.
-void get_log_divisor_test()
-{
-  for (int log_range = 0; log_range <= max_int_bits; ++log_range) {
-    int prev_log_divisor = max_int_bits +
-      (std::max)((int)int_log_mean_bin_size, (int)float_log_mean_bin_size);
-    for (int log_count = 0; log_count < max_size_bits; ++log_count) {
-      size_t count = (one << log_count) - 1;
-      BOOST_CHECK(rough_log_2_size(count) == (unsigned)log_count);
-      int log_divisor =
-        get_log_divisor<int_log_mean_bin_size>(count, log_range);
-      // Only process counts >= int_log_finishing_count in this function.
-      if (count >= absolute_min_count)
-        BOOST_CHECK(log_divisor <= log_range);
-      // More pieces should be used the larger count is.
-      BOOST_CHECK(log_divisor <= prev_log_divisor);
-      prev_log_divisor = log_divisor;
-      BOOST_CHECK(log_divisor >= 0);
-      if (log_range > log_count) {
-        BOOST_CHECK(log_range - log_divisor <= max_splits);
-      } else if (log_range <= max_finishing_splits) {
-        BOOST_CHECK(log_divisor == 0);
-      }
-    }
-  }
-}
-
-// Verify that is_sorted_or_find_extremes returns true if the data is sorted,
-// and otherwise returns the actual min and max.
-void is_sorted_or_find_extremes_test()
-{
-  vector<int> input;
-  input.push_back(3);
-  input.push_back(5);
-  input.push_back(1);
-  // Test a sorted input.
-  vector<int> sorted_input(input);
-  std::sort(sorted_input.begin(), sorted_input.end());
-  vector<int>::iterator max, min;
-  BOOST_CHECK(detail::is_sorted_or_find_extremes(sorted_input.begin(), 
-                                                 sorted_input.end(), max, min));
-  // Test an unsorted input.
-  BOOST_CHECK(!detail::is_sorted_or_find_extremes(input.begin(), input.end(), 
-                                                  max, min));
-  BOOST_CHECK(*min == 1);
-  BOOST_CHECK(*max == 5);
-  // Test the comparison function version.
-  BOOST_CHECK(detail::is_sorted_or_find_extremes(sorted_input.begin(), 
-                                                 sorted_input.end(), max, min, 
-                                                 std::less<int>()));
-  BOOST_CHECK(!detail::is_sorted_or_find_extremes(sorted_input.begin(), 
-                                                  sorted_input.end(), 
-                                                  max, min, 
-                                                  std::greater<int>()));
-  BOOST_CHECK(*min == 5);
-  BOOST_CHECK(*max == 1);
-
-  // Test with floats
-  vector<float> float_input;
-  float_input.push_back(.3f);
-  float_input.push_back(4.0f);
-  float_input.push_back(.1f);
-  vector<float> sorted_float_input(float_input);
-  std::sort(sorted_float_input.begin(), sorted_float_input.end());
-  // Test cast_float_iter
-  int cast_min = detail::cast_float_iter<int, vector<float>::iterator>(
-                     sorted_float_input.begin());
-  int cast_max = detail::cast_float_iter<int, vector<float>::iterator>(
-                     sorted_float_input.end() - 1);
-  BOOST_CHECK(cast_min == float_right_shift()(.1f, 0));
-  BOOST_CHECK(cast_max == float_right_shift()(4.0f, 0));
-  // Test a sorted input
-  int div_max, div_min;
-  BOOST_CHECK(detail::is_sorted_or_find_extremes(sorted_float_input.begin(), 
-                                                 sorted_float_input.end(), 
-                                                 div_max, div_min));
-  // Test an unsorted input.
-  BOOST_CHECK(!detail::is_sorted_or_find_extremes(float_input.begin(), 
-                                                  float_input.end(), 
-                                                  div_max, div_min));
-  BOOST_CHECK(div_min == cast_min);
-  BOOST_CHECK(div_max == cast_max);
-
-  // Test with a right_shift functor.
-  BOOST_CHECK(detail::is_sorted_or_find_extremes(sorted_float_input.begin(), 
-                                                 sorted_float_input.end(), 
-                                                 div_max, div_min, 
-                                                 float_right_shift()));
-  // Test an unsorted input.
-  BOOST_CHECK(!detail::is_sorted_or_find_extremes(float_input.begin(), 
-                                                  float_input.end(), div_max, 
-                                                  div_min, 
-                                                  float_right_shift()));
-  BOOST_CHECK(div_min == float_right_shift()(.1f, 0));
-  BOOST_CHECK(div_max == float_right_shift()(4.0f, 0));
-}
-
-// Make sure bins are created correctly.
-void size_bins_test() {
-  size_t bin_sizes[1 << detail::max_finishing_splits];
-  bin_sizes[0] = 1;
-  bin_sizes[2] = 7;
-  const int old_bin_value = 7;
-  std::vector<int> old_bins;
-  old_bins.push_back(old_bin_value);
-  std::vector<vector<int>::iterator> bin_cache;
-  bin_cache.push_back(old_bins.begin());
-  unsigned cache_offset = 1;
-  unsigned cache_end;
-  const unsigned bin_count = 2;
-  std::vector<int>::iterator *new_cache_start = 
-    size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);
-  BOOST_CHECK((new_cache_start - &bin_cache[0]) == cache_offset);
-  BOOST_CHECK(bin_sizes[0] == 0);
-  BOOST_CHECK(bin_sizes[1] == 0);
-  BOOST_CHECK(bin_sizes[2] == 7);  // shouldn't modify past bin_count
-  BOOST_CHECK(cache_end == 3);
-  BOOST_CHECK(bin_cache.size() == cache_end);
-  BOOST_CHECK(old_bins[0] == old_bin_value);
-}
-
-// Test the specialized 3-way swap loops.
-void swap_loop_test() {
-  size_t bin_sizes[1 << detail::max_finishing_splits];
-  bin_sizes[0] = bin_sizes[1] = 2;
-  bin_sizes[2] = 1;
-
-  // test integer swap loop
-  vector<int> ints;
-  const int int_div_min = 3;
-  const int int_log_divisor = 1;
-  const unsigned int_offset = int_div_min << int_log_divisor;
-  ints.push_back(2 + int_offset);
-  ints.push_back(1 + int_offset); // stays in place
-  ints.push_back(4 + int_offset);
-  ints.push_back(3 + int_offset);
-  ints.push_back(0 + int_offset);
-  vector<vector<int>::iterator> int_bin_vector;
-  int_bin_vector.push_back(ints.begin());
-  int_bin_vector.push_back(int_bin_vector[0] + bin_sizes[0]);
-  int_bin_vector.push_back(int_bin_vector[1] + bin_sizes[1]);
-  vector<int>::iterator next_int_bin_start = int_bin_vector[0];
-  vector<int>::iterator *int_bins = &int_bin_vector[0];
-  int_right_shift integer_right_shift;
-  swap_loop(int_bins, next_int_bin_start, 0, integer_right_shift, bin_sizes, 
-            int_log_divisor, int_div_min);
-  for (unsigned i = 0; i < ints.size(); ++i) {
-    BOOST_CHECK(ints[i] == int(int_offset + i));
-  }
-  BOOST_CHECK(next_int_bin_start == ints.begin() + bin_sizes[0]);
-
-  // test float swap loop
-  vector<float> floats;
-  const int float_four_as_int = float_mem_cast<float, int>(4.0f);
-  const int float_log_divisor = 
-    rough_log_2_size(float_mem_cast<float, int>(5.0f) - float_four_as_int);
-  const int float_div_min = float_four_as_int >> float_log_divisor;
-  floats.push_back(6.0f);
-  floats.push_back(5.0f); // stays in place
-  floats.push_back(8.0f);
-  floats.push_back(7.0f);
-  floats.push_back(4.0f);
-  vector<vector<float>::iterator> float_bin_vector;
-  float_bin_vector.push_back(floats.begin());
-  float_bin_vector.push_back(float_bin_vector[0] + bin_sizes[0]);
-  float_bin_vector.push_back(float_bin_vector[1] + bin_sizes[1]);
-  vector<float>::iterator next_float_bin_start = float_bin_vector[0];
-  vector<float>::iterator *float_bins = &float_bin_vector[0];
-  float_swap_loop(float_bins, next_float_bin_start, 0, bin_sizes,
-                  float_log_divisor, float_div_min);
-  for (unsigned i = 0; i < floats.size(); ++i) {
-    BOOST_CHECK(floats[i] == 4.0f + i);
-  }
-  BOOST_CHECK(next_float_bin_start == floats.begin() + bin_sizes[0]);
-}
-
-} // end anonymous namespace
-
-// test main 
-int test_main( int, char*[] )
-{
-  roughlog2_test();
-  get_min_count_test<int_log_mean_bin_size, int_log_min_split_count,
-                    int_log_finishing_count>();
-  get_min_count_test<float_log_mean_bin_size, float_log_min_split_count,
-                    float_log_finishing_count>();
-  get_log_divisor_test();
-  is_sorted_or_find_extremes_test();
-  size_bins_test();
-  swap_loop_test();
-  return 0;
-}
+//  Boost Sort library tests for integer_sort and float_sort details.\r
+\r
+//  Copyright Steven Ross 2014. Use, modification and\r
+//  distribution is subject to the Boost Software License, Version\r
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at\r
+//  http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/cstdint.hpp>\r
+#include <boost/sort/spreadsort/detail/spreadsort_common.hpp>\r
+#include <boost/sort/spreadsort/detail/integer_sort.hpp>\r
+#include <boost/sort/spreadsort/detail/float_sort.hpp>\r
+#include <boost/sort/spreadsort/detail/string_sort.hpp>\r
+#include <boost/sort/spreadsort/float_sort.hpp>\r
+// Include unit test framework\r
+#include <boost/test/included/test_exec_monitor.hpp>\r
+#include <boost/test/test_tools.hpp>\r
+#include <vector>\r
+\r
+#include <iostream>\r
+\r
+\r
+using namespace std;\r
+using namespace boost::sort::spreadsort;\r
+using namespace boost::sort::spreadsort::detail;\r
+\r
+namespace {\r
+\r
+struct int_right_shift {\r
+  int operator()(const int x, const unsigned offset) const { \r
+    return x >> offset; \r
+  }\r
+};\r
+\r
+struct float_right_shift {\r
+  int operator()(const float x, const unsigned offset) const { \r
+    return float_mem_cast<float, int>(x) >> offset; \r
+  }\r
+};\r
+\r
+const int max_int_bits = sizeof(boost::uintmax_t) * 8;\r
+const int max_size_bits = sizeof(size_t) * 8;\r
+const boost::uintmax_t one = 1;\r
+\r
+// spreadsort won't recurse for inputs smaller than min_count.\r
+const int int_min_log_count = \r
+  (std::min)((int)int_log_finishing_count, \r
+             (int)int_log_mean_bin_size + int_log_min_split_count);\r
+const int float_min_log_count = \r
+  (std::min)((int)float_log_finishing_count,\r
+             (int)float_log_mean_bin_size + float_log_min_split_count);\r
+const unsigned absolute_min_count = (std::min)(1 << int_min_log_count, \r
+                                               1 << float_min_log_count);\r
+\r
+// Verify that roughlog2 is floor(log base 2) + 1.\r
+void roughlog2_test()\r
+{\r
+  for (boost::uintmax_t i = 0; i < max_int_bits; ++i) {\r
+    BOOST_CHECK(detail::rough_log_2_size(one << i) == i + 1);\r
+    BOOST_CHECK(detail::rough_log_2_size((one << i) - 1) == i);\r
+  }\r
+}\r
+\r
+// Test the worst-case performance handling, and assure that is using the\r
+// correct formula for the worst-case number of radix iterations.\r
+template<unsigned log_mean_bin_size, unsigned log_min_split_count,\r
+         unsigned log_finishing_count>\r
+void get_min_count_test()\r
+{\r
+  const unsigned min_log_size = log_mean_bin_size + log_min_split_count;\r
+  size_t prev_min_count = absolute_min_count;\r
+  for (int log_range = 0; log_range <= max_int_bits; ++log_range) {\r
+    size_t min_count = get_min_count<log_mean_bin_size, log_min_split_count, \r
+                                     log_finishing_count>(log_range);\r
+    BOOST_CHECK(min_count >= prev_min_count);\r
+    prev_min_count = min_count;\r
+    // When the range is really small, the radix sort will complete in one\r
+    // iteration and worst-case handling doesn't apply.  The code below \r
+    // guarantees the worst-case number of radix sorting iteration.\r
+    if (log_range > min_log_size) {\r
+      BOOST_CHECK(min_count >= (1 << min_log_size));\r
+      int iterations = rough_log_2_size(min_count) - min_log_size;\r
+      BOOST_CHECK(iterations >= 1);\r
+      int base_iterations = max_splits - log_min_split_count;\r
+      int covered_log_range = 0;\r
+      if (iterations > base_iterations) {\r
+        covered_log_range += max_splits * (iterations - base_iterations);\r
+      } else {\r
+        base_iterations = iterations;\r
+      }\r
+      // sum of n to n + x = ((x + 1) * (n + (n + x)))/2 + log_mean_bin_size\r
+      covered_log_range +=\r
+        (base_iterations * (log_min_split_count * 2 + base_iterations - 1))/2 +\r
+        log_mean_bin_size;\r
+      BOOST_CHECK(covered_log_range >= log_range);\r
+      BOOST_CHECK(covered_log_range - max_splits < log_range);\r
+    }\r
+  }\r
+}\r
+\r
+// Test the decision of how many pieces to split up the radix sort into\r
+// (roughly 2^(log_range - log_divisor)) to make sure the results are logical.\r
+void get_log_divisor_test()\r
+{\r
+  for (int log_range = 0; log_range <= max_int_bits; ++log_range) {\r
+    int prev_log_divisor = max_int_bits +\r
+      (std::max)((int)int_log_mean_bin_size, (int)float_log_mean_bin_size);\r
+    for (int log_count = 0; log_count < max_size_bits; ++log_count) {\r
+      size_t count = (one << log_count) - 1;\r
+      BOOST_CHECK(rough_log_2_size(count) == (unsigned)log_count);\r
+      int log_divisor =\r
+        get_log_divisor<int_log_mean_bin_size>(count, log_range);\r
+      // Only process counts >= int_log_finishing_count in this function.\r
+      if (count >= absolute_min_count)\r
+        BOOST_CHECK(log_divisor <= log_range);\r
+      // More pieces should be used the larger count is.\r
+      BOOST_CHECK(log_divisor <= prev_log_divisor);\r
+      prev_log_divisor = log_divisor;\r
+      BOOST_CHECK(log_divisor >= 0);\r
+      if (log_range > log_count) {\r
+        BOOST_CHECK(log_range - log_divisor <= max_splits);\r
+      } else if (log_range <= max_finishing_splits) {\r
+        BOOST_CHECK(log_divisor == 0);\r
+      }\r
+    }\r
+  }\r
+}\r
+\r
+// Verify that is_sorted_or_find_extremes returns true if the data is sorted,\r
+// and otherwise returns the actual min and max.\r
+void is_sorted_or_find_extremes_test()\r
+{\r
+  vector<int> input;\r
+  input.push_back(3);\r
+  input.push_back(5);\r
+  input.push_back(1);\r
+  // Test a sorted input.\r
+  vector<int> sorted_input(input);\r
+  std::sort(sorted_input.begin(), sorted_input.end());\r
+  vector<int>::iterator max, min;\r
+  BOOST_CHECK(detail::is_sorted_or_find_extremes(sorted_input.begin(), \r
+                                                 sorted_input.end(), max, min));\r
+  // Test an unsorted input.\r
+  BOOST_CHECK(!detail::is_sorted_or_find_extremes(input.begin(), input.end(), \r
+                                                  max, min));\r
+  BOOST_CHECK(*min == 1);\r
+  BOOST_CHECK(*max == 5);\r
+  // Test the comparison function version.\r
+  BOOST_CHECK(detail::is_sorted_or_find_extremes(sorted_input.begin(), \r
+                                                 sorted_input.end(), max, min, \r
+                                                 std::less<int>()));\r
+  BOOST_CHECK(!detail::is_sorted_or_find_extremes(sorted_input.begin(), \r
+                                                  sorted_input.end(), \r
+                                                  max, min, \r
+                                                  std::greater<int>()));\r
+  BOOST_CHECK(*min == 5);\r
+  BOOST_CHECK(*max == 1);\r
+\r
+  // Test with floats\r
+  vector<float> float_input;\r
+  float_input.push_back(.3f);\r
+  float_input.push_back(4.0f);\r
+  float_input.push_back(.1f);\r
+  vector<float> sorted_float_input(float_input);\r
+  std::sort(sorted_float_input.begin(), sorted_float_input.end());\r
+  // Test cast_float_iter\r
+  int cast_min = detail::cast_float_iter<int, vector<float>::iterator>(\r
+                     sorted_float_input.begin());\r
+  int cast_max = detail::cast_float_iter<int, vector<float>::iterator>(\r
+                     sorted_float_input.end() - 1);\r
+  BOOST_CHECK(cast_min == float_right_shift()(.1f, 0));\r
+  BOOST_CHECK(cast_max == float_right_shift()(4.0f, 0));\r
+  // Test a sorted input\r
+  int div_max, div_min;\r
+  BOOST_CHECK(detail::is_sorted_or_find_extremes(sorted_float_input.begin(), \r
+                                                 sorted_float_input.end(), \r
+                                                 div_max, div_min));\r
+  // Test an unsorted input.\r
+  BOOST_CHECK(!detail::is_sorted_or_find_extremes(float_input.begin(), \r
+                                                  float_input.end(), \r
+                                                  div_max, div_min));\r
+  BOOST_CHECK(div_min == cast_min);\r
+  BOOST_CHECK(div_max == cast_max);\r
+\r
+  // Test with a right_shift functor.\r
+  BOOST_CHECK(detail::is_sorted_or_find_extremes(sorted_float_input.begin(), \r
+                                                 sorted_float_input.end(), \r
+                                                 div_max, div_min, \r
+                                                 float_right_shift()));\r
+  // Test an unsorted input.\r
+  BOOST_CHECK(!detail::is_sorted_or_find_extremes(float_input.begin(), \r
+                                                  float_input.end(), div_max, \r
+                                                  div_min, \r
+                                                  float_right_shift()));\r
+  BOOST_CHECK(div_min == float_right_shift()(.1f, 0));\r
+  BOOST_CHECK(div_max == float_right_shift()(4.0f, 0));\r
+}\r
+\r
+// Make sure bins are created correctly.\r
+void size_bins_test() {\r
+  size_t bin_sizes[1 << detail::max_finishing_splits];\r
+  bin_sizes[0] = 1;\r
+  bin_sizes[2] = 7;\r
+  const int old_bin_value = 7;\r
+  std::vector<int> old_bins;\r
+  old_bins.push_back(old_bin_value);\r
+  std::vector<vector<int>::iterator> bin_cache;\r
+  bin_cache.push_back(old_bins.begin());\r
+  unsigned cache_offset = 1;\r
+  unsigned cache_end;\r
+  const unsigned bin_count = 2;\r
+  std::vector<int>::iterator *new_cache_start = \r
+    size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);\r
+  BOOST_CHECK((new_cache_start - &bin_cache[0]) == cache_offset);\r
+  BOOST_CHECK(bin_sizes[0] == 0);\r
+  BOOST_CHECK(bin_sizes[1] == 0);\r
+  BOOST_CHECK(bin_sizes[2] == 7);  // shouldn't modify past bin_count\r
+  BOOST_CHECK(cache_end == 3);\r
+  BOOST_CHECK(bin_cache.size() == cache_end);\r
+  BOOST_CHECK(old_bins[0] == old_bin_value);\r
+}\r
+\r
+// Test the specialized 3-way swap loops.\r
+void swap_loop_test() {\r
+  size_t bin_sizes[1 << detail::max_finishing_splits];\r
+  bin_sizes[0] = bin_sizes[1] = 2;\r
+  bin_sizes[2] = 1;\r
+\r
+  // test integer swap loop\r
+  vector<int> ints;\r
+  const int int_div_min = 3;\r
+  const int int_log_divisor = 1;\r
+  const unsigned int_offset = int_div_min << int_log_divisor;\r
+  ints.push_back(2 + int_offset);\r
+  ints.push_back(1 + int_offset); // stays in place\r
+  ints.push_back(4 + int_offset);\r
+  ints.push_back(3 + int_offset);\r
+  ints.push_back(0 + int_offset);\r
+  vector<vector<int>::iterator> int_bin_vector;\r
+  int_bin_vector.push_back(ints.begin());\r
+  int_bin_vector.push_back(int_bin_vector[0] + bin_sizes[0]);\r
+  int_bin_vector.push_back(int_bin_vector[1] + bin_sizes[1]);\r
+  vector<int>::iterator next_int_bin_start = int_bin_vector[0];\r
+  vector<int>::iterator *int_bins = &int_bin_vector[0];\r
+  int_right_shift integer_right_shift;\r
+  swap_loop(int_bins, next_int_bin_start, 0, integer_right_shift, bin_sizes, \r
+            int_log_divisor, int_div_min);\r
+  for (unsigned i = 0; i < ints.size(); ++i) {\r
+    BOOST_CHECK(ints[i] == int(int_offset + i));\r
+  }\r
+  BOOST_CHECK(next_int_bin_start == ints.begin() + bin_sizes[0]);\r
+\r
+  // test float swap loop\r
+  vector<float> floats;\r
+  const int float_four_as_int = float_mem_cast<float, int>(4.0f);\r
+  const int float_log_divisor = \r
+    rough_log_2_size(float_mem_cast<float, int>(5.0f) - float_four_as_int);\r
+  const int float_div_min = float_four_as_int >> float_log_divisor;\r
+  floats.push_back(6.0f);\r
+  floats.push_back(5.0f); // stays in place\r
+  floats.push_back(8.0f);\r
+  floats.push_back(7.0f);\r
+  floats.push_back(4.0f);\r
+  vector<vector<float>::iterator> float_bin_vector;\r
+  float_bin_vector.push_back(floats.begin());\r
+  float_bin_vector.push_back(float_bin_vector[0] + bin_sizes[0]);\r
+  float_bin_vector.push_back(float_bin_vector[1] + bin_sizes[1]);\r
+  vector<float>::iterator next_float_bin_start = float_bin_vector[0];\r
+  vector<float>::iterator *float_bins = &float_bin_vector[0];\r
+  float_swap_loop(float_bins, next_float_bin_start, 0, bin_sizes,\r
+                  float_log_divisor, float_div_min);\r
+  for (unsigned i = 0; i < floats.size(); ++i) {\r
+    BOOST_CHECK(floats[i] == 4.0f + i);\r
+  }\r
+  BOOST_CHECK(next_float_bin_start == floats.begin() + bin_sizes[0]);\r
+}\r
+\r
+} // end anonymous namespace\r
+\r
+// test main \r
+int test_main( int, char*[] )\r
+{\r
+  roughlog2_test();\r
+  get_min_count_test<int_log_mean_bin_size, int_log_min_split_count,\r
+                    int_log_finishing_count>();\r
+  get_min_count_test<float_log_mean_bin_size, float_log_min_split_count,\r
+                    float_log_finishing_count>();\r
+  get_log_divisor_test();\r
+  is_sorted_or_find_extremes_test();\r
+  size_bins_test();\r
+  swap_loop_test();\r
+  return 0;\r
+}\r
index 5ccb1e6451e9a5332e40974808a9be30bb9ce030..84dc25b46b96598185af0c395dd4feb1b94ae9c8 100644 (file)
-//  Boost Sort library string_sort_test.cpp file  ----------------------------//
-
-//  Copyright Steven Ross 2009. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/sort for library home page.
-
-#include <boost/sort/spreadsort/detail/string_sort.hpp>
-#include <boost/sort/spreadsort/string_sort.hpp>
-#include <boost/sort/spreadsort/spreadsort.hpp>
-// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
-#include <boost/test/test_tools.hpp>
-#include <vector>
-#include <string>
-
-
-using namespace std;
-using namespace boost::sort::spreadsort;
-using boost::sort::spreadsort::detail::offset_less_than;
-using boost::sort::spreadsort::detail::offset_greater_than;
-using boost::sort::spreadsort::detail::update_offset;
-
-struct bracket {
-  unsigned char operator()(const string &x, size_t offset) const {
-    return x[offset];
-  }
-};
-
-struct wbracket {
-  wchar_t operator()(const wstring &x, size_t offset) const {
-    return x[offset];
-  }
-};
-
-struct get_size {
-  size_t operator()(const string &x) const{ return x.size(); }
-};
-
-struct wget_size {
-  size_t operator()(const wstring &x) const{ return x.size(); }
-};
-
-static const unsigned input_count = 100000;
-
-// Test that update_offset finds the first character with a difference.
-void update_offset_test() {
-  vector<string> input;
-  input.push_back("test1");
-  input.push_back("test2");
-  size_t char_offset = 1;
-  update_offset<vector<string>::iterator, unsigned char>(input.begin(),
-                                                         input.end(),
-                                                         char_offset);
-  BOOST_CHECK(char_offset == 4);
-
-  // Functor version
-  char_offset = 1;
-  update_offset(input.begin(), input.end(), char_offset, bracket(), get_size());
-  BOOST_CHECK(char_offset == 4);
-}
-
-// Test that offset comparison operators only look after the offset.
-void offset_comparison_test() {
-  string input1 = "ab";
-  string input2 = "ba";
-  string input3 = "aba";
-  offset_less_than<string, unsigned char> less_than(0);
-  offset_greater_than<string, unsigned char> greater_than(0);
-  BOOST_CHECK(less_than(input1, input2));
-  BOOST_CHECK(less_than(input1, input3));
-  BOOST_CHECK(!less_than(input2, input1));
-  BOOST_CHECK(!less_than(input1, input1));
-  BOOST_CHECK(!greater_than(input1, input2));
-  BOOST_CHECK(!greater_than(input1, input3));
-  BOOST_CHECK(greater_than(input2, input1));
-  BOOST_CHECK(!greater_than(input1, input1));
-
-  // Offset comparisons only check after the specified offset.
-  offset_less_than<string, unsigned char> offset_less(1);
-  offset_greater_than<string, unsigned char> offset_greater(1);
-  BOOST_CHECK(!offset_less(input1, input2));
-  BOOST_CHECK(offset_less(input1, input3));
-  BOOST_CHECK(offset_less(input2, input1));
-  BOOST_CHECK(!offset_less(input1, input1));
-  BOOST_CHECK(offset_greater(input1, input2));
-  BOOST_CHECK(!offset_greater(input1, input3));
-  BOOST_CHECK(!offset_greater(input2, input1));
-  BOOST_CHECK(!offset_greater(input1, input1));
-}
-
-void string_test()
-{
-  // Prepare inputs
-  vector<string> base_vec;
-  const unsigned max_length = 32;
-  srand(1);
-  //Generating semirandom numbers
-  for (unsigned u = 0; u < input_count; ++u) {
-    unsigned length = rand() % max_length;
-    string result;
-    for (unsigned v = 0; v < length; ++v) {
-      result.push_back(rand() % 256);
-    }
-    base_vec.push_back(result);
-  }
-  vector<string> sorted_vec = base_vec;
-  vector<string> test_vec = base_vec;
-  std::sort(sorted_vec.begin(), sorted_vec.end());
-  //Testing basic call
-  string_sort(test_vec.begin(), test_vec.end());
-  BOOST_CHECK(test_vec == sorted_vec);
-  //Testing boost::sort::spreadsort wrapper
-  test_vec = base_vec;
-  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());
-  BOOST_CHECK(test_vec == sorted_vec);
-  //Character functors
-  test_vec = base_vec;
-  string_sort(test_vec.begin(), test_vec.end(), bracket(), get_size());
-  BOOST_CHECK(test_vec == sorted_vec);
-  //All functors
-  test_vec = base_vec;
-  string_sort(test_vec.begin(), test_vec.end(), bracket(), get_size(),
-              less<string>());
-  BOOST_CHECK(test_vec == sorted_vec);
-  //reverse order
-  std::sort(sorted_vec.begin(), sorted_vec.end(), greater<string>());
-  reverse_string_sort(test_vec.begin(), test_vec.end(), greater<string>());
-  BOOST_CHECK(test_vec == sorted_vec);
-  //reverse order with functors
-  test_vec = base_vec;
-  reverse_string_sort(test_vec.begin(), test_vec.end(), bracket(), get_size(),
-                      greater<string>());
-  BOOST_CHECK(test_vec == sorted_vec);  
-}
-
-// Verify that 0, 1, and input_count empty strings all sort correctly.
-void corner_test() {
-  vector<string> test_vec;
-  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());
-  test_vec.resize(1);
-  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());
-  BOOST_CHECK(test_vec[0].empty());
-  test_vec.resize(input_count);
-  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());
-  BOOST_CHECK(test_vec.size() == input_count);
-  for (unsigned i = 0; i < test_vec.size(); ++i) {
-    BOOST_CHECK(test_vec[i].empty());
-  }
-}
-
-// test main 
-int test_main( int, char*[] )
-{
-  update_offset_test();
-  offset_comparison_test();
-  string_test();
-  corner_test();
-  return 0;
-}
+//  Boost Sort library string_sort_test.cpp file  ----------------------------//\r
+\r
+//  Copyright Steven Ross 2009. Use, modification and\r
+//  distribution is subject to the Boost Software License, Version\r
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at\r
+//  http://www.boost.org/LICENSE_1_0.txt)\r
+\r
+//  See http://www.boost.org/libs/sort for library home page.\r
+\r
+#include <boost/sort/spreadsort/detail/string_sort.hpp>\r
+#include <boost/sort/spreadsort/string_sort.hpp>\r
+#include <boost/sort/spreadsort/spreadsort.hpp>\r
+// Include unit test framework\r
+#include <boost/test/included/test_exec_monitor.hpp>\r
+#include <boost/test/test_tools.hpp>\r
+#include <vector>\r
+#include <string>\r
+\r
+\r
+using namespace std;\r
+using namespace boost::sort::spreadsort;\r
+using boost::sort::spreadsort::detail::offset_less_than;\r
+using boost::sort::spreadsort::detail::offset_greater_than;\r
+using boost::sort::spreadsort::detail::update_offset;\r
+\r
+struct bracket {\r
+  unsigned char operator()(const string &x, size_t offset) const {\r
+    return x[offset];\r
+  }\r
+};\r
+\r
+struct wbracket {\r
+  wchar_t operator()(const wstring &x, size_t offset) const {\r
+    return x[offset];\r
+  }\r
+};\r
+\r
+struct get_size {\r
+  size_t operator()(const string &x) const{ return x.size(); }\r
+};\r
+\r
+struct wget_size {\r
+  size_t operator()(const wstring &x) const{ return x.size(); }\r
+};\r
+\r
+static const unsigned input_count = 100000;\r
+\r
+// Test that update_offset finds the first character with a difference.\r
+void update_offset_test() {\r
+  vector<string> input;\r
+  input.push_back("test1");\r
+  input.push_back("test2");\r
+  size_t char_offset = 1;\r
+  update_offset<vector<string>::iterator, unsigned char>(input.begin(),\r
+                                                         input.end(),\r
+                                                         char_offset);\r
+  BOOST_CHECK(char_offset == 4);\r
+\r
+  // Functor version\r
+  char_offset = 1;\r
+  update_offset(input.begin(), input.end(), char_offset, bracket(), get_size());\r
+  BOOST_CHECK(char_offset == 4);\r
+}\r
+\r
+// Test that offset comparison operators only look after the offset.\r
+void offset_comparison_test() {\r
+  string input1 = "ab";\r
+  string input2 = "ba";\r
+  string input3 = "aba";\r
+  offset_less_than<string, unsigned char> less_than(0);\r
+  offset_greater_than<string, unsigned char> greater_than(0);\r
+  BOOST_CHECK(less_than(input1, input2));\r
+  BOOST_CHECK(less_than(input1, input3));\r
+  BOOST_CHECK(!less_than(input2, input1));\r
+  BOOST_CHECK(!less_than(input1, input1));\r
+  BOOST_CHECK(!greater_than(input1, input2));\r
+  BOOST_CHECK(!greater_than(input1, input3));\r
+  BOOST_CHECK(greater_than(input2, input1));\r
+  BOOST_CHECK(!greater_than(input1, input1));\r
+\r
+  // Offset comparisons only check after the specified offset.\r
+  offset_less_than<string, unsigned char> offset_less(1);\r
+  offset_greater_than<string, unsigned char> offset_greater(1);\r
+  BOOST_CHECK(!offset_less(input1, input2));\r
+  BOOST_CHECK(offset_less(input1, input3));\r
+  BOOST_CHECK(offset_less(input2, input1));\r
+  BOOST_CHECK(!offset_less(input1, input1));\r
+  BOOST_CHECK(offset_greater(input1, input2));\r
+  BOOST_CHECK(!offset_greater(input1, input3));\r
+  BOOST_CHECK(!offset_greater(input2, input1));\r
+  BOOST_CHECK(!offset_greater(input1, input1));\r
+}\r
+\r
+void string_test()\r
+{\r
+  // Prepare inputs\r
+  vector<string> base_vec;\r
+  const unsigned max_length = 32;\r
+  srand(1);\r
+  //Generating semirandom numbers\r
+  for (unsigned u = 0; u < input_count; ++u) {\r
+    unsigned length = rand() % max_length;\r
+    string result;\r
+    for (unsigned v = 0; v < length; ++v) {\r
+      result.push_back(rand() % 256);\r
+    }\r
+    base_vec.push_back(result);\r
+  }\r
+  vector<string> sorted_vec = base_vec;\r
+  vector<string> test_vec = base_vec;\r
+  std::sort(sorted_vec.begin(), sorted_vec.end());\r
+  //Testing basic call\r
+  string_sort(test_vec.begin(), test_vec.end());\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+  //Testing boost::sort::spreadsort wrapper\r
+  test_vec = base_vec;\r
+  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+  //Character functors\r
+  test_vec = base_vec;\r
+  string_sort(test_vec.begin(), test_vec.end(), bracket(), get_size());\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+  //All functors\r
+  test_vec = base_vec;\r
+  string_sort(test_vec.begin(), test_vec.end(), bracket(), get_size(),\r
+              less<string>());\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+  //reverse order\r
+  std::sort(sorted_vec.begin(), sorted_vec.end(), greater<string>());\r
+  reverse_string_sort(test_vec.begin(), test_vec.end(), greater<string>());\r
+  BOOST_CHECK(test_vec == sorted_vec);\r
+  //reverse order with functors\r
+  test_vec = base_vec;\r
+  reverse_string_sort(test_vec.begin(), test_vec.end(), bracket(), get_size(),\r
+                      greater<string>());\r
+  BOOST_CHECK(test_vec == sorted_vec);  \r
+}\r
+\r
+// Verify that 0, 1, and input_count empty strings all sort correctly.\r
+void corner_test() {\r
+  vector<string> test_vec;\r
+  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());\r
+  test_vec.resize(1);\r
+  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());\r
+  BOOST_CHECK(test_vec[0].empty());\r
+  test_vec.resize(input_count);\r
+  boost::sort::spreadsort::spreadsort(test_vec.begin(), test_vec.end());\r
+  BOOST_CHECK(test_vec.size() == input_count);\r
+  for (unsigned i = 0; i < test_vec.size(); ++i) {\r
+    BOOST_CHECK(test_vec[i].empty());\r
+  }\r
+}\r
+\r
+// test main \r
+int test_main( int, char*[] )\r
+{\r
+  update_offset_test();\r
+  offset_comparison_test();\r
+  string_test();\r
+  corner_test();\r
+  return 0;\r
+}\r
index e529dcee0136ceaf09edf3ec03184ad02c7baf21..89e65bcf1872362f6a0c3e10ba52e8f383df152a 100644 (file)
@@ -1,37 +1,37 @@
-
-Performing configuration checks
-
-    - symlinks supported       : yes (cached)
-...patience...
-...patience...
-...found 2544 targets...
-...updating 20 targets...
-compile-c-c++ ..\..\..\bin.v2\libs\sort\test\integer_sort.test\msvc-12.0\debug\threading-multi\integer_sort_test.obj
-integer_sort_test.cpp
-msvc.link ..\..\..\bin.v2\libs\sort\test\integer_sort.test\msvc-12.0\debug\threading-multi\integer_sort.exe
-msvc.manifest ..\..\..\bin.v2\libs\sort\test\integer_sort.test\msvc-12.0\debug\threading-multi\integer_sort.exe
-testing.capture-output ..\..\..\bin.v2\libs\sort\test\integer_sort.test\msvc-12.0\debug\threading-multi\integer_sort.run
-        1 file(s) copied.
-**passed** ..\..\..\bin.v2\libs\sort\test\integer_sort.test\msvc-12.0\debug\threading-multi\integer_sort.test
-compile-c-c++ ..\..\..\bin.v2\libs\sort\test\float_sort.test\msvc-12.0\debug\threading-multi\float_sort_test.obj
-float_sort_test.cpp
-msvc.link ..\..\..\bin.v2\libs\sort\test\float_sort.test\msvc-12.0\debug\threading-multi\float_sort.exe
-msvc.manifest ..\..\..\bin.v2\libs\sort\test\float_sort.test\msvc-12.0\debug\threading-multi\float_sort.exe
-testing.capture-output ..\..\..\bin.v2\libs\sort\test\float_sort.test\msvc-12.0\debug\threading-multi\float_sort.run
-        1 file(s) copied.
-**passed** ..\..\..\bin.v2\libs\sort\test\float_sort.test\msvc-12.0\debug\threading-multi\float_sort.test
-compile-c-c++ ..\..\..\bin.v2\libs\sort\test\string_sort.test\msvc-12.0\debug\threading-multi\string_sort_test.obj
-string_sort_test.cpp
-msvc.link ..\..\..\bin.v2\libs\sort\test\string_sort.test\msvc-12.0\debug\threading-multi\string_sort.exe
-msvc.manifest ..\..\..\bin.v2\libs\sort\test\string_sort.test\msvc-12.0\debug\threading-multi\string_sort.exe
-testing.capture-output ..\..\..\bin.v2\libs\sort\test\string_sort.test\msvc-12.0\debug\threading-multi\string_sort.run
-        1 file(s) copied.
-**passed** ..\..\..\bin.v2\libs\sort\test\string_sort.test\msvc-12.0\debug\threading-multi\string_sort.test
-compile-c-c++ ..\..\..\bin.v2\libs\sort\test\sort_detail.test\msvc-12.0\debug\threading-multi\sort_detail_test.obj
-sort_detail_test.cpp
-msvc.link ..\..\..\bin.v2\libs\sort\test\sort_detail.test\msvc-12.0\debug\threading-multi\sort_detail.exe
-msvc.manifest ..\..\..\bin.v2\libs\sort\test\sort_detail.test\msvc-12.0\debug\threading-multi\sort_detail.exe
-testing.capture-output ..\..\..\bin.v2\libs\sort\test\sort_detail.test\msvc-12.0\debug\threading-multi\sort_detail.run
-        1 file(s) copied.
-**passed** ..\..\..\bin.v2\libs\sort\test\sort_detail.test\msvc-12.0\debug\threading-multi\sort_detail.test
-...updated 20 targets...
+\r
+Performing configuration checks\r
+\r
+    - symlinks supported       : yes (cached)\r
+...patience...\r
+...patience...\r
+...found 2544 targets...\r
+...updating 20 targets...\r
+compile-c-c++ ..\..\..\bin.v2\libs\sort\test\integer_sort.test\msvc-12.0\debug\threading-multi\integer_sort_test.obj\r
+integer_sort_test.cpp\r
+msvc.link ..\..\..\bin.v2\libs\sort\test\integer_sort.test\msvc-12.0\debug\threading-multi\integer_sort.exe\r
+msvc.manifest ..\..\..\bin.v2\libs\sort\test\integer_sort.test\msvc-12.0\debug\threading-multi\integer_sort.exe\r
+testing.capture-output ..\..\..\bin.v2\libs\sort\test\integer_sort.test\msvc-12.0\debug\threading-multi\integer_sort.run\r
+        1 file(s) copied.\r
+**passed** ..\..\..\bin.v2\libs\sort\test\integer_sort.test\msvc-12.0\debug\threading-multi\integer_sort.test\r
+compile-c-c++ ..\..\..\bin.v2\libs\sort\test\float_sort.test\msvc-12.0\debug\threading-multi\float_sort_test.obj\r
+float_sort_test.cpp\r
+msvc.link ..\..\..\bin.v2\libs\sort\test\float_sort.test\msvc-12.0\debug\threading-multi\float_sort.exe\r
+msvc.manifest ..\..\..\bin.v2\libs\sort\test\float_sort.test\msvc-12.0\debug\threading-multi\float_sort.exe\r
+testing.capture-output ..\..\..\bin.v2\libs\sort\test\float_sort.test\msvc-12.0\debug\threading-multi\float_sort.run\r
+        1 file(s) copied.\r
+**passed** ..\..\..\bin.v2\libs\sort\test\float_sort.test\msvc-12.0\debug\threading-multi\float_sort.test\r
+compile-c-c++ ..\..\..\bin.v2\libs\sort\test\string_sort.test\msvc-12.0\debug\threading-multi\string_sort_test.obj\r
+string_sort_test.cpp\r
+msvc.link ..\..\..\bin.v2\libs\sort\test\string_sort.test\msvc-12.0\debug\threading-multi\string_sort.exe\r
+msvc.manifest ..\..\..\bin.v2\libs\sort\test\string_sort.test\msvc-12.0\debug\threading-multi\string_sort.exe\r
+testing.capture-output ..\..\..\bin.v2\libs\sort\test\string_sort.test\msvc-12.0\debug\threading-multi\string_sort.run\r
+        1 file(s) copied.\r
+**passed** ..\..\..\bin.v2\libs\sort\test\string_sort.test\msvc-12.0\debug\threading-multi\string_sort.test\r
+compile-c-c++ ..\..\..\bin.v2\libs\sort\test\sort_detail.test\msvc-12.0\debug\threading-multi\sort_detail_test.obj\r
+sort_detail_test.cpp\r
+msvc.link ..\..\..\bin.v2\libs\sort\test\sort_detail.test\msvc-12.0\debug\threading-multi\sort_detail.exe\r
+msvc.manifest ..\..\..\bin.v2\libs\sort\test\sort_detail.test\msvc-12.0\debug\threading-multi\sort_detail.exe\r
+testing.capture-output ..\..\..\bin.v2\libs\sort\test\sort_detail.test\msvc-12.0\debug\threading-multi\sort_detail.run\r
+        1 file(s) copied.\r
+**passed** ..\..\..\bin.v2\libs\sort\test\sort_detail.test\msvc-12.0\debug\threading-multi\sort_detail.test\r
+...updated 20 targets...\r
index f8ef35503ed044d7eae5ff6f030f6be6306bf3bd..63faec6ba525fab98d9e1b8d3f5b1249fe3b79d5 100644 (file)
@@ -1595,8 +1595,9 @@ def zap_linux(dev):
         # Thoroughly wipe all partitions of any traces of
         # Filesystems or OSD Journals
         #
-        # In addition we need to write 10M of data to each partition
-        # to make sure that after re-creating the same partition
+        # In addition we need to write 110M (read following comment for more
+        # details on the context of this magic number) of data to each
+        # partition to make sure that after re-creating the same partition
         # there is no trace left of any previous Filesystem or OSD
         # Journal
 
@@ -1612,13 +1613,29 @@ def zap_linux(dev):
                 ],
             )
 
+            # for an typical bluestore device, it has
+            # 1. a 100M xfs data partition
+            # 2. a bluestore_block_size block partition
+            # 3. a bluestore_block_db_size block.db partition
+            # 4. a bluestore_block_wal_size block.wal partition
+            # so we need to wipe out the bits storing the bits storing
+            # bluestore's collections' meta information in that case to
+            # prevent OSD from comparing the meta data, like OSD id and fsid,
+            # stored on the device to be zapped with the oness passed in. here,
+            # we assume that the allocator of bluestore puts these meta data
+            # at the beginning of the block partition. without knowning the
+            # actual layout of the bluefs, we add extra 10M to be on the safe
+            # side. if this partition was formatted for a filesystem, 10MB
+            # would be more than enough to nuke its superblock.
+            count = min(PrepareBluestoreData.SPACE_SIZE + 10,
+                        get_dev_size(partition))
             command_check_call(
                 [
                     'dd',
                     'if=/dev/zero',
                     'of={path}'.format(path=partition),
                     'bs=1M',
-                    'count=10',
+                    'count={count}'.format(count=count),
                 ],
             )
 
@@ -3099,9 +3116,10 @@ class PrepareFilestoreData(PrepareData):
 
 
 class PrepareBluestoreData(PrepareData):
+    SPACE_SIZE = 100
 
     def get_space_size(self):
-        return 100  # MB
+        return self.SPACE_SIZE  # MB
 
     def prepare_device(self, *to_prepare_list):
         super(PrepareBluestoreData, self).prepare_device(*to_prepare_list)
index 868effb8309b7e771755960084e27a0a1d40eba7..656c19ddfb3483ccb248461d0da14e5b312aa938 100644 (file)
@@ -665,6 +665,7 @@ class Volume(object):
         self.lv_api = kw
         self.name = kw['lv_name']
         self.tags = parse_tags(kw['lv_tags'])
+        self.encrypted = self.tags.get('ceph.encrypted', '0') == '1'
 
     def __str__(self):
         return '<%s>' % self.lv_api['lv_path']
index ac7033e6d90eaf62133e5cb42ffe6e45b53c7d77..869fcf20016d74cb14e16aa31f32cc98082d8ab3 100644 (file)
@@ -48,62 +48,69 @@ def common_parser(prog, description):
         formatter_class=argparse.RawDescriptionHelpFormatter,
         description=description,
     )
-    required_args = parser.add_argument_group('required arguments')
-    parser.add_argument(
-        '--journal',
-        help='(filestore) A logical volume (vg_name/lv_name), or path to a device',
-    )
-    required_args.add_argument(
+
+    required_group = parser.add_argument_group('required arguments')
+    filestore_group = parser.add_argument_group('filestore')
+    bluestore_group = parser.add_argument_group('bluestore')
+
+    required_group.add_argument(
         '--data',
         required=True,
         type=arg_validators.LVPath(),
         help='OSD data path. A physical device or logical volume',
     )
-    parser.add_argument(
-        '--journal-size',
-        default=5,
-        metavar='GB',
-        type=int,
-        help='(filestore) Size (in GB) for the journal',
+
+    filestore_group.add_argument(
+        '--filestore',
+        action='store_true',
+        help='Use the filestore objectstore',
     )
-    parser.add_argument(
+
+    filestore_group.add_argument(
+        '--journal',
+        help='(REQUIRED) A logical volume (vg_name/lv_name), or path to a device',
+    )
+
+    bluestore_group.add_argument(
         '--bluestore',
         action='store_true',
         help='Use the bluestore objectstore',
     )
-    parser.add_argument(
-        '--filestore',
-        action='store_true',
-        help='Use the filestore objectstore',
+
+    bluestore_group.add_argument(
+        '--block.db',
+        dest='block_db',
+        help='Path to bluestore block.db logical volume or device',
+    )
+
+    bluestore_group.add_argument(
+        '--block.wal',
+        dest='block_wal',
+        help='Path to bluestore block.wal logical volume or device',
     )
+
     parser.add_argument(
         '--osd-id',
         help='Reuse an existing OSD id',
     )
+
     parser.add_argument(
         '--osd-fsid',
         help='Reuse an existing OSD fsid',
     )
-    parser.add_argument(
-        '--block.db',
-        dest='block_db',
-        help='(bluestore) Path to bluestore block.db logical volume or device',
-    )
-    parser.add_argument(
-        '--block.wal',
-        dest='block_wal',
-        help='(bluestore) Path to bluestore block.wal logical volume or device',
-    )
+
     parser.add_argument(
         '--crush-device-class',
         dest='crush_device_class',
         help='Crush device class to assign this OSD to',
     )
+
     parser.add_argument(
         '--dmcrypt',
         action='store_true',
         help='Enable device encryption via dm-crypt',
     )
+
     # Do not parse args, so that consumers can do something before the args get
     # parsed triggering argparse behavior
     return parser
index f82ff3e6b8bbc9cb40db12df1c89a1e10036f9ce..18c80657ec8d20a92872586fb3ce85c467de7b34 100644 (file)
@@ -2,6 +2,7 @@ from __future__ import print_function
 from textwrap import dedent
 import logging
 from ceph_volume.util import system
+from ceph_volume.util.arg_validators import exclude_group_options
 from ceph_volume import decorators, terminal
 from .common import create_parser, rollback_osd
 from .prepare import Prepare
@@ -64,6 +65,7 @@ class Create(object):
         if len(self.argv) == 0:
             print(sub_command_help)
             return
+        exclude_group_options(parser, groups=['filestore', 'bluestore'], argv=self.argv)
         args = parser.parse_args(self.argv)
         # Default to bluestore here since defaulting it in add_argument may
         # cause both to be True
index 0ee3d52cad55353adf42eb4f6a5d0aa4fdf6c495..360cf04ac645d1f8de917d50a3ef3666c72efde7 100644 (file)
@@ -6,6 +6,7 @@ from textwrap import dedent
 from ceph_volume.util import prepare as prepare_utils
 from ceph_volume.util import encryption as encryption_utils
 from ceph_volume.util import system, disk
+from ceph_volume.util.arg_validators import exclude_group_options
 from ceph_volume import conf, decorators, terminal
 from ceph_volume.api import lvm as api
 from .common import prepare_parser, rollback_osd
@@ -357,6 +358,7 @@ class Prepare(object):
         if len(self.argv) == 0:
             print(sub_command_help)
             return
+        exclude_group_options(parser, argv=self.argv, groups=['filestore', 'bluestore'])
         args = parser.parse_args(self.argv)
         # Default to bluestore here since defaulting it in add_argument may
         # cause both to be True
index 10d348ceadfdb4ed4f63abd5939a329f06f78b9e..ee5cdf97b6a590726df2f3c16346f44c8355c14a 100644 (file)
@@ -5,7 +5,7 @@ from textwrap import dedent
 
 from ceph_volume import decorators, terminal, process
 from ceph_volume.api import lvm as api
-from ceph_volume.util import system
+from ceph_volume.util import system, encryption, disk
 
 logger = logging.getLogger(__name__)
 mlogger = terminal.MultiLogger(__name__)
@@ -67,11 +67,27 @@ class Zap(object):
             vg_name = pv.vg_name
             lv = api.get_lv(vg_name=vg_name)
 
+        dmcrypt = False
+        dmcrypt_uuid = None
         if lv:
             osd_path = "/var/lib/ceph/osd/{}-{}".format(lv.tags['ceph.cluster_name'], lv.tags['ceph.osd_id'])
+            dmcrypt_uuid = lv.lv_uuid
+            dmcrypt = lv.encrypted
             if system.path_is_mounted(osd_path):
                 mlogger.info("Unmounting %s", osd_path)
                 system.unmount(osd_path)
+        else:
+            # we're most likely dealing with a partition here, check to
+            # see if it was encrypted
+            partuuid = disk.get_partuuid(device)
+            if encryption.status("/dev/mapper/{}".format(partuuid)):
+                dmcrypt_uuid = partuuid
+                dmcrypt = True
+
+        if dmcrypt and dmcrypt_uuid:
+            dmcrypt_path = "/dev/mapper/{}".format(dmcrypt_uuid)
+            mlogger.info("Closing encrypted path %s", dmcrypt_path)
+            encryption.dmcrypt_close(dmcrypt_path)
 
         if args.destroy and pv:
             logger.info("Found a physical volume created from %s, will destroy all it's vgs and lvs", device)
index 70cb6be87df04d5d8305efa31f9be00f9f1ba870..b3543b1a21d63e86b4daf40d3a689febf118bb97 100644 (file)
@@ -137,6 +137,7 @@ Ceph Conf: {ceph_path}
             conf.log_path = os.path.join(args.log_path, 'ceph-volume.log')
         log.setup()
         logger = logging.getLogger(__name__)
+        logger.info("Running command: ceph-volume %s %s", " ".join(main_args), " ".join(subcommand_args))
         # set all variables from args and load everything needed according to
         # them
         self.load_ceph_conf_path(cluster_name=args.cluster)
diff --git a/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/test_create.py b/ceph/src/ceph-volume/ceph_volume/tests/devices/lvm/test_create.py
new file mode 100644 (file)
index 0000000..a08564c
--- /dev/null
@@ -0,0 +1,45 @@
+import pytest
+from ceph_volume.devices import lvm
+
+
+class TestCreate(object):
+
+    def test_main_spits_help_with_no_arguments(self, capsys):
+        lvm.create.Create([]).main()
+        stdout, stderr = capsys.readouterr()
+        assert 'Create an OSD by assigning an ID and FSID' in stdout
+
+    def test_main_shows_full_help(self, capsys):
+        with pytest.raises(SystemExit):
+            lvm.create.Create(argv=['--help']).main()
+        stdout, stderr = capsys.readouterr()
+        assert 'Use the filestore objectstore' in stdout
+        assert 'Use the bluestore objectstore' in stdout
+        assert 'A physical device or logical' in stdout
+
+    def test_excludes_filestore_bluestore_flags(self, capsys):
+        with pytest.raises(SystemExit):
+            lvm.create.Create(argv=['--data', '/dev/sdfoo', '--filestore', '--bluestore']).main()
+        stdout, sterr = capsys.readouterr()
+        expected = 'Cannot use --filestore (filestore) with --bluestore (bluestore)'
+        assert expected in stdout
+
+    def test_excludes_other_filestore_bluestore_flags(self, capsys):
+        with pytest.raises(SystemExit):
+            lvm.create.Create(argv=[
+                '--bluestore', '--data', '/dev/sdfoo',
+                '--journal', '/dev/sf14',
+            ]).main()
+        stdout, sterr = capsys.readouterr()
+        expected = 'Cannot use --bluestore (bluestore) with --journal (filestore)'
+        assert expected in stdout
+
+    def test_excludes_block_and_journal_flags(self, capsys):
+        with pytest.raises(SystemExit):
+            lvm.create.Create(argv=[
+                '--bluestore', '--data', '/dev/sdfoo', '--block.db', 'vg/ceph1',
+                '--journal', '/dev/sf14',
+            ]).main()
+        stdout, sterr = capsys.readouterr()
+        expected = 'Cannot use --block.db (bluestore) with --journal (filestore)'
+        assert expected in stdout
index d46d33ac8f65d0eadf20121f7ad013077ea87590..bc2486cf6944fbd795383b3ecd18b1b100da5358 100644 (file)
@@ -31,6 +31,7 @@ class TestPrepareDevice(object):
         assert 'Cannot use device (/dev/var/foo)' in str(error)
         assert 'A vg/lv path or an existing device is needed' in str(error)
 
+
 class TestPrepare(object):
 
     def test_main_spits_help_with_no_arguments(self, capsys):
@@ -46,6 +47,33 @@ class TestPrepare(object):
         assert 'Use the bluestore objectstore' in stdout
         assert 'A physical device or logical' in stdout
 
+    def test_excludes_filestore_bluestore_flags(self, capsys):
+        with pytest.raises(SystemExit):
+            lvm.prepare.Prepare(argv=['--data', '/dev/sdfoo', '--filestore', '--bluestore']).main()
+        stdout, stderr = capsys.readouterr()
+        expected = 'Cannot use --filestore (filestore) with --bluestore (bluestore)'
+        assert expected in stdout
+
+    def test_excludes_other_filestore_bluestore_flags(self, capsys):
+        with pytest.raises(SystemExit):
+            lvm.prepare.Prepare(argv=[
+                '--bluestore', '--data', '/dev/sdfoo',
+                '--journal', '/dev/sf14',
+            ]).main()
+        stdout, stderr = capsys.readouterr()
+        expected = 'Cannot use --bluestore (bluestore) with --journal (filestore)'
+        assert expected in stdout
+
+    def test_excludes_block_and_journal_flags(self, capsys):
+        with pytest.raises(SystemExit):
+            lvm.prepare.Prepare(argv=[
+                '--bluestore', '--data', '/dev/sdfoo', '--block.db', 'vg/ceph1',
+                '--journal', '/dev/sf14',
+            ]).main()
+        stdout, stderr = capsys.readouterr()
+        expected = 'Cannot use --block.db (bluestore) with --journal (filestore)'
+        assert expected in stdout
+
 
 class TestGetJournalLV(object):
 
@@ -75,4 +103,3 @@ class TestActivate(object):
         stdout, stderr = capsys.readouterr()
         assert 'optional arguments' in stdout
         assert 'positional arguments' in stdout
-
diff --git a/ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml b/ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml
new file mode 100644 (file)
index 0000000..2009aae
--- /dev/null
@@ -0,0 +1,40 @@
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: stop ceph-osd@2 daemon
+      service:
+        name: ceph-osd@2
+        state: stopped
+
+    - name: destroy osd.2 
+      command: "ceph osd destroy osd.2 --yes-i-really-mean-it"
+
+    - name: zap /dev/sdd1 
+      command: "ceph-volume lvm zap /dev/sdd1 --destroy"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+
+    - name: redeploy osd.2 using /dev/sdd1 
+      command: "ceph-volume lvm create --bluestore --data /dev/sdd1 --osd-id 2"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+
+    - name: stop ceph-osd@0 daemon
+      service:
+        name: ceph-osd@0
+        state: stopped
+
+    - name: destroy osd.0 
+      command: "ceph osd destroy osd.0 --yes-i-really-mean-it"
+
+    - name: zap test_group/data-lv1 
+      command: "ceph-volume lvm zap test_group/data-lv1"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+
+    - name: redeploy osd.0 using test_group/data-lv1 
+      command: "ceph-volume lvm create --bluestore --data test_group/data-lv1 --osd-id 0"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
diff --git a/ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/test.yml b/ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/test.yml
new file mode 100644 (file)
index 0000000..c1ade2f
--- /dev/null
@@ -0,0 +1,27 @@
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: stop ceph-osd@2 daemon
+      service:
+        name: ceph-osd@2
+        state: stopped
+
+    - name: destroy osd.2 
+      command: "ceph osd destroy osd.2 --yes-i-really-mean-it"
+
+    - name: zap /dev/sdd1 
+      command: "ceph-volume lvm zap /dev/sdd1 --destroy"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+
+    - name: zap /dev/sdd2 
+      command: "ceph-volume lvm zap /dev/sdd2 --destroy"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+
+    - name: redeploy osd.2 using /dev/sdd1 
+      command: "ceph-volume lvm create --filestore --data /dev/sdd1 --journal /dev/sdd2 --osd-id 2"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
index 2ccc4aea88274d41d96371dee7d496cce729d7d4..a2c08e753070eededa96824c389d29a136d73998 100644 (file)
@@ -12,6 +12,7 @@ setenv=
   ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config
   ANSIBLE_STDOUT_CALLBACK = debug
   ANSIBLE_RETRY_FILES_ENABLED = False
+  ANSIBLE_SSH_RETRIES = 5
   VAGRANT_CWD = {changedir}
   CEPH_VOLUME_DEBUG = 1
 deps=
@@ -63,9 +64,9 @@ commands=
   testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/tests
 
   # destroy an OSD, zap it's device and recreate it using it's ID
-  create: ansible-playbook -vv -i {changedir}/hosts {changedir}/test.yml
+  ansible-playbook -vv -i {changedir}/hosts {changedir}/test.yml
 
   # retest to ensure cluster came back up correctly
-  create: testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/tests
+  testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/tests
 
   vagrant destroy --force
diff --git a/ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/dmcrypt/test.yml b/ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/dmcrypt/test.yml
new file mode 100644 (file)
index 0000000..2009aae
--- /dev/null
@@ -0,0 +1,40 @@
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: stop ceph-osd@2 daemon
+      service:
+        name: ceph-osd@2
+        state: stopped
+
+    - name: destroy osd.2 
+      command: "ceph osd destroy osd.2 --yes-i-really-mean-it"
+
+    - name: zap /dev/sdd1 
+      command: "ceph-volume lvm zap /dev/sdd1 --destroy"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+
+    - name: redeploy osd.2 using /dev/sdd1 
+      command: "ceph-volume lvm create --bluestore --data /dev/sdd1 --osd-id 2"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+
+    - name: stop ceph-osd@0 daemon
+      service:
+        name: ceph-osd@0
+        state: stopped
+
+    - name: destroy osd.0 
+      command: "ceph osd destroy osd.0 --yes-i-really-mean-it"
+
+    - name: zap test_group/data-lv1 
+      command: "ceph-volume lvm zap test_group/data-lv1"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+
+    - name: redeploy osd.0 using test_group/data-lv1 
+      command: "ceph-volume lvm create --bluestore --data test_group/data-lv1 --osd-id 0"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
diff --git a/ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/dmcrypt/test.yml b/ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/dmcrypt/test.yml
new file mode 100644 (file)
index 0000000..c1ade2f
--- /dev/null
@@ -0,0 +1,27 @@
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    - name: stop ceph-osd@2 daemon
+      service:
+        name: ceph-osd@2
+        state: stopped
+
+    - name: destroy osd.2 
+      command: "ceph osd destroy osd.2 --yes-i-really-mean-it"
+
+    - name: zap /dev/sdd1 
+      command: "ceph-volume lvm zap /dev/sdd1 --destroy"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+
+    - name: zap /dev/sdd2 
+      command: "ceph-volume lvm zap /dev/sdd2 --destroy"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+
+    - name: redeploy osd.2 using /dev/sdd1 
+      command: "ceph-volume lvm create --filestore --data /dev/sdd1 --journal /dev/sdd2 --osd-id 2"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
index 6d48c35b3b633e6908a0a7263346e1f40921ec21..e8e62dc12796cc2974c7adff5d290478b5f4a675 100644 (file)
@@ -13,6 +13,7 @@ setenv=
   ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config
   ANSIBLE_STDOUT_CALLBACK = debug
   ANSIBLE_RETRY_FILES_ENABLED = False
+  ANSIBLE_SSH_RETRIES = 5
   VAGRANT_CWD = {changedir}
   CEPH_VOLUME_DEBUG = 1
 deps=
index db1a49909326a06d191fa2e11ada6e39b1f37526..42fbec155865fe928c79c16db33530f7c7c2a74d 100644 (file)
@@ -34,6 +34,15 @@ class TestVolume(object):
             main.Volume(argv=['ceph-volume', '--cluster', 'barnacle', 'lvm', '--help'])
         # make sure we aren't causing an actual error
         assert error.value.code == 0
-        log = caplog.records[0]
+        log = caplog.records[1]
         assert log.message == 'ignoring inability to load ceph.conf'
         assert log.levelname == 'ERROR'
+
+    def test_logs_current_command(self, caplog):
+        with pytest.raises(SystemExit) as error:
+            main.Volume(argv=['ceph-volume', '--cluster', 'barnacle', 'lvm', '--help'])
+        # make sure we aren't causing an actual error
+        assert error.value.code == 0
+        log = caplog.records[0]
+        assert log.message == 'Running command: ceph-volume --cluster barnacle lvm --help'
+        assert log.levelname == 'INFO'
index 22b962b1d52d7f8f36e627d7e8e61269d27b9ae1..f989599c8b77297c132128246f3750bc0e6ff6c3 100644 (file)
@@ -1,5 +1,5 @@
-import pytest
 import argparse
+import pytest
 from ceph_volume import exceptions
 from ceph_volume.util import arg_validators
 
@@ -51,3 +51,48 @@ class TestOSDPath(object):
         with pytest.raises(argparse.ArgumentError) as error:
             validator(tmppath)
         assert 'Required file (ceph_fsid) was not found in OSD' in str(error)
+
+
+class TestExcludeGroupOptions(object):
+
+    def setup(self):
+        self.parser = argparse.ArgumentParser()
+
+    def test_flags_in_one_group(self):
+        argv = ['<prog>', '--filestore', '--bar']
+        filestore_group = self.parser.add_argument_group('filestore')
+        bluestore_group = self.parser.add_argument_group('bluestore')
+        filestore_group.add_argument('--filestore')
+        bluestore_group.add_argument('--bluestore')
+        result = arg_validators.exclude_group_options(
+            self.parser,
+            ['filestore', 'bluestore'],
+            argv=argv
+        )
+        assert result is None
+
+    def test_flags_in_no_group(self):
+        argv = ['<prog>', '--foo', '--bar']
+        filestore_group = self.parser.add_argument_group('filestore')
+        bluestore_group = self.parser.add_argument_group('bluestore')
+        filestore_group.add_argument('--filestore')
+        bluestore_group.add_argument('--bluestore')
+        result = arg_validators.exclude_group_options(
+            self.parser,
+            ['filestore', 'bluestore'],
+            argv=argv
+        )
+        assert result is None
+
+    def test_flags_conflict(self, capsys):
+        argv = ['<prog>', '--filestore', '--bluestore']
+        filestore_group = self.parser.add_argument_group('filestore')
+        bluestore_group = self.parser.add_argument_group('bluestore')
+        filestore_group.add_argument('--filestore')
+        bluestore_group.add_argument('--bluestore')
+
+        arg_validators.exclude_group_options(
+            self.parser, ['filestore', 'bluestore'], argv=argv
+        )
+        stdout, stderr = capsys.readouterr()
+        assert 'Cannot use --filestore (filestore) with --bluestore (bluestore)' in stdout
index 2524f0eb128c1c37abe8c13fd92f36c02bd21d9e..c65e51f6b5d6bc76ae78c1f1e043b28756a996ea 100644 (file)
@@ -150,7 +150,7 @@ class TestMountOSD(object):
         prepare.mount_osd('/dev/sda1', 1)
         expected = [
             'mount', '-t', 'xfs', '-o',
-            'rw', 'noatime', 'inode64', # default flags
+            'rw,noatime,inode64', # default flags
             '/dev/sda1', '/var/lib/ceph/osd/ceph-1']
         assert expected == fake_run.calls[0]['args'][0]
 
@@ -167,7 +167,7 @@ class TestMountOSD(object):
             '/dev/sda1', '/var/lib/ceph/osd/ceph-1']
         assert expected == fake_run.calls[0]['args'][0]
 
-    def test_multiple_options_are_used(self, conf_ceph_stub, fake_run):
+    def test_multiple_whitespace_options_are_used(self, conf_ceph_stub, fake_run):
         conf_ceph_stub(dedent("""[global]
         fsid = 1234lkjh1234
         [osd]
@@ -176,7 +176,20 @@ class TestMountOSD(object):
         prepare.mount_osd('/dev/sda1', 1)
         expected = [
             'mount', '-t', 'xfs', '-o',
-            'rw', 'auto', 'exec',
+            'rw,auto,exec',
+            '/dev/sda1', '/var/lib/ceph/osd/ceph-1']
+        assert expected == fake_run.calls[0]['args'][0]
+
+    def test_multiple_comma_whitespace_options_are_used(self, conf_ceph_stub, fake_run):
+        conf_ceph_stub(dedent("""[global]
+        fsid = 1234lkjh1234
+        [osd]
+        osd mount options xfs = rw, auto, exec"""))
+        conf.cluster = 'ceph'
+        prepare.mount_osd('/dev/sda1', 1)
+        expected = [
+            'mount', '-t', 'xfs', '-o',
+            'rw,auto,exec',
             '/dev/sda1', '/var/lib/ceph/osd/ceph-1']
         assert expected == fake_run.calls[0]['args'][0]
 
@@ -192,3 +205,40 @@ class TestMountOSD(object):
             'rw',
             '/dev/sda1', '/var/lib/ceph/osd/ceph-1']
         assert expected == fake_run.calls[0]['args'][0]
+
+
+ceph_conf_mount_values = [
+    ['rw,', 'auto,' 'exec'],
+    ['rw', 'auto', 'exec'],
+    [' rw ', ' auto ', ' exec '],
+    ['rw,', 'auto,', 'exec,'],
+    [',rw ', ',auto ', ',exec,'],
+    [',rw,', ',auto,', ',exec,'],
+]
+
+string_mount_values = [
+    'rw, auto exec ',
+    'rw  auto exec',
+    ',rw, auto, exec,',
+    ' rw  auto exec ',
+    ' rw,auto,exec ',
+    'rw,auto,exec',
+    ',rw,auto,exec,',
+    'rw,auto,exec ',
+    'rw, auto, exec ',
+]
+
+
+class TestNormalizeFlags(object):
+    # a bit overkill since most of this is already tested in prepare.mount_osd
+    # tests
+
+    @pytest.mark.parametrize("flags", ceph_conf_mount_values)
+    def test_normalize_lists(self, flags):
+        result = prepare._normalize_mount_flags(flags)
+        assert result == 'rw,auto,exec'
+
+    @pytest.mark.parametrize("flags", string_mount_values)
+    def test_normalize_strings(self, flags):
+        result = prepare._normalize_mount_flags(flags)
+        assert result == 'rw,auto,exec'
index 349d5da173861dcd4d3766e307b42243ff8d77e3..3866027ef97eca8838412d2336ae76c2664e6d4a 100644 (file)
@@ -71,3 +71,65 @@ class OSDPath(object):
                 raise argparse.ArgumentError(None, error)
 
         return os.path.abspath(string)
+
+
+def exclude_group_options(parser, groups, argv=None):
+    """
+    ``argparse`` has the ability to check for mutually exclusive options, but
+    it only allows a basic XOR behavior: only one flag can be used from
+    a defined group of options. This doesn't help when two groups of options
+    need to be separated. For example, with filestore and bluestore, neither
+    set can be used in conjunction with the other set.
+
+    This helper validator will consume the parser to inspect the group flags,
+    and it will group them together from ``groups``. This allows proper error
+    reporting, matching each incompatible flag with its group name.
+
+    :param parser: The argparse object, once it has configured all flags. It is
+                   required to contain the group names being used to validate.
+    :param groups: A list of group names (at least two), with the same used for
+                  ``add_argument_group``
+    :param argv: Consume the args (sys.argv) directly from this argument
+
+    .. note: **Unfortunately** this will not be able to validate correctly when
+    using default flags. In the case of filestore vs. bluestore, ceph-volume
+    defaults to --bluestore, but we can't check that programmatically, we can
+    only parse the flags seen via argv
+    """
+    # Reduce the parser groups to only the groups we need to intersect
+    parser_groups = [g for g in parser._action_groups if g.title in groups]
+    # A mapping of the group name to flags/options
+    group_flags = {}
+    flags_to_verify = []
+    for group in parser_groups:
+        # option groups may have more than one item in ``option_strings``, this
+        # will loop over ``_group_actions`` which contains the
+        # ``option_strings``, like ``['--filestore']``
+        group_flags[group.title] = [
+            option for group_action in group._group_actions
+            for option in group_action.option_strings
+        ]
+
+    # Gather all the flags present in the groups so that we only check on those.
+    for flags in group_flags.values():
+        flags_to_verify.extend(flags)
+
+    seen = []
+    last_flag = None
+    last_group = None
+    for flag in argv:
+        if flag not in flags_to_verify:
+            continue
+        for group_name, flags in group_flags.items():
+            if flag in flags:
+                seen.append(group_name)
+                # We are mutually excluding groups, so having more than 1 group
+                # in ``seen`` means we must raise an error
+                if len(set(seen)) == len(groups):
+                    terminal.warning('Incompatible flags were found, some values may get ignored')
+                    msg = 'Cannot use %s (%s) with %s (%s)' % (
+                        last_flag, last_group, flag, group_name
+                    )
+                    terminal.warning(msg)
+            last_group = group_name
+        last_flag = flag
index da9375fb7b322c133720c3dad1d97e0ba871ae80..3e1a77f90add0e6776a252c05e3bf1fa5d7154aa 100644 (file)
@@ -144,6 +144,34 @@ def format_device(device):
     process.run(command)
 
 
+def _normalize_mount_flags(flags):
+    """
+    Mount flag options have to be a single string, separated by a comma. If the
+    flags are separated by spaces, or with commas and spaces in ceph.conf, the
+    mount options will be passed incorrectly.
+
+    This will help when parsing ceph.conf values return something like::
+
+        ["rw,", "exec,"]
+
+    Or::
+
+        [" rw ,", "exec"]
+
+    :param flags: A list of flags, or a single string of mount flags
+    """
+    if isinstance(flags, list):
+        # ensure that spaces and commas are removed so that they can join
+        # correctly
+        return ','.join([f.strip().strip(',') for f in flags if f])
+
+    # split them, clean them, and join them back again
+    flags = flags.strip().split(' ')
+    return ','.join(
+        [f.strip().strip(',') for f in flags if f]
+    )
+
+
 def mount_osd(device, osd_id):
     destination = '/var/lib/ceph/osd/%s-%s' % (conf.cluster, osd_id)
     command = ['mount', '-t', 'xfs', '-o']
@@ -153,7 +181,7 @@ def mount_osd(device, osd_id):
         default=constants.mount.get('xfs'),
         split=' ',
     )
-    command.extend(flags)
+    command.append(_normalize_mount_flags(flags))
     command.append(device)
     command.append(destination)
     process.run(command)
index 9e30fbd9aa222ea0870239cea92242610d2fca07..b90248373da0736fc29aaeb5c0e3dc879830a9df 100644 (file)
@@ -115,6 +115,9 @@ struct inconsistent_obj_wrapper : librados::inconsistent_obj_t {
   void set_attr_name_mismatch() {
     errors |= obj_err_t::ATTR_NAME_MISMATCH;
   }
+  void set_snapset_inconsistency() {
+    errors |= obj_err_t::SNAPSET_INCONSISTENCY;
+  }
   void add_shard(const pg_shard_t& pgs, const shard_info_wrapper& shard);
   void set_auth_missing(const hobject_t& hoid,
                         const map<pg_shard_t, ScrubMap*>&,
index 607b7c61e7a47a425c8627e08e200403e5af385e..8325b76c87be8c675b91df7dbbaa7840acf87a49 100644 (file)
@@ -1246,6 +1246,10 @@ public:
   void finalize() {
     assert(crush);
     crush_finalize(crush);
+    if (!name_map.empty() &&
+       name_map.rbegin()->first >= crush->max_devices) {
+      crush->max_devices = name_map.rbegin()->first + 1;
+    }
     have_uniform_rules = !has_legacy_rule_ids();
   }
   int bucket_set_alg(int id, int alg);
index 7829e28702434fc11bb1228c7191c5f7d5a0f729..37e9d285459882fd499980ef92899348a0688024 100644 (file)
@@ -151,10 +151,11 @@ struct obj_err_t {
     SIZE_MISMATCH        = 1 << 6,
     ATTR_VALUE_MISMATCH  = 1 << 7,
     ATTR_NAME_MISMATCH    = 1 << 8,
+    SNAPSET_INCONSISTENCY   = 1 << 9,
     // When adding more here add to either SHALLOW_ERRORS or DEEP_ERRORS
   };
   uint64_t errors = 0;
-  static constexpr uint64_t SHALLOW_ERRORS = OBJECT_INFO_INCONSISTENCY|SIZE_MISMATCH|ATTR_VALUE_MISMATCH|ATTR_NAME_MISMATCH;
+  static constexpr uint64_t SHALLOW_ERRORS = OBJECT_INFO_INCONSISTENCY|SIZE_MISMATCH|ATTR_VALUE_MISMATCH|ATTR_NAME_MISMATCH|SNAPSET_INCONSISTENCY;
   static constexpr uint64_t DEEP_ERRORS = DATA_DIGEST_MISMATCH|OMAP_DIGEST_MISMATCH;
   bool has_object_info_inconsistency() const {
     return errors & OBJECT_INFO_INCONSISTENCY;
@@ -180,6 +181,9 @@ struct obj_err_t {
   bool has_deep_errors() const {
     return errors & DEEP_ERRORS;
   }
+  bool has_snapset_inconsistency() const {
+    return errors & SNAPSET_INCONSISTENCY;
+  }
 };
 
 struct inconsistent_obj_t : obj_err_t {
index 7e01a811ef158b67da452faad8f8e3ed55c6c5a3..b727ac1867e96ebd1279eadc66900b3652e2a623 100644 (file)
@@ -70,16 +70,8 @@ void ClusterState::ingest_pgstats(MPGStats *stats)
   Mutex::Locker l(lock);
 
   const int from = stats->get_orig_source().num();
-  bool is_in = false;
-  objecter->with_osdmap([&is_in, from](const OSDMap &osd_map){
-      is_in = osd_map.is_in(from);
-  });
-
-  if (is_in) {
-    pending_inc.update_stat(from, stats->epoch, std::move(stats->osd_stat));
-  } else {
-    pending_inc.update_stat(from, stats->epoch, osd_stat_t());
-  }
+
+  pending_inc.update_stat(from, stats->epoch, std::move(stats->osd_stat));
 
   for (auto p : stats->pg_stat) {
     pg_t pgid = p.first;
index 180b6967e65fa3e314839ca12d36886c2515d6c6..2783356f9b186a6af36b483074d68a513d16b1f8 100644 (file)
@@ -6961,6 +6961,7 @@ int32_t OSDMonitor::_allocate_osd_id(int32_t* existing_id)
 void OSDMonitor::do_osd_create(
     const int32_t id,
     const uuid_d& uuid,
+    const string& device_class,
     int32_t* new_id)
 {
   dout(10) << __func__ << " uuid " << uuid << dendl;
@@ -6994,7 +6995,6 @@ void OSDMonitor::do_osd_create(
     assert(allocated_id < 0);
     pending_inc.new_weight[existing_id] = CEPH_OSD_OUT;
     *new_id = existing_id;
-
   } else if (allocated_id >= 0) {
     assert(existing_id < 0);
     // raise max_osd
@@ -7010,6 +7010,33 @@ void OSDMonitor::do_osd_create(
   }
 
 out:
+  if (device_class.size()) {
+    CrushWrapper newcrush;
+    _get_pending_crush(newcrush);
+    if (newcrush.get_max_devices() < *new_id + 1) {
+      newcrush.set_max_devices(*new_id + 1);
+    }
+    string name = string("osd.") + stringify(*new_id);
+    if (!newcrush.item_exists(*new_id)) {
+      newcrush.set_item_name(*new_id, name);
+    }
+    ostringstream ss;
+    int r = newcrush.update_device_class(*new_id, device_class, name, &ss);
+    if (r < 0) {
+      derr << __func__ << " failed to set " << name << " device_class "
+          << device_class << ": " << cpp_strerror(r) << " - " << ss.str()
+          << dendl;
+      // non-fatal... this might be a replay and we want to be idempotent.
+    } else {
+      dout(20) << __func__ << " set " << name << " device_class " << device_class
+              << dendl;
+      pending_inc.crush.clear();
+      newcrush.encode(pending_inc.crush, mon->get_quorum_con_features());
+    }
+  } else {
+    dout(20) << __func__ << " no device_class" << dendl;
+  }
+
   dout(10) << __func__ << " using id " << *new_id << dendl;
   if (osdmap.get_max_osd() <= *new_id && pending_inc.new_max_osd <= *new_id) {
     pending_inc.new_max_osd = *new_id + 1;
@@ -7115,7 +7142,7 @@ int OSDMonitor::prepare_command_osd_create(
 int OSDMonitor::prepare_command_osd_new(
     MonOpRequestRef op,
     const map<string,cmd_vartype>& cmdmap,
-    const map<string,string>& secrets,
+    const map<string,string>& params,
     stringstream &ss,
     Formatter *f)
 {
@@ -7224,9 +7251,9 @@ int OSDMonitor::prepare_command_osd_new(
 
   dout(10) << __func__ << " id " << id << " uuid " << uuid << dendl;
 
-  if (may_be_idempotent && secrets.empty()) {
+  if (may_be_idempotent && params.empty()) {
     // nothing to do, really.
-    dout(10) << __func__ << " idempotent and no secrets -- no op." << dendl;
+    dout(10) << __func__ << " idempotent and no params -- no op." << dendl;
     assert(id >= 0);
     if (f) {
       f->open_object_section("created_osd");
@@ -7238,30 +7265,38 @@ int OSDMonitor::prepare_command_osd_new(
     return EEXIST;
   }
 
+  string device_class;
+  auto p = params.find("crush_device_class");
+  if (p != params.end()) {
+    device_class = p->second;
+    dout(20) << __func__ << " device_class will be " << device_class << dendl;
+  }
   string cephx_secret, lockbox_secret, dmcrypt_key;
   bool has_lockbox = false;
-  bool has_secrets = (!secrets.empty());
+  bool has_secrets = params.count("cephx_secret")
+    || params.count("cephx_lockbox_secret")
+    || params.count("dmcrypt_key");
 
   ConfigKeyService *svc = nullptr;
   AuthMonitor::auth_entity_t cephx_entity, lockbox_entity;
 
   if (has_secrets) {
-    if (secrets.count("cephx_secret") == 0) {
+    if (params.count("cephx_secret") == 0) {
       ss << "requires a cephx secret.";
       return -EINVAL;
     }
-    cephx_secret = secrets.at("cephx_secret");
+    cephx_secret = params.at("cephx_secret");
 
-    bool has_lockbox_secret = (secrets.count("cephx_lockbox_secret") > 0);
-    bool has_dmcrypt_key = (secrets.count("dmcrypt_key") > 0);
+    bool has_lockbox_secret = (params.count("cephx_lockbox_secret") > 0);
+    bool has_dmcrypt_key = (params.count("dmcrypt_key") > 0);
 
     dout(10) << __func__ << " has lockbox " << has_lockbox_secret
              << " dmcrypt " << has_dmcrypt_key << dendl;
 
     if (has_lockbox_secret && has_dmcrypt_key) {
       has_lockbox = true;
-      lockbox_secret = secrets.at("cephx_lockbox_secret");
-      dmcrypt_key = secrets.at("dmcrypt_key");
+      lockbox_secret = params.at("cephx_lockbox_secret");
+      dmcrypt_key = params.at("dmcrypt_key");
     } else if (!has_lockbox_secret != !has_dmcrypt_key) {
       ss << "requires both a cephx lockbox secret and a dm-crypt key.";
       return -EINVAL;
@@ -7350,7 +7385,7 @@ int OSDMonitor::prepare_command_osd_new(
   } else {
     assert(id >= 0);
     int32_t new_id = -1;
-    do_osd_create(id, uuid, &new_id);
+    do_osd_create(id, uuid, device_class, &new_id);
     assert(new_id >= 0);
     assert(id == new_id);
   }
@@ -7782,6 +7817,9 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
         oss << "osd." << osd;
         string name = oss.str();
 
+       if (newcrush.get_max_devices() < osd + 1) {
+         newcrush.set_max_devices(osd + 1);
+       }
         string action;
         if (newcrush.item_exists(osd)) {
           action = "updating";
@@ -10259,20 +10297,20 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       return false;
     }
 
-    map<string,string> secrets_map;
+    map<string,string> param_map;
 
     bufferlist bl = m->get_data();
-    string secrets_json = bl.to_str();
-    dout(20) << __func__ << " osd new json = " << secrets_json << dendl;
+    string param_json = bl.to_str();
+    dout(20) << __func__ << " osd new json = " << param_json << dendl;
 
-    err = get_json_str_map(secrets_json, ss, &secrets_map);
+    err = get_json_str_map(param_json, ss, &param_map);
     if (err < 0)
       goto reply;
 
-    dout(20) << __func__ << " osd new secrets " << secrets_map << dendl;
+    dout(20) << __func__ << " osd new params " << param_map << dendl;
 
     paxos->plug();
-    err = prepare_command_osd_new(op, cmdmap, secrets_map, ss, f.get());
+    err = prepare_command_osd_new(op, cmdmap, param_map, ss, f.get());
     paxos->unplug();
 
     if (err < 0) {
@@ -10348,7 +10386,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       goto reply;
     }
 
-    do_osd_create(id, uuid, &new_id);
+    string empty_device_class;
+    do_osd_create(id, uuid, empty_device_class, &new_id);
 
     if (f) {
       f->open_object_section("created_osd");
index 9767f10035780898e1f6ac141e08791b22082e50..b1c6fcd1a34fe8203f9840039ea7c14cb9c5df71 100644 (file)
@@ -491,7 +491,9 @@ public:
       const uuid_d& uuid,
       int32_t* existing_id,
       stringstream& ss);
-  void do_osd_create(const int32_t id, const uuid_d& uuid, int32_t* new_id);
+  void do_osd_create(const int32_t id, const uuid_d& uuid,
+                    const string& device_class,
+                    int32_t* new_id);
   int prepare_command_osd_purge(int32_t id, stringstream& ss);
   int prepare_command_osd_destroy(int32_t id, stringstream& ss);
   int _prepare_command_osd_crush_remove(
index 9663729d5471318c20b0b99625e216b33892626c..9e5d4abf3b428d86d98b818e66d8e63897c6751a 100644 (file)
@@ -766,7 +766,7 @@ map<pg_shard_t, ScrubMap *>::const_iterator
   inconsistent_obj_wrapper &object_error)
 {
   eversion_t auth_version;
-  bufferlist first_bl;
+  bufferlist first_oi_bl, first_ss_bl;
 
   // Create list of shards with primary first so it will be auth copy all
   // other things being equal.
@@ -830,6 +830,12 @@ map<pg_shard_t, ScrubMap *>::const_iterator
         try {
          bufferlist::iterator bliter = ss_bl.begin();
          ::decode(ss, bliter);
+         if (first_ss_bl.length() == 0) {
+           first_ss_bl.append(ss_bl);
+         } else if (!object_error.has_snapset_inconsistency() && !ss_bl.contents_equal(first_ss_bl)) {
+           object_error.set_snapset_inconsistency();
+           error_string += " snapset_inconsistency";
+         }
         } catch (...) {
          // invalid snapset, probably corrupt
          shard_info.set_ss_attr_corrupted();
@@ -859,9 +865,9 @@ map<pg_shard_t, ScrubMap *>::const_iterator
     // This is automatically corrected in PG::_repair_oinfo_oid()
     assert(oi.soid == obj);
 
-    if (first_bl.length() == 0) {
-      first_bl.append(bl);
-    } else if (!object_error.has_object_info_inconsistency() && !bl.contents_equal(first_bl)) {
+    if (first_oi_bl.length() == 0) {
+      first_oi_bl.append(bl);
+    } else if (!object_error.has_object_info_inconsistency() && !bl.contents_equal(first_oi_bl)) {
       object_error.set_object_info_inconsistency();
       error_string += " object_info_inconsistency";
     }
index fd36719e477685093de29f91f080bb2c96885c18..57dbd6b189bf2eb40b312d5b9021dfde9b521dab 100644 (file)
@@ -20,7 +20,7 @@ ClientIO::ClientIO(tcp::socket& socket,
 
 ClientIO::~ClientIO() = default;
 
-void ClientIO::init_env(CephContext *cct)
+int ClientIO::init_env(CephContext *cct)
 {
   env.init(cct);
 
@@ -79,6 +79,7 @@ void ClientIO::init_env(CephContext *cct)
   env.set("REMOTE_ADDR", socket.remote_endpoint().address().to_string());
   // TODO: set SERVER_PORT_SECURE if using ssl
   // TODO: set REMOTE_USER if authenticated
+  return 0;
 }
 
 size_t ClientIO::write_data(const char* buf, size_t len)
index 038be51411c6a443bece5459fe878ab0e69880cf..eeed4ee8051e28fa9e5dac1a066ec37e2c4f0d50 100644 (file)
@@ -36,7 +36,7 @@ class ClientIO : public io::RestfulClient,
            beast::flat_buffer& buffer);
   ~ClientIO() override;
 
-  void init_env(CephContext *cct) override;
+  int init_env(CephContext *cct) override;
   size_t complete_request() override;
   void flush() override;
   size_t send_status(int status, const char *status_name) override;
index fded2ead97e08ac915d02c341790189f6ba9a8a4..c60d72953665ba9a1f221719485ef86fbe9cecdf 100644 (file)
@@ -9,7 +9,7 @@
 
 using namespace std;
 
-int ObjectCache::get(string& name, ObjectCacheInfo& info, uint32_t mask, rgw_cache_entry_info *cache_info)
+int ObjectCache::get(const string& name, ObjectCacheInfo& info, uint32_t mask, rgw_cache_entry_info *cache_info)
 {
   RWLock::RLocker l(lock);
 
@@ -119,7 +119,7 @@ bool ObjectCache::chain_cache_entry(list<rgw_cache_entry_info *>& cache_info_ent
   return true;
 }
 
-void ObjectCache::put(string& name, ObjectCacheInfo& info, rgw_cache_entry_info *cache_info)
+void ObjectCache::put(const string& name, ObjectCacheInfo& info, rgw_cache_entry_info *cache_info)
 {
   RWLock::WLocker l(lock);
 
@@ -192,17 +192,17 @@ void ObjectCache::put(string& name, ObjectCacheInfo& info, rgw_cache_entry_info
     target.version = info.version;
 }
 
-void ObjectCache::remove(string& name)
+bool ObjectCache::remove(const string& name)
 {
   RWLock::WLocker l(lock);
 
   if (!enabled) {
-    return;
+    return false;
   }
 
   map<string, ObjectCacheEntry>::iterator iter = cache_map.find(name);
   if (iter == cache_map.end())
-    return;
+    return false;
 
   ldout(cct, 10) << "removing " << name << " from cache" << dendl;
   ObjectCacheEntry& entry = iter->second;
@@ -215,9 +215,11 @@ void ObjectCache::remove(string& name)
 
   remove_lru(name, iter->second.lru_iter);
   cache_map.erase(iter);
+  return true;
 }
 
-void ObjectCache::touch_lru(string& name, ObjectCacheEntry& entry, std::list<string>::iterator& lru_iter)
+void ObjectCache::touch_lru(const string& name, ObjectCacheEntry& entry,
+                           std::list<string>::iterator& lru_iter)
 {
   while (lru_size > (size_t)cct->_conf->rgw_cache_lru_size) {
     list<string>::iterator iter = lru.begin();
@@ -256,7 +258,8 @@ void ObjectCache::touch_lru(string& name, ObjectCacheEntry& entry, std::list<str
   entry.lru_promotion_ts = lru_counter;
 }
 
-void ObjectCache::remove_lru(string& name, std::list<string>::iterator& lru_iter)
+void ObjectCache::remove_lru(const string& name,
+                            std::list<string>::iterator& lru_iter)
 {
   if (lru_iter == lru.end())
     return;
index 022dc3624ff178e3a5c0388fce77d509213d19fc..023db75ff76c23cf3775ddf9bb9b995d15ea4308 100644 (file)
@@ -149,16 +149,35 @@ class ObjectCache {
   bool enabled;
   ceph::timespan expiry;
 
-  void touch_lru(string& name, ObjectCacheEntry& entry, std::list<string>::iterator& lru_iter);
-  void remove_lru(string& name, std::list<string>::iterator& lru_iter);
+  void touch_lru(const string& name, ObjectCacheEntry& entry, std::list<string>::iterator& lru_iter);
+  void remove_lru(const string& name, std::list<string>::iterator& lru_iter);
   void invalidate_lru(ObjectCacheEntry& entry);
 
   void do_invalidate_all();
 public:
   ObjectCache() : lru_size(0), lru_counter(0), lru_window(0), lock("ObjectCache"), cct(NULL), enabled(false) { }
-  int get(std::string& name, ObjectCacheInfo& bl, uint32_t mask, rgw_cache_entry_info *cache_info);
-  void put(std::string& name, ObjectCacheInfo& bl, rgw_cache_entry_info *cache_info);
-  void remove(std::string& name);
+  int get(const std::string& name, ObjectCacheInfo& bl, uint32_t mask, rgw_cache_entry_info *cache_info);
+  boost::optional<ObjectCacheInfo> get(const std::string& name) {
+    boost::optional<ObjectCacheInfo> info{boost::in_place_init};
+    auto r = get(name, *info, 0, nullptr);
+    return r < 0 ? boost::none : info;
+  }
+
+  template<typename F>
+  void for_each(const F& f) {
+    RWLock::RLocker l(lock);
+    if (enabled) {
+      auto now  = ceph::coarse_mono_clock::now();
+      for (const auto& kv : cache_map) {
+        if (expiry.count() && ((now - kv.second.info.time_added) < expiry)) {
+          f(kv.first, kv.second);
+        }
+      }
+    }
+  }
+
+  void put(const std::string& name, ObjectCacheInfo& bl, rgw_cache_entry_info *cache_info);
+  bool remove(const std::string& name);
   void set_ctx(CephContext *_cct) {
     cct = _cct;
     lru_window = cct->_conf->rgw_cache_lru_size / 2;
@@ -254,6 +273,11 @@ public:
   bool chain_cache_entry(list<rgw_cache_entry_info *>& cache_info_entries, RGWChainedCache::Entry *chained_entry) override {
     return cache.chain_cache_entry(cache_info_entries, chained_entry);
   }
+  void call_list(const boost::optional<std::string>& filter,
+                Formatter* format) override;
+  bool call_inspect(const std::string& target, Formatter* format) override;
+  bool call_erase(const std::string& target) override;
+  void call_zap() override;
 };
 
 template <class T>
@@ -589,4 +613,42 @@ int RGWCache<T>::watch_cb(uint64_t notify_id,
   return 0;
 }
 
+template<typename T>
+void RGWCache<T>::call_list(const boost::optional<std::string>& filter,
+                           Formatter* f)
+{
+  cache.for_each(
+    [this, &filter, f] (const string& name, const ObjectCacheEntry& entry) {
+      if (!filter || name.find(*filter) != name.npos) {
+       T::cache_list_dump_helper(f, name, entry.info.meta.mtime,
+                                 entry.info.meta.size);
+      }
+    });
+}
+
+template<typename T>
+bool RGWCache<T>::call_inspect(const std::string& target, Formatter* f)
+{
+  if (const auto entry = cache.get(target)) {
+    f->open_object_section("cache_entry");
+    f->dump_string("name", target.c_str());
+    entry->dump(f);
+    f->close_section();
+    return true;
+  } else {
+    return false;
+  }
+}
+
+template<typename T>
+bool RGWCache<T>::call_erase(const std::string& target)
+{
+  return cache.remove(target);
+}
+
+template<typename T>
+void RGWCache<T>::call_zap()
+{
+  cache.invalidate_all();
+}
 #endif
index f4d17d721c18d5308504f21540d16727dbe93891..098153c10596c35a3ba74f2db1cdd9a958fe1297 100644 (file)
@@ -67,17 +67,24 @@ size_t RGWCivetWeb::complete_request()
   return 0;
 }
 
-void RGWCivetWeb::init_env(CephContext *cct)
+int RGWCivetWeb::init_env(CephContext *cct)
 {
   env.init(cct);
   const struct mg_request_info* info = mg_get_request_info(conn);
 
   if (! info) {
-    return;
+    // request info is NULL; we have no info about the connection
+    return -EINVAL;
   }
 
   for (int i = 0; i < info->num_headers; i++) {
     const struct mg_request_info::mg_header* header = &info->http_headers[i];
+
+    if (header->name == nullptr || header->value==nullptr) {
+      lderr(cct) << "client supplied malformatted headers" << dendl;
+      return -EINVAL;
+    }
+
     const boost::string_ref name(header->name);
     const auto& value = header->value;
 
@@ -130,6 +137,7 @@ void RGWCivetWeb::init_env(CephContext *cct)
   if (info->is_ssl) {
     env.set("SERVER_PORT_SECURE", port_buf);
   }
+  return 0;
 }
 
 size_t RGWCivetWeb::send_status(int status, const char *status_name)
index 0160c03a42d981d97df6e79ee563e060c21b2910..74adf79156102998fe3173f198675bec9b9fbb77 100644 (file)
@@ -27,7 +27,7 @@ class RGWCivetWeb : public rgw::io::RestfulClient,
   size_t dump_date_header();
 
 public:
-  void init_env(CephContext *cct) override;
+  int init_env(CephContext *cct) override;
 
   size_t send_status(int status, const char *status_name) override;
   size_t send_100_continue() override;
index dd116c427a8e3a3ccb95db09f5b8075a077285fc..39434628644d6271c6cc9da90c02e1adf736d8c9 100644 (file)
 namespace rgw {
 namespace io {
 
-void BasicClient::init(CephContext *cct) {
-  init_env(cct);
+int BasicClient::init(CephContext *cct) {
+  int init_error = init_env(cct);
+
+  if (init_error != 0)
+    return init_error;
 
   if (cct->_conf->subsys.should_gather(ceph_subsys_rgw, 20)) {
     const auto& env_map = get_env().get_map();
@@ -24,6 +27,7 @@ void BasicClient::init(CephContext *cct) {
       ldout(cct, 20) << iter.first << "=" << (x) << dendl;
     }
   }
+  return init_error;
 }
 
 } /* namespace io */
index 8579b2383526956dee5774136cf2786b8d6c9121..55ec6386bd8037f17c8dc0494aabd742f741855c 100644 (file)
@@ -28,13 +28,13 @@ using Exception = std::system_error;
  * interacted with. */
 class BasicClient {
 protected:
-  virtual void init_env(CephContext *cct) = 0;
+  virtual int init_env(CephContext *cct) = 0;
 
 public:
   virtual ~BasicClient() = default;
 
   /* Initialize the BasicClient and inject CephContext. */
-  void init(CephContext *cct);
+  int init(CephContext *cct);
 
   /* Return the RGWEnv describing the environment that a given request lives in.
    * The method does not throw exceptions. */
@@ -197,7 +197,7 @@ protected:
     decoratee = &new_dec;
   }
 
-  void init_env(CephContext *cct) override {
+  int init_env(CephContext *cct) override {
     return get_decoratee().init_env(cct);
   }
 
index 1a6cbbdf7da73a7d8a06fa28c868f4c5c39498c9..e3edcc52eaa597aec3a1a59d1425110d695e52c6 100644 (file)
@@ -94,6 +94,7 @@ rgw_http_errors rgw_http_s3_errors({
     { ERR_NO_SUCH_BUCKET_POLICY, {404, "NoSuchBucketPolicy"}},
     { ERR_NO_SUCH_USER, {404, "NoSuchUser"}},
     { ERR_NO_SUCH_SUBUSER, {404, "NoSuchSubUser"}},
+    { ERR_NO_SUCH_CORS_CONFIGURATION, {404, "NoSuchCORSConfiguration"}},
     { ERR_METHOD_NOT_ALLOWED, {405, "MethodNotAllowed" }},
     { ETIMEDOUT, {408, "RequestTimeout" }},
     { EEXIST, {409, "BucketAlreadyExists" }},
index 9d6e4049600a2880ece679add07070077742af9d..40bc5d9ce7e49310facb741cec90f3982ef09b3a 100644 (file)
@@ -201,6 +201,7 @@ using ceph::crypto::MD5;
 #define ERR_NO_SUCH_LC           2041
 #define ERR_NO_SUCH_USER         2042
 #define ERR_NO_SUCH_SUBUSER      2043
+#define ERR_NO_SUCH_CORS_CONFIGURATION 2044
 #define ERR_USER_SUSPENDED       2100
 #define ERR_INTERNAL_ERROR       2200
 #define ERR_NOT_IMPLEMENTED      2201
@@ -2045,7 +2046,7 @@ struct rgw_obj {
           if (pos < 0) {
             throw buffer::error();
           }
-          key.name = key.name.substr(pos);
+          key.name = key.name.substr(pos + 1);
         }
       }
     } else {
index 68eee4760333a76e479db19657648488c7b9437e..a52ea5097bd4f9706f8dddcd1f38b6841d5639b4 100644 (file)
@@ -30,9 +30,10 @@ void RGWFCGX::flush()
   FCGX_FFlush(fcgx->out);
 }
 
-void RGWFCGX::init_env(CephContext* const cct)
+int RGWFCGX::init_env(CephContext* const cct)
 {
   env.init(cct, (char **)fcgx->envp);
+  return 0;
 }
 
 size_t RGWFCGX::send_status(const int status, const char* const status_name)
index 52d7cacabcfa1f043375f7f3f381347b7b79c35f..7f8e61a3996c2009f7df8afac589c8eb72132849 100644 (file)
@@ -27,7 +27,7 @@ public:
       txbuf(*this) {
   }
 
-  void init_env(CephContext* cct) override;
+  int init_env(CephContext* cct) override;
   size_t send_status(int status, const char* status_name) override;
   size_t send_100_continue() override;
   size_t send_header(const boost::string_ref& name,
index 0ddaa54e38f759fcfc6a8a373f77654dfebff0e3..7ab037f5934a2fe1647ae9d72da7d251bbb03e27 100644 (file)
@@ -63,7 +63,10 @@ namespace rgw {
     RGWLibIO(const RGWUserInfo &_user_info)
       : user_info(_user_info) {}
 
-    void init_env(CephContext *cct) override {}
+    int init_env(CephContext *cct) override {
+      env.init(cct);
+      return 0;
+    }
 
     const RGWUserInfo& get_user() {
       return user_info;
index 0badc78e84beb7ff252fdf73766ac755f8041ce1..fd66469e4d7d99116879c8b77b1e3e56df927de5 100644 (file)
@@ -71,7 +71,7 @@ size_t RGWLoadGenIO::complete_request()
   return 0;
 }
 
-void RGWLoadGenIO::init_env(CephContext *cct)
+int RGWLoadGenIO::init_env(CephContext *cct)
 {
   env.init(cct);
 
@@ -96,6 +96,7 @@ void RGWLoadGenIO::init_env(CephContext *cct)
   char port_buf[16];
   snprintf(port_buf, sizeof(port_buf), "%d", req->port);
   env.set("SERVER_PORT", port_buf);
+  return 0;
 }
 
 size_t RGWLoadGenIO::send_status(const int status,
index dd9e2d8f6afc18f69772c57087b45e1341f25897..72aace76c3e86237492ab9e788c3db88db24b547 100644 (file)
@@ -38,7 +38,7 @@ class RGWLoadGenIO : public rgw::io::RestfulClient
   RGWLoadGenRequestEnv* req;
   RGWEnv env;
 
-  void init_env(CephContext *cct) override;
+  int init_env(CephContext *cct) override;
   size_t read_data(char *buf, size_t len);
   size_t write_data(const char *buf, size_t len);
 
index acb741d128ef4605a10d8b058a4e191a4fd5c9da..0f8133089881c7086b257b10e60efc448aad38ed 100644 (file)
@@ -2958,7 +2958,7 @@ void RGWDeleteBucket::execute()
 
 int RGWPutObj::verify_permission()
 {
-  if (copy_source) {
+  if (! copy_source.empty()) {
 
     RGWAccessControlPolicy cs_acl(s->cct);
     optional<Policy> policy;
@@ -2971,8 +2971,8 @@ int RGWPutObj::verify_permission()
     store->set_prefetch_data(s->obj_ctx, obj);
 
     /* check source object permissions */
-    if (read_obj_policy(store, s, copy_source_bucket_info, cs_attrs, &cs_acl, policy,
-                       cs_bucket, cs_object) < 0) {
+    if (read_obj_policy(store, s, copy_source_bucket_info, cs_attrs, &cs_acl,
+                       policy, cs_bucket, cs_object) < 0) {
       return -EACCES;
     }
 
@@ -3406,8 +3406,27 @@ void RGWPutObj::execute()
     goto done;
   }
 
+  if ((! copy_source.empty()) && !copy_source_range) {
+    rgw_obj_key obj_key(copy_source_object_name, copy_source_version_id);
+    rgw_obj obj(copy_source_bucket_info.bucket, obj_key.name);
+
+    RGWObjState *astate;
+    op_ret = store->get_obj_state(static_cast<RGWObjectCtx *>(s->obj_ctx),
+                                  copy_source_bucket_info, obj, &astate, true, false);
+    if (op_ret < 0) {
+      ldout(s->cct, 0) << "ERROR: get copy source obj state returned with error" << op_ret << dendl;
+      goto done;
+    }
+    if (!astate->exists){
+      op_ret = -ENOENT;
+      goto done;
+    }
+    lst = astate->size - 1;
+  } else {
+    lst = copy_source_range_lst;
+  }
+
   fst = copy_source_range_fst;
-  lst = copy_source_range_lst;
 
   op_ret = get_encrypt_filter(&encrypt, filter);
   if (op_ret < 0) {
@@ -3433,7 +3452,7 @@ void RGWPutObj::execute()
     bufferlist data;
     if (fst > lst)
       break;
-    if (!copy_source) {
+    if (copy_source.empty()) {
       len = get_data(data);
     } else {
       uint64_t cur_lst = min(fst + s->cct->_conf->rgw_max_chunk_size - 1, lst);
@@ -4317,11 +4336,12 @@ void RGWDeleteObj::execute()
   }
 }
 
-
-bool RGWCopyObj::parse_copy_location(const string& url_src, string& bucket_name, rgw_obj_key& key)
+bool RGWCopyObj::parse_copy_location(const boost::string_view& url_src,
+                                    string& bucket_name,
+                                    rgw_obj_key& key)
 {
-  string name_str;
-  string params_str;
+  boost::string_view name_str;
+  boost::string_view params_str;
 
   size_t pos = url_src.find('?');
   if (pos == string::npos) {
@@ -4331,27 +4351,27 @@ bool RGWCopyObj::parse_copy_location(const string& url_src, string& bucket_name,
     params_str = url_src.substr(pos + 1);
   }
 
-  std::string dec_src = url_decode(name_str);
-  const char *src = dec_src.c_str();
+  boost::string_view dec_src{name_str};
+  if (dec_src[0] == '/')
+    dec_src.remove_prefix(1);
 
-  if (*src == '/') ++src;
-
-  string str(src);
-
-  pos = str.find('/');
+  pos = dec_src.find('/');
   if (pos ==string::npos)
     return false;
 
-  bucket_name = str.substr(0, pos);
-  key.name = str.substr(pos + 1);
+  boost::string_view bn_view{dec_src.substr(0, pos)};
+  bucket_name = std::string{bn_view.data(), bn_view.size()};
+
+  boost::string_view kn_view{dec_src.substr(pos + 1)};
+  key.name = std::string{kn_view.data(), kn_view.size()};
 
   if (key.name.empty()) {
     return false;
   }
 
-  if (!params_str.empty()) {
+  if (! params_str.empty()) {
     RGWHTTPArgs args;
-    args.set(params_str);
+    args.set(params_str.to_string());
     args.parse();
 
     key.instance = args.get("versionId", NULL);
index 063af352cbeb4ead6189ae2c18f70c291a87a783..0a127d2a9a46c2491a311d5c5c8e25f987a4426f 100644 (file)
@@ -973,7 +973,7 @@ protected:
   const char *supplied_etag;
   const char *if_match;
   const char *if_nomatch;
-  const char *copy_source;
+  std::string copy_source;
   const char *copy_source_range;
   RGWBucketInfo copy_source_bucket_info;
   string copy_source_tenant_name;
@@ -1004,7 +1004,6 @@ public:
                 supplied_etag(NULL),
                 if_match(NULL),
                 if_nomatch(NULL),
-                copy_source(NULL),
                 copy_source_range(NULL),
                 copy_source_range_fst(0),
                 copy_source_range_lst(0),
@@ -1316,7 +1315,7 @@ public:
     copy_if_newer = false;
   }
 
-  static bool parse_copy_location(const string& src,
+  static bool parse_copy_location(const boost::string_view& src,
                                   string& bucket_name,
                                   rgw_obj_key& object);
 
index 6fbf2fdb594f005b5fdcb63a1457a96db1dc7327..e614cf0d2b28e2b1f7d02e23bc36487f8dc091ea 100644 (file)
@@ -117,9 +117,7 @@ int process_request(RGWRados* const store,
                     RGWRestfulIO* const client_io,
                     OpsLogSocket* const olog)
 {
-  int ret = 0;
-
-  client_io->init(g_ceph_context);
+  int ret = client_io->init(g_ceph_context);
 
   req->log_init();
 
@@ -137,13 +135,19 @@ int process_request(RGWRados* const store,
   RGWObjectCtx rados_ctx(store, s);
   s->obj_ctx = &rados_ctx;
 
+  if (ret < 0) {
+    s->cio = client_io;
+    abort_early(s, nullptr, ret, nullptr);
+    return ret;
+  }
+
   s->req_id = store->unique_id(req->id);
   s->trans_id = store->unique_trans_id(req->id);
   s->host_id = store->host_id;
 
   req->log_format(s, "initializing for trans_id = %s", s->trans_id.c_str());
 
-  RGWOp* op = NULL;
+  RGWOp* op = nullptr;
   int init_error = 0;
   bool should_log = false;
   RGWRESTMgr *mgr;
@@ -152,7 +156,7 @@ int process_request(RGWRados* const store,
                                                frontend_prefix,
                                                client_io, &mgr, &init_error);
   if (init_error != 0) {
-    abort_early(s, NULL, init_error, NULL);
+    abort_early(s, nullptr, init_error, nullptr);
     goto done;
   }
   dout(10) << "handler=" << typeid(*handler).name() << dendl;
index 460029be925414fd0b65fbd40729ca78ddaae47a..78ea99ed7a9b556f2c56c1381dbf69a117b41928 100644 (file)
@@ -1,4 +1,3 @@
-
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
@@ -2792,6 +2791,22 @@ int RGWPutObjProcessor_Atomic::do_complete(size_t accounted_size, const string&
   return 0;
 }
 
+const char* RGWRados::admin_commands[4][3] = {
+  { "cache list",
+    "cache list name=filter,type=CephString,req=false",
+    "cache list [filter_str]: list object cache, possibly matching substrings" },
+  { "cache inspect",
+    "cache inspect name=target,type=CephString,req=true",
+    "cache inspect target: print cache element" },
+  { "cache erase",
+    "cache erase name=target,type=CephString,req=true",
+    "cache erase target: erase element from cache" },
+  { "cache zap",
+    "cache zap",
+    "cache zap: erase all elements from cache" }
+};
+
+
 int RGWRados::watch(const string& oid, uint64_t *watch_handle, librados::WatchCtx2 *ctx) {
   int r = control_pool_ctx.watch2(oid, watch_handle, ctx);
   if (r < 0)
@@ -3669,6 +3684,15 @@ bool RGWIndexCompletionManager::handle_completion(completion_t cb, complete_op_d
 
 void RGWRados::finalize()
 {
+  auto admin_socket = cct->get_admin_socket();
+  for (auto cmd : admin_commands) {
+    int r = admin_socket->unregister_command(cmd[0]);
+    if (r < 0) {
+      lderr(cct) << "ERROR: fail to unregister admin socket command (r=" << r
+                 << ")" << dendl;
+    }
+  }
+
   if (run_sync_thread) {
     Mutex::Locker l(meta_sync_thread_lock);
     meta_sync_processor_thread->stop();
@@ -3773,6 +3797,17 @@ void RGWRados::finalize()
 int RGWRados::init_rados()
 {
   int ret = 0;
+  auto admin_socket = cct->get_admin_socket();
+  for (auto cmd : admin_commands) {
+    int r = admin_socket->register_command(cmd[0], cmd[1], this,
+                                           cmd[2]);
+    if (r < 0) {
+      lderr(cct) << "ERROR: fail to register admin socket command (r=" << r
+                 << ")" << dendl;
+      return r;
+    }
+  }
+
   auto handles = std::vector<librados::Rados>{cct->_conf->rgw_num_rados_handles};
 
   for (auto& r : handles) {
@@ -4861,6 +4896,12 @@ void RGWRados::build_bucket_index_marker(const string& shard_id_str, const strin
 
 int RGWRados::open_bucket_index_ctx(const RGWBucketInfo& bucket_info, librados::IoCtx& index_ctx)
 {
+  const rgw_pool& explicit_pool = bucket_info.bucket.explicit_placement.index_pool;
+
+  if (!explicit_pool.empty()) {
+    return open_pool_ctx(explicit_pool, index_ctx);
+  }
+
   const string *rule = &bucket_info.placement_rule;
   if (rule->empty()) {
     rule = &zonegroup.default_placement;
@@ -14023,3 +14064,71 @@ int rgw_compression_info_from_attrset(map<string, bufferlist>& attrs, bool& need
   }
 }
 
+bool RGWRados::call(std::string command, cmdmap_t& cmdmap, std::string format,
+                    bufferlist& out)
+{
+  if (command == "cache list") {
+    boost::optional<std::string> filter;
+    auto i = cmdmap.find("filter");
+    if (i != cmdmap.cend()) {
+      filter = boost::get<std::string>(i->second);
+    }
+    std::unique_ptr<Formatter> f(ceph::Formatter::create(format, "table"));
+    if (f) {
+      f->open_array_section("cache_entries");
+      call_list(filter, f.get());
+      f->close_section();
+      f->flush(out);
+      return true;
+    } else {
+      out.append("Unable to create Formatter.\n");
+      return false;
+    }
+  } else if (command == "cache inspect") {
+    std::unique_ptr<Formatter> f(ceph::Formatter::create(format, "json-pretty"));
+    if (f) {
+      const auto& target = boost::get<std::string>(cmdmap["target"]);
+      if (call_inspect(target, f.get())) {
+        f->flush(out);
+        return true;
+      } else {
+        out.append(string("Unable to find entry ") + target + string(".\n"));
+        return false;
+      }
+    } else {
+      out.append("Unable to create Formatter.\n");
+      return false;
+    }
+  } else if (command == "cache erase") {
+    const auto& target = boost::get<std::string>(cmdmap["target"]);
+    if (call_erase(target)) {
+      return true;
+    } else {
+      out.append(string("Unable to find entry ") + target + string(".\n"));
+      return false;
+    }
+  } else if (command == "cache zap") {
+    call_zap();
+    return true;
+  }
+  return false;
+}
+
+void RGWRados::call_list(const boost::optional<std::string>&,
+                         ceph::Formatter*)
+{
+  return;
+}
+
+bool RGWRados::call_inspect(const std::string&, Formatter*)
+{
+  return false;
+}
+
+bool RGWRados::call_erase(const std::string&) {
+  return false;
+}
+
+void RGWRados::call_zap() {
+  return;
+}
index 58848b0419d90a618c8893bd2641f12f88f6ebaa..13de667c06045df8f84ecf75956772bfc9dc1b71 100644 (file)
@@ -8,6 +8,7 @@
 
 #include "include/rados/librados.hpp"
 #include "include/Context.h"
+#include "common/admin_socket.h"
 #include "common/RefCountedObj.h"
 #include "common/RWLock.h"
 #include "common/ceph_time.h"
@@ -2204,7 +2205,7 @@ struct tombstone_entry {
 
 class RGWIndexCompletionManager;
 
-class RGWRados
+class RGWRados : public AdminSocketHook
 {
   friend class RGWGC;
   friend class RGWMetaNotifier;
@@ -2220,6 +2221,8 @@ class RGWRados
   friend class BucketIndexLockGuard;
   friend class RGWCompleteMultipart;
 
+  static const char* admin_commands[4][3];
+
   /** Open the pool used as root for this gateway */
   int open_root_pool_ctx();
   int open_gc_pool_ctx();
@@ -3411,6 +3414,43 @@ private:
                       boost::optional<obj_version> refresh_version);
 public:
 
+  bool call(std::string command, cmdmap_t& cmdmap, std::string format,
+           bufferlist& out) override final;
+
+  // Should really be protected, but some older GCCs don't handle
+  // access control properly with lambdas defined in member functions
+  // of child classes.
+
+  void cache_list_dump_helper(Formatter* f,
+                             const std::string& name,
+                             const ceph::real_time mtime,
+                             const std::uint64_t size) {
+    f->dump_string("name", name);
+    f->dump_string("mtime", ceph::to_iso_8601(mtime));
+    f->dump_unsigned("size", size);
+  }
+
+protected:
+
+  // `call_list` must iterate over all cache entries and call
+  // `cache_list_dump_helper` with the supplied Formatter on any that
+  // include `filter` as a substring.
+  //
+  virtual void call_list(const boost::optional<std::string>& filter,
+                        Formatter* format);
+  // `call_inspect` must look up the requested target and, if found,
+  // dump it to the supplied Formatter and return true. If not found,
+  // it must return false.
+  //
+  virtual bool call_inspect(const std::string& target, Formatter* format);
+
+  // `call_erase` must erase the requested target and return true. If
+  // the requested target does not exist, it should return false.
+  virtual bool call_erase(const std::string& target);
+
+  // `call_zap` must erase the cache.
+  virtual void call_zap();
+public:
 
   int get_bucket_info(RGWObjectCtx& obj_ctx,
                      const string& tenant_name, const string& bucket_name,
index 515057dfcd679c8b622603477ed3f23022903239..61d497d36ae440fd8f363eda779ad7fe34d77f2a 100644 (file)
@@ -716,6 +716,22 @@ static inline void dump_header_if_nonempty(struct req_state* s,
   }
 }
 
+static inline std::string compute_domain_uri(const struct req_state *s) {
+  std::string uri = (!s->info.domain.empty()) ? s->info.domain :
+    [&s]() -> std::string {
+    auto env = *(s->info.env);
+    std::string uri =
+    env.get("SERVER_PORT_SECURE") ? "https://" : "http://";
+    if (env.exists("SERVER_NAME")) {
+      uri.append(env.get("SERVER_NAME", "<SERVER_NAME>"));
+    } else {
+      uri.append(env.get("HTTP_HOST", "<HTTP_HOST>"));
+    }
+    return uri;
+  }();
+  return uri;
+}
+
 extern void dump_content_length(struct req_state *s, uint64_t len);
 extern int64_t parse_content_length(const char *content_length);
 extern void dump_etag(struct req_state *s,
@@ -748,7 +764,6 @@ extern void dump_access_control(req_state *s, RGWOp *op);
 extern int dump_body(struct req_state* s, const char* buf, size_t len);
 extern int dump_body(struct req_state* s, /* const */ ceph::buffer::list& bl);
 extern int dump_body(struct req_state* s, const std::string& str);
-
 extern int recv_body(struct req_state* s, char* buf, size_t max);
 
 #endif /* CEPH_RGW_REST_H */
index ec9011a06bc44d7640a563bc826e54709bb34237..9c7eabbaeeb1fa500eaaab77beb1b1c9366a71f2 100644 (file)
@@ -1255,29 +1255,33 @@ int RGWPutObj_ObjStore_S3::get_params()
 
   if_match = s->info.env->get("HTTP_IF_MATCH");
   if_nomatch = s->info.env->get("HTTP_IF_NONE_MATCH");
-  copy_source = s->info.env->get("HTTP_X_AMZ_COPY_SOURCE");
+  copy_source = url_decode(s->info.env->get("HTTP_X_AMZ_COPY_SOURCE", ""));
   copy_source_range = s->info.env->get("HTTP_X_AMZ_COPY_SOURCE_RANGE");
 
   /* handle x-amz-copy-source */
-
-  if (copy_source) {
-    if (*copy_source == '/') ++copy_source;
-    copy_source_bucket_name = copy_source;
+  boost::string_view cs_view(copy_source);
+  if (! cs_view.empty()) {
+    if (cs_view[0] == '/')
+      cs_view.remove_prefix(1);
+    copy_source_bucket_name = cs_view.to_string();
     pos = copy_source_bucket_name.find("/");
     if (pos == std::string::npos) {
       ret = -EINVAL;
       ldout(s->cct, 5) << "x-amz-copy-source bad format" << dendl;
       return ret;
     }
-    copy_source_object_name = copy_source_bucket_name.substr(pos + 1, copy_source_bucket_name.size());
+    copy_source_object_name =
+      copy_source_bucket_name.substr(pos + 1, copy_source_bucket_name.size());
     copy_source_bucket_name = copy_source_bucket_name.substr(0, pos);
 #define VERSION_ID_STR "?versionId="
     pos = copy_source_object_name.find(VERSION_ID_STR);
     if (pos == std::string::npos) {
       copy_source_object_name = url_decode(copy_source_object_name);
     } else {
-      copy_source_version_id = copy_source_object_name.substr(pos + sizeof(VERSION_ID_STR) - 1);
-      copy_source_object_name = url_decode(copy_source_object_name.substr(0, pos));
+      copy_source_version_id =
+       copy_source_object_name.substr(pos + sizeof(VERSION_ID_STR) - 1);
+      copy_source_object_name =
+       url_decode(copy_source_object_name.substr(0, pos));
     }
     pos = copy_source_bucket_name.find(":");
     if (pos == std::string::npos) {
@@ -1379,7 +1383,7 @@ void RGWPutObj_ObjStore_S3::send_response()
        s->cct->_conf->rgw_s3_success_create_obj_status);
       set_req_state_err(s, op_ret);
     }
-    if (!copy_source) {
+    if (copy_source.empty()) {
       dump_errno(s);
       dump_etag(s, etag);
       dump_content_length(s, 0);
@@ -2279,7 +2283,7 @@ void RGWGetCORS_ObjStore_S3::send_response()
 {
   if (op_ret) {
     if (op_ret == -ENOENT)
-      set_req_state_err(s, ERR_NOT_FOUND);
+      set_req_state_err(s, ERR_NO_SUCH_CORS_CONFIGURATION);
     else
       set_req_state_err(s, op_ret);
   }
@@ -2536,23 +2540,24 @@ void RGWCompleteMultipart_ObjStore_S3::send_response()
     set_req_state_err(s, op_ret);
   dump_errno(s);
   end_header(s, this, "application/xml");
-  if (op_ret == 0) { 
+  if (op_ret == 0) {
     dump_start(s);
     s->formatter->open_object_section_in_ns("CompleteMultipartUploadResult", XMLNS_AWS_S3);
+    std::string base_uri = compute_domain_uri(s);
     if (!s->bucket_tenant.empty()) {
-      if (s->info.domain.length()) {
-        s->formatter->dump_format("Location", "%s.%s.%s",
-          s->bucket_name.c_str(),
-          s->bucket_tenant.c_str(),
-          s->info.domain.c_str());
-      }
+      s->formatter->dump_format("Location", "%s/%s:%s/%s",
+         base_uri.c_str(),
+         s->bucket_tenant.c_str(),
+         s->bucket_name.c_str(),
+         s->object.name.c_str()
+          );
       s->formatter->dump_string("Tenant", s->bucket_tenant);
     } else {
-      if (s->info.domain.length()) {
-        s->formatter->dump_format("Location", "%s.%s",
-          s->bucket_name.c_str(),
-          s->info.domain.c_str());
-      }
+      s->formatter->dump_format("Location", "%s/%s/%s",
+         base_uri.c_str(),
+         s->bucket_name.c_str(),
+         s->object.name.c_str()
+          );
     }
     s->formatter->dump_string("Bucket", s->bucket_name);
     s->formatter->dump_string("Key", s->object.name);
@@ -3272,9 +3277,11 @@ int RGWHandler_REST_S3::init(RGWRados *store, struct req_state *s,
   s->has_acl_header = s->info.env->exists_prefix("HTTP_X_AMZ_GRANT");
 
   const char *copy_source = s->info.env->get("HTTP_X_AMZ_COPY_SOURCE");
+  if (copy_source &&
+      (! s->info.env->get("HTTP_X_AMZ_COPY_SOURCE_RANGE")) &&
+      (! s->info.args.exists("uploadId"))) {
 
-  if (copy_source && !s->info.env->get("HTTP_X_AMZ_COPY_SOURCE_RANGE")) {
-    ret = RGWCopyObj::parse_copy_location(copy_source,
+    ret = RGWCopyObj::parse_copy_location(url_decode(copy_source),
                                           s->init_state.src_bucket,
                                           s->src_object);
     if (!ret) {
index ba1822f38a16ae37f4f745f2724e82e15e840e82..9dd40af9ce5d636b528adb2f8fad54a91b6edd7b 100644 (file)
@@ -2907,8 +2907,9 @@ int RGWHandler_REST_SWIFT::init(RGWRados* store, struct req_state* s,
 
   s->dialect = "swift";
 
-  const char *copy_source = s->info.env->get("HTTP_X_COPY_FROM");
-  if (copy_source) {
+  std::string copy_source =
+    url_decode(s->info.env->get("HTTP_X_COPY_FROM", ""));
+  if (! copy_source.empty()) {
     bool result = RGWCopyObj::parse_copy_location(copy_source, t->src_bucket,
                                                  s->src_object);
     if (!result)
@@ -2916,11 +2917,12 @@ int RGWHandler_REST_SWIFT::init(RGWRados* store, struct req_state* s,
   }
 
   if (s->op == OP_COPY) {
-    const char *req_dest = s->info.env->get("HTTP_DESTINATION");
-    if (!req_dest)
+    std::string req_dest =
+      url_decode(s->info.env->get("HTTP_DESTINATION", ""));
+    if (req_dest.empty())
       return -ERR_BAD_URL;
 
-    string dest_bucket_name;
+    std::string dest_bucket_name;
     rgw_obj_key dest_obj_key;
     bool result =
       RGWCopyObj::parse_copy_location(req_dest, dest_bucket_name,
@@ -2928,7 +2930,7 @@ int RGWHandler_REST_SWIFT::init(RGWRados* store, struct req_state* s,
     if (!result)
        return -ERR_BAD_URL;
 
-    string dest_object = dest_obj_key.name;
+    std::string dest_object = dest_obj_key.name;
 
     /* convert COPY operation into PUT */
     t->src_bucket = t->url_bucket;
index b989ded58e5dd68d545aa049b534de148a11b066..1c64291c7da963a978ef195418d6d2774628597c 100644 (file)
@@ -3275,7 +3275,11 @@ int main(int argc, char **argv)
         if (vm.count("objcmd") && (objcmd == "remove-clone-metadata"))
          head = true;
        lookup_ghobject lookup(object, nspace, head);
-       if (action_on_all_objects(fs, lookup, debug)) {
+       if (pgidstr.length())
+         ret = action_on_all_objects_in_exact_pg(fs, coll_t(pgid), lookup, debug);
+       else
+         ret = action_on_all_objects(fs, lookup, debug);
+       if (ret) {
          throw std::runtime_error("Internal error");
        } else {
          if (lookup.size() != 1) {
index 156647c30771731c93ebe5b8035ec6473dfa617e..eed2cebcaf33e0548423ecda5efc24220d3c829e 100644 (file)
@@ -1375,6 +1375,16 @@ static void dump_shard(const shard_info_t& shard,
     ::decode(oi, bliter);  // Can't be corrupted
     f.dump_stream("object_info") << oi;
   }
+  if (!shard.has_ss_attr_missing() && !shard.has_ss_attr_corrupted() &&
+      inc.has_snapset_inconsistency()) {
+    SnapSet ss;
+    bufferlist bl;
+    map<std::string, ceph::bufferlist>::iterator k = (const_cast<shard_info_t&>(shard)).attrs.find(SS_ATTR);
+    assert(k != shard.attrs.end()); // Can't be missing
+    bufferlist::iterator bliter = k->second.begin();
+    decode(ss, bliter);  // Can't be corrupted
+    f.dump_stream("snapset") << ss;
+  }
   if (inc.has_attr_name_mismatch() || inc.has_attr_value_mismatch()
      || inc.union_shards.has_oi_attr_missing()
      || inc.union_shards.has_oi_attr_corrupted()
@@ -1408,6 +1418,8 @@ static void dump_obj_errors(const obj_err_t &err, Formatter &f)
     f.dump_string("error", "attr_value_mismatch");
   if (err.has_attr_name_mismatch())
     f.dump_string("error", "attr_name_mismatch");
+  if (err.has_snapset_inconsistency())
+    f.dump_string("error", "snapset_inconsistency");
   f.close_section();
 }