[primesieve] 02/04: Merge tag 'upstream/6.2'

Jerome Benoit calculus-guest at moszumanska.debian.org
Sat Nov 11 06:12:50 UTC 2017


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

calculus-guest pushed a commit to branch master
in repository primesieve.

commit 98ad8370a30e1163ac07c8ffd22f766e37fff0b7
Merge: 2b9f940 d66c8cd
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Fri Nov 10 16:56:09 2017 +0400

    Merge tag 'upstream/6.2'
    
    Upstream version 6.2

 .gitignore                                         |  25 +
 .travis.yml                                        |  63 ++
 AUTHORS                                            |   1 -
 CMakeLists.txt                                     | 178 +++++
 COPYING                                            |   2 +-
 ChangeLog                                          | 102 ++-
 Makefile.am                                        | 176 -----
 README.md                                          | 126 ++--
 RELEASE.md                                         |  59 --
 appveyor.yml                                       |  23 +
 autogen.sh                                         |  21 -
 configure.ac                                       | 134 ----
 doc/CMakeLists.txt                                 |  33 +
 doc/Doxyfile.in                                    |  42 +-
 doc/README.md                                      |  29 +-
 doc/mainpage.dox                                   |   4 +-
 doc/primesieve.1                                   |  64 ++
 examples/CMakeLists.txt                            |   2 +
 examples/README.md                                 |  52 +-
 examples/c/CMakeLists.txt                          |   6 +
 examples/c/count_primes.c                          |   4 -
 examples/c/{previous_prime.c => prev_prime.c}      |   4 +-
 examples/cpp/CMakeLists.txt                        |   6 +
 examples/cpp/callback_cancel.cpp                   |  29 -
 examples/cpp/callback_primes.cpp                   |  17 -
 examples/cpp/callback_primes_oop.cpp               |  22 -
 examples/cpp/count_primes.cpp                      |   6 -
 .../cpp/{previous_prime.cpp => prev_prime.cpp}     |   6 +-
 include/primesieve.h                               | 127 ++--
 include/primesieve.hpp                             | 147 ++--
 include/primesieve/Bucket.hpp                      | 141 ++++
 include/primesieve/Callback.hpp                    |  32 -
 include/primesieve/CpuInfo.hpp                     |  43 ++
 include/primesieve/EratBig.hpp                     |  34 +-
 include/primesieve/EratMedium.hpp                  |  33 +-
 include/primesieve/EratSmall.hpp                   |  37 +-
 include/primesieve/ParallelPrimeSieve-lock.hpp     |  84 ---
 include/primesieve/ParallelPrimeSieve.hpp          |  12 +-
 include/primesieve/PreSieve.hpp                    |  30 +-
 include/primesieve/PrimeFinder.hpp                 |  50 --
 include/primesieve/PrimeGenerator.hpp              |  36 +-
 include/primesieve/PrimeSieve-lock.hpp             |  32 -
 include/primesieve/PrimeSieve.hpp                  |  86 +--
 include/primesieve/PushBackPrimes.hpp              | 128 ----
 include/primesieve/SieveOfEratosthenes-inline.hpp  |  81 ---
 include/primesieve/SieveOfEratosthenes.hpp         | 123 +++-
 include/primesieve/SievingPrimes.hpp               |  34 +
 include/primesieve/StorePrimes.hpp                 | 116 +++
 include/primesieve/Wheel.hpp                       | 155 ++++
 include/primesieve/WheelFactorization.hpp          | 261 -------
 include/primesieve/bits.hpp                        |   7 +-
 include/primesieve/callback_t.hpp                  |  24 -
 include/primesieve/cancel_callback.hpp             |  21 -
 include/primesieve/config.hpp                      |  61 +-
 .../{primesieve_iterator.h => iterator.h}          |  40 +-
 include/primesieve/iterator.hpp                    |  13 +-
 include/primesieve/littleendian_cast.hpp           |   4 +-
 include/primesieve/malloc_vector.hpp               |   4 +-
 include/primesieve/pmath.hpp                       | 109 +--
 include/primesieve/primesieve_error.hpp            |  11 +-
 include/primesieve/toString.hpp                    |  28 -
 primesieve.pc.in                                   |  14 +-
 scripts/update_version.sh                          |  46 +-
 src/apps/console/cmdoptions.cpp                    | 202 ------
 src/apps/console/main.cpp                          | 146 ----
 src/apps/gui/AUTHORS                               |   1 -
 src/apps/gui/src/l1d_cache_size.cpp                | 140 ----
 src/{apps/gui/src => console}/calculator.hpp       |  12 +-
 src/console/cmdoptions.cpp                         | 211 ++++++
 src/{apps => }/console/cmdoptions.hpp              |   0
 src/{apps => }/console/help.cpp                    |  14 +-
 src/console/main.cpp                               | 135 ++++
 src/{apps => }/gui/COPYING                         |   0
 src/{apps => }/gui/INSTALL                         |   0
 src/{apps => }/gui/README                          |   0
 src/{apps => }/gui/forms/PrimeSieveGUI.ui          |   2 +-
 src/{apps => }/gui/icons/osx/primesieve.icns       | Bin
 src/{apps => }/gui/icons/win/primesieve.ico        | Bin
 src/{apps => }/gui/icons/win/primesieve.rc         |   0
 src/{apps => }/gui/primesieve.pro                  |  45 +-
 src/{apps => }/gui/src/PrimeSieveGUI.cpp           |  35 +-
 src/{apps => }/gui/src/PrimeSieveGUI.hpp           |   0
 src/{apps => }/gui/src/PrimeSieveGUI_const.hpp     |  14 +-
 src/{apps => }/gui/src/PrimeSieveGUI_menu.cpp      |   0
 src/{apps => }/gui/src/PrimeSieveProcess.cpp       |   2 +-
 src/{apps => }/gui/src/PrimeSieveProcess.hpp       |   0
 src/{apps/console => gui/src}/calculator.hpp       |  12 +-
 src/{apps => }/gui/src/main.cpp                    |   0
 src/msvc_compat/has_openmp.cpp                     |  19 -
 src/msvc_compat/stdint.h                           | 807 ---------------------
 src/primesieve/CpuInfo.cpp                         | 344 +++++++++
 src/primesieve/EratBig.cpp                         | 146 ++--
 src/primesieve/EratMedium.cpp                      | 113 ++-
 src/primesieve/EratSmall.cpp                       | 240 +++---
 src/primesieve/ParallelPrimeSieve.cpp              | 228 +++---
 src/primesieve/PreSieve.cpp                        |  77 +-
 src/primesieve/PrimeFinder.cpp                     | 210 ------
 src/primesieve/PrimeGenerator.cpp                  | 193 +++--
 src/primesieve/PrimeSieve-nthPrime.cpp             | 201 -----
 src/primesieve/PrimeSieve.cpp                      | 257 +++----
 src/primesieve/README                              |  81 ++-
 src/primesieve/SieveOfEratosthenes.cpp             | 164 ++---
 src/primesieve/SievingPrimes.cpp                   |  78 ++
 .../{WheelFactorization.cpp => Wheel.cpp}          |  20 +-
 src/primesieve/api-c.cpp                           | 353 +++++++++
 src/primesieve/api.cpp                             | 199 +++++
 src/primesieve/iterator-c.cpp                      | 161 ++++
 src/primesieve/iterator.cpp                        |  38 +-
 src/primesieve/nthPrime.cpp                        | 175 +++++
 src/primesieve/popcount.cpp                        |  34 +-
 src/primesieve/primesieve-api-c.cpp                | 521 -------------
 src/primesieve/primesieve-api.cpp                  | 257 -------
 src/primesieve/primesieve_iterator.cpp             | 161 ----
 src/primesieve/primesieve_test.cpp                 | 184 -----
 test/CMakeLists.txt                                |   7 +
 test/README.md                                     |  10 +
 test/atomic.cpp                                    | 124 ++++
 test/count_primes1.cpp                             |  63 ++
 test/count_primes2.cpp                             |  62 ++
 test/count_primes3.cpp                             |  66 ++
 test/count_quadruplets.cpp                         |  38 +
 test/count_quintuplets.cpp                         |  38 +
 test/count_sextuplets.cpp                          |  38 +
 test/count_triplets.cpp                            |  38 +
 test/count_twins.cpp                               |  38 +
 test/cpu_info.cpp                                  |  53 ++
 test/floorPow2.cpp                                 |  78 ++
 test/generate_n_primes1.cpp                        |  92 +++
 test/generate_n_primes2.c                          |  91 +++
 test/generate_primes1.cpp                          |  92 +++
 test/generate_primes2.c                            |  93 +++
 test/ilog2.cpp                                     |  79 ++
 test/isqrt.cpp                                     |  73 ++
 test/next_prime1.cpp                               |  75 ++
 test/next_prime2.c                                 |  86 +++
 test/nth_prime1.cpp                                |  58 ++
 test/nth_prime2.cpp                                |  98 +++
 test/nth_prime3.cpp                                |  58 ++
 test/prev_prime1.cpp                               |  80 ++
 test/prev_prime2.c                                 |  80 ++
 140 files changed, 5778 insertions(+), 5602 deletions(-)

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



More information about the debian-science-commits mailing list