[oce] 01/17: Merge tag 'upstream/0.14.1' into debian

Denis Barbier barbier-guest at moszumanska.debian.org
Mon Feb 10 08:31:54 UTC 2014


This is an automated email from the git hooks/post-receive script.

barbier-guest pushed a commit to branch debian
in repository oce.

commit f54d058b4857a68dead26ebe2d81b2462ad93f9c
Merge: 9fff65d 4992444
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sat Jan 11 10:41:08 2014 +0100

    Merge tag 'upstream/0.14.1' into debian
    
    Upstream version 0.14.1

 BUILD.MINGWw64                                     |   57 +
 CMakeLists.txt                                     |  205 +-
 NEWS                                               |   42 +
 adm/cmake/BuildToolkit.cmake                       |   75 +-
 adm/cmake/CopyFiles.cmake                          |   32 +
 adm/cmake/TKService/CMakeLists.txt                 |    2 +-
 adm/cmake/config/TestDuplicateBodyTemplate.cxx     |   26 +
 adm/cmake/config/oce_build_config.h.cmake          |    4 +-
 adm/cmake/config/oce_build_paths.h.cmake           |   16 +-
 adm/cmake/config/oce_install_config.h.cmake        |    3 +-
 inc/V3d_View.hxx                                   |    2 +-
 src/AIS/AIS_TexturedShape.cxx                      |    6 +-
 src/AdvApp2Var/AdvApp2Var_SysBase.hxx              |    4 +
 src/AlienImage/AlienImage_BMPAlienData.cxx         |    4 +-
 src/AlienImage/AlienImage_SGIRGBAlienData.cxx      |    4 +-
 src/Aspect/Aspect_Handle.hxx                       |    2 +
 src/BOPCol/BOPCol_Array1.hxx                       |    2 +-
 src/BOPDS/BOPDS_PassKey.cxx                        |    2 +-
 src/BOPDS/BOPDS_PaveBlock.cxx                      |    2 +-
 src/BRepAlgo/BRepAlgo.cxx                          |    2 +
 src/BRepFill/BRepFill_Pipe.cxx                     |    2 +
 src/BRepMesh/BRepMesh_CellFilter.hxx               |    2 +-
 src/BRepMesh/BRepMesh_DiscretFactory.cxx           |   24 +-
 src/BRepMesh/BRepMesh_FastDiscret.cxx              |    2 +-
 src/BSplSLib/BSplSLib.cxx                          |    2 +-
 src/CDF/CDF.cxx                                    |    2 +-
 src/Contap/Contap_HCurve2dToolGen.gxx              |    2 +
 src/Draw/Draw.cxx                                  |   43 +-
 src/Draw/Draw_BasicCommands.cxx                    |    2 +
 src/Draw/Draw_GraphicCommands.cxx                  |    2 +-
 src/Draw/Draw_Window.cxx                           |    2 +-
 src/FSD/FSD_BinaryFile.cxx                         |    3 +-
 src/FSD/FSD_FileHeader.hxx                         |    2 +-
 src/FWOSDriver/FWOSDriver_Driver.cxx               |    2 +-
 src/Graphic3d/Graphic3d.cxx                        |   20 +-
 src/HLRBRep/HLRBRep_Curve.cxx                      |    2 +
 src/IFSelect/IFSelect_SessionFile.cxx              |    2 +-
 src/IFSelect/IFSelect_SessionPilot.cxx             |    2 +-
 src/IGESData/IGESData.cxx                          |    2 +-
 src/IGESFile/liriges.c                             |    8 +-
 src/Image/Image_Diff.cxx                           |   14 +
 src/Interface/Interface_BitMap.cxx                 |    2 +-
 src/Interface/Interface_FileReaderTool.cxx         |    2 +-
 src/LDOM/LDOM_OSStream.cxx                         |    2 +-
 src/LDOM/LDOM_OSStream.hxx                         |    2 +-
 src/MeshVS/MeshVS_NodalColorPrsBuilder.cxx         |   22 +-
 src/NCollection/NCollection_Array1.hxx             |    4 +
 src/NCollection/NCollection_Array2.hxx             |    2 +-
 src/NCollection/NCollection_CellFilter.hxx         |    4 +-
 src/NCollection/NCollection_DefaultHasher.hxx      |    8 +
 src/NCollection/NCollection_IncAllocator.hxx       |   15 +-
 src/NCollection/NCollection_IndexedDataMap.hxx     |    2 +-
 src/NCollection/NCollection_IndexedMap.hxx         |    2 +-
 src/NCollection/NCollection_UtfString.lxx          |    4 +-
 src/OSD/OSD.cxx                                    |    5 +-
 src/OSD/OSD_Chronometer.cxx                        |    4 +
 src/OSD/OSD_Disk.cxx                               |    4 +-
 src/OSD/OSD_File.cxx                               |   15 +-
 src/OSD/OSD_FileNode.cxx                           |    2 +-
 src/OSD/OSD_Host.cxx                               |    2 +
 src/OSD/OSD_MAllocHook.cxx                         |   12 +-
 src/OSD/OSD_Process.cxx                            |    5 +-
 src/OSD/OSD_WNT_1.hxx                              |    2 +-
 src/OSD/OSD_signal.cxx                             |   35 -
 src/OpenGl/OpenGl_AspectFace.cxx                   |    4 +
 src/OpenGl/OpenGl_PrimitiveArray.cxx               |    4 +
 src/OpenGl/OpenGl_glext.h                          |  110 +-
 src/Plugin/Plugin.cxx                              |   24 +-
 src/Poly/Poly_CoherentTriPtr.hxx                   |    4 +-
 src/RWStl/RWStl.cxx                                |    9 +-
 src/Standard/Handle_Standard_Persistent.hxx        |    4 +-
 src/Standard/Standard_Atomic.hxx                   |   15 +
 src/Standard/Standard_CString.cxx                  |    4 +-
 src/Standard/Standard_Integer.hxx                  |    2 +-
 src/Standard/Standard_MMgrOpt.cxx                  |    4 +-
 src/Standard/Standard_Macro.hxx                    |    2 +-
 src/Standard/Standard_TypeDef.hxx                  |    4 +
 src/StepFile/recfile.pc                            |    2 +-
 src/StepToGeom/StepToGeom_MakeTrimmedCurve2d.cxx   |    2 +-
 src/TDF/TDF_LabelMapHasher.lxx                     |    4 +
 src/TDataStd/TDataStd_NamedData.cxx                |   12 +-
 src/TKService/EXTERNLIB                            |    1 -
 src/TNaming/TNaming.cxx                            |    2 +-
 src/TNaming/TNaming_DeltaOnModification.cxx        |    2 +
 src/TNaming/TNaming_NamedShape.cxx                 |    2 +
 src/TopLoc/TopLoc_Location.cxx                     |    2 +-
 src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx    |    8 +-
 src/V3d/V3d_View.cdl                               |    2 +-
 src/V3d/V3d_Viewer.cxx                             |    2 +-
 src/ViewerTest/ViewerTest.cxx                      |   15 +-
 src/Voxel/Voxel_Reader.cxx                         |  101 +-
 src/math/math_Powell.cxx                           |   10 +-
 test/CMakeLists.txt                                |    6 +-
 test/OCAFExport_test/OCAFExport_test.cpp           |   11 +
 .../include/gtest/internal/gtest-string.h          |  350 --
 test/gtest-1.6.0/lib/README                        |    2 -
 test/{gtest-1.6.0 => gtest-1.7.0}/CHANGES          |   27 +
 test/{gtest-1.6.0 => gtest-1.7.0}/CMakeLists.txt   |   42 +-
 test/{gtest-1.6.0 => gtest-1.7.0}/CONTRIBUTORS     |    0
 test/{gtest-1.6.0/COPYING => gtest-1.7.0/LICENSE}  |    0
 test/{gtest-1.6.0 => gtest-1.7.0}/Makefile.am      |    4 +
 test/{gtest-1.6.0 => gtest-1.7.0}/Makefile.in      |  183 +-
 test/{gtest-1.6.0 => gtest-1.7.0}/README           |   29 +-
 test/{gtest-1.6.0 => gtest-1.7.0}/aclocal.m4       |  102 +-
 .../build-aux/config.guess                         |  397 +-
 .../build-aux/config.h.in                          |    0
 .../build-aux/config.sub                           |  220 +-
 .../{gtest-1.6.0 => gtest-1.7.0}/build-aux/depcomp |   74 +-
 .../build-aux/install-sh                           |   29 +-
 .../build-aux/ltmain.sh                            | 4016 +++++++++++------
 .../{gtest-1.6.0 => gtest-1.7.0}/build-aux/missing |   53 +-
 .../cmake/internal_utils.cmake                     |   13 +-
 .../codegear/gtest.cbproj                          |    0
 .../codegear/gtest.groupproj                       |    0
 .../codegear/gtest_all.cc                          |    0
 .../codegear/gtest_link.cc                         |    0
 .../codegear/gtest_main.cbproj                     |    0
 .../codegear/gtest_unittest.cbproj                 |    0
 test/{gtest-1.6.0 => gtest-1.7.0}/configure        | 4650 ++++++++++++--------
 test/{gtest-1.6.0 => gtest-1.7.0}/configure.ac     |    6 +-
 .../fused-src/gtest/gtest-all.cc                   | 2026 +++++----
 .../fused-src/gtest/gtest.h                        | 2644 ++++++-----
 .../fused-src/gtest/gtest_main.cc                  |    5 +-
 .../include/gtest/gtest-death-test.h               |   17 +-
 .../include/gtest/gtest-message.h                  |   74 +-
 .../include/gtest/gtest-param-test.h               |    2 +-
 .../include/gtest/gtest-param-test.h.pump          |    2 +-
 .../include/gtest/gtest-printers.h                 |   91 +-
 .../include/gtest/gtest-spi.h                      |    2 +-
 .../include/gtest/gtest-test-part.h                |   17 +-
 .../include/gtest/gtest-typed-test.h               |    0
 .../include/gtest/gtest.h                          |  304 +-
 .../include/gtest/gtest_pred_impl.h                |   12 +-
 .../include/gtest/gtest_prod.h                     |    0
 .../gtest/internal/gtest-death-test-internal.h     |   21 +-
 .../include/gtest/internal/gtest-filepath.h        |   14 +-
 .../include/gtest/internal/gtest-internal.h        |  182 +-
 .../include/gtest/internal/gtest-linked_ptr.h      |    8 +-
 .../gtest/internal/gtest-param-util-generated.h    |  593 ++-
 .../internal/gtest-param-util-generated.h.pump     |    2 +-
 .../include/gtest/internal/gtest-param-util.h      |    8 +-
 .../include/gtest/internal/gtest-port.h            |  274 +-
 .../include/gtest/internal/gtest-string.h          |  167 +
 .../include/gtest/internal/gtest-tuple.h           |   92 +-
 .../include/gtest/internal/gtest-tuple.h.pump      |   13 +-
 .../include/gtest/internal/gtest-type-util.h       |   21 +-
 .../include/gtest/internal/gtest-type-util.h.pump  |   21 +-
 .../{gtest-1.6.0 => gtest-1.7.0}/m4/acx_pthread.m4 |    0
 test/{gtest-1.6.0 => gtest-1.7.0}/m4/gtest.m4      |    0
 test/{gtest-1.6.0 => gtest-1.7.0}/m4/libtool.m4    | 2236 ++++++----
 test/{gtest-1.6.0 => gtest-1.7.0}/m4/ltoptions.m4  |   32 +-
 test/{gtest-1.6.0 => gtest-1.7.0}/m4/ltsugar.m4    |    0
 test/{gtest-1.6.0 => gtest-1.7.0}/m4/ltversion.m4  |   12 +-
 .../{gtest-1.6.0 => gtest-1.7.0}/m4/lt~obsolete.m4 |   12 +-
 test/{gtest-1.6.0 => gtest-1.7.0}/make/Makefile    |    6 +-
 .../{gtest-1.6.0 => gtest-1.7.0}/msvc/gtest-md.sln |    0
 .../msvc/gtest-md.vcproj                           |    0
 test/{gtest-1.6.0 => gtest-1.7.0}/msvc/gtest.sln   |    0
 .../{gtest-1.6.0 => gtest-1.7.0}/msvc/gtest.vcproj |    0
 .../msvc/gtest_main-md.vcproj                      |    0
 .../msvc/gtest_main.vcproj                         |    0
 .../msvc/gtest_prod_test-md.vcproj                 |    0
 .../msvc/gtest_prod_test.vcproj                    |    0
 .../msvc/gtest_unittest-md.vcproj                  |    0
 .../msvc/gtest_unittest.vcproj                     |    0
 .../samples/prime_tables.h                         |    0
 .../samples/sample1.cc                             |    0
 .../{gtest-1.6.0 => gtest-1.7.0}/samples/sample1.h |    0
 .../samples/sample10_unittest.cc                   |    3 +-
 .../samples/sample1_unittest.cc                    |    2 +-
 .../samples/sample2.cc                             |    0
 .../{gtest-1.6.0 => gtest-1.7.0}/samples/sample2.h |    1 -
 .../samples/sample2_unittest.cc                    |    8 +-
 .../samples/sample3-inl.h                          |    7 +-
 .../samples/sample3_unittest.cc                    |    0
 .../samples/sample4.cc                             |    0
 .../{gtest-1.6.0 => gtest-1.7.0}/samples/sample4.h |    0
 .../samples/sample4_unittest.cc                    |    0
 .../samples/sample5_unittest.cc                    |   16 +-
 .../samples/sample6_unittest.cc                    |    0
 .../samples/sample7_unittest.cc                    |    0
 .../samples/sample8_unittest.cc                    |    0
 .../samples/sample9_unittest.cc                    |    0
 .../scripts/fuse_gtest_files.py                    |    0
 .../scripts/gen_gtest_pred_impl.py                 |    4 +-
 .../scripts/gtest-config.in                        |    2 +-
 test/{gtest-1.6.0 => gtest-1.7.0}/scripts/pump.py  |   38 +-
 .../scripts/test/Makefile                          |    0
 test/{gtest-1.6.0 => gtest-1.7.0}/src/gtest-all.cc |    0
 .../src/gtest-death-test.cc                        |  280 +-
 .../src/gtest-filepath.cc                          |   30 +-
 .../src/gtest-internal-inl.h                       |  242 +-
 .../{gtest-1.6.0 => gtest-1.7.0}/src/gtest-port.cc |  119 +-
 .../src/gtest-printers.cc                          |  101 +-
 .../src/gtest-test-part.cc                         |    6 +-
 .../src/gtest-typed-test.cc                        |    6 +-
 test/{gtest-1.6.0 => gtest-1.7.0}/src/gtest.cc     | 1241 +++---
 .../{gtest-1.6.0 => gtest-1.7.0}/src/gtest_main.cc |    5 +-
 .../test/gtest-death-test_ex_test.cc               |    0
 .../test/gtest-death-test_test.cc                  |  153 +-
 .../test/gtest-filepath_test.cc                    |  256 +-
 .../test/gtest-linked_ptr_test.cc                  |    3 +-
 .../test/gtest-listener_test.cc                    |   33 +-
 .../test/gtest-message_test.cc                     |   55 +-
 .../test/gtest-options_test.cc                     |   57 +-
 .../test/gtest-param-test2_test.cc                 |    0
 .../test/gtest-param-test_test.cc                  |   13 +-
 .../test/gtest-param-test_test.h                   |    6 +-
 .../test/gtest-port_test.cc                        |  125 +-
 .../test/gtest-printers_test.cc                    |  291 +-
 .../test/gtest-test-part_test.cc                   |    0
 .../test/gtest-tuple_test.cc                       |    0
 .../test/gtest-typed-test2_test.cc                 |    0
 .../test/gtest-typed-test_test.cc                  |    0
 .../test/gtest-typed-test_test.h                   |    0
 .../test/gtest-unittest-api_test.cc                |    0
 .../test/gtest_all_test.cc                         |    0
 .../test/gtest_break_on_failure_unittest.py        |   24 +-
 .../test/gtest_break_on_failure_unittest_.cc       |    0
 .../test/gtest_catch_exceptions_test.py            |   41 +-
 .../test/gtest_catch_exceptions_test_.cc           |    3 +
 .../test/gtest_color_test.py                       |    0
 .../test/gtest_color_test_.cc                      |    0
 .../test/gtest_env_var_test.py                     |    0
 .../test/gtest_env_var_test_.cc                    |    0
 .../test/gtest_environment_test.cc                 |    1 +
 .../test/gtest_filter_unittest.py                  |    0
 .../test/gtest_filter_unittest_.cc                 |    0
 .../test/gtest_help_test.py                        |    0
 .../test/gtest_help_test_.cc                       |    0
 .../test/gtest_list_tests_unittest.py              |   92 +-
 .../test/gtest_list_tests_unittest_.cc             |   78 +-
 .../test/gtest_main_unittest.cc                    |    0
 .../test/gtest_no_test_unittest.cc                 |    1 -
 .../test/gtest_output_test.py                      |    0
 .../test/gtest_output_test_.cc                     |   30 +-
 .../test/gtest_output_test_golden_lin.txt          |   27 +-
 .../test/gtest_pred_impl_unittest.cc               |    2 +-
 test/gtest-1.7.0/test/gtest_premature_exit_test.cc |  141 +
 .../test/gtest_prod_test.cc                        |    0
 .../test/gtest_repeat_test.cc                      |    2 +-
 .../test/gtest_shuffle_test.py                     |    0
 .../test/gtest_shuffle_test_.cc                    |    1 -
 .../test/gtest_sole_header_test.cc                 |    0
 .../test/gtest_stress_test.cc                      |    5 +-
 .../test/gtest_test_utils.py                       |   17 +-
 .../test/gtest_throw_on_failure_ex_test.cc         |    0
 .../test/gtest_throw_on_failure_test.py            |    0
 .../test/gtest_throw_on_failure_test_.cc           |   18 +-
 .../test/gtest_uninitialized_test.py               |    0
 .../test/gtest_uninitialized_test_.cc              |    0
 .../test/gtest_unittest.cc                         | 1012 +++--
 .../test/gtest_xml_outfile1_test_.cc               |    0
 .../test/gtest_xml_outfile2_test_.cc               |    0
 .../test/gtest_xml_outfiles_test.py                |    4 +-
 .../test/gtest_xml_output_unittest.py              |  149 +-
 .../test/gtest_xml_output_unittest_.cc             |   19 +-
 .../test/gtest_xml_test_utils.py                   |   73 +-
 .../test/production.cc                             |    0
 .../{gtest-1.6.0 => gtest-1.7.0}/test/production.h |    0
 .../xcode/Config/DebugProject.xcconfig             |    0
 .../xcode/Config/FrameworkTarget.xcconfig          |    0
 .../xcode/Config/General.xcconfig                  |    0
 .../xcode/Config/ReleaseProject.xcconfig           |    0
 .../xcode/Config/StaticLibraryTarget.xcconfig      |    0
 .../xcode/Config/TestTarget.xcconfig               |    0
 .../xcode/Resources/Info.plist                     |    0
 .../xcode/Samples/FrameworkSample/Info.plist       |    0
 .../WidgetFramework.xcodeproj/project.pbxproj      |    0
 .../xcode/Samples/FrameworkSample/runtests.sh      |    0
 .../xcode/Samples/FrameworkSample/widget.cc        |    0
 .../xcode/Samples/FrameworkSample/widget.h         |    0
 .../xcode/Samples/FrameworkSample/widget_test.cc   |    0
 .../xcode/Scripts/runtests.sh                      |    0
 .../xcode/Scripts/versiongenerate.py               |    0
 .../xcode/gtest.xcodeproj/project.pbxproj          |   65 +-
 276 files changed, 15620 insertions(+), 9560 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/oce.git



More information about the debian-science-commits mailing list