[clasp] 01/03: Merge tag 'upstream/3.2.2'

[Thomas Krennwallner]

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

tkren-guest pushed a commit to branch devel
in repository clasp.

commit 2fa04c546dbd675c3b47b12c0720cd9be8c47fc0
Merge: 19d6c2e 6a8c501
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Wed Feb 1 11:39:46 2017 +0100

    Merge tag 'upstream/3.2.2'
    
    Upstream version 3.2.2

 CHANGES                                            | 12 ++++
 app/clasp_app.cpp                                  | 40 ++++++-------
 app/clasp_app.h                                    |  1 +
 libclasp/clasp/clasp_facade.h                      |  2 +-
 libclasp/clasp/minimize_constraint.h               |  2 +-
 libclasp/clasp/program_builder.h                   |  2 +
 libclasp/clasp/solve_algorithms.h                  |  1 +
 libclasp/clasp/util/platform.h                     |  6 +-
 libclasp/src/clasp_facade.cpp                      |  6 +-
 libclasp/src/clingo.cpp                            |  7 ++-
 libclasp/src/logic_program.cpp                     | 60 ++++++++++++--------
 libclasp/src/logic_program_types.cpp               |  2 +-
 libclasp/src/minimize_constraint.cpp               |  8 ++-
 libclasp/src/parallel_solve.cpp                    |  9 +--
 libclasp/src/parser.cpp                            | 48 +++++++++-------
 libclasp/src/program_builder.cpp                   | 10 ++++
 libclasp/src/solve_algorithms.cpp                  | 23 ++++----
 libclasp/src/solver.cpp                            |  4 +-
 libclasp/tests/dlp_builder_test.cpp                | 11 ++++
 libclasp/tests/facade_test.cpp                     | 32 ++++++++++-
 libclasp/tests/parser_test.cpp                     | 20 ++++++-
 libclasp/tests/program_builder_test.cpp            | 29 +++++++++-
 libprogram_opts/program_opts/application.h         |  8 +--
 libprogram_opts/program_opts/detail/alarm.h        | 36 ++++++------
 libprogram_opts/program_opts/detail/notifier.h     |  6 +-
 libprogram_opts/program_opts/detail/refcountable.h |  6 +-
 libprogram_opts/program_opts/detail/value_store.h  | 22 ++++----
 libprogram_opts/program_opts/errors.h              |  4 +-
 libprogram_opts/program_opts/mapped_value.h        | 10 ++--
 libprogram_opts/program_opts/program_options.h     | 66 +++++++++++-----------
 libprogram_opts/program_opts/string_convert.h      | 22 ++++----
 libprogram_opts/program_opts/typed_value.h         | 38 ++++++-------
 libprogram_opts/program_opts/value.h               | 34 +++++------
 libprogram_opts/program_opts/value_store.h         | 16 +++---
 libprogram_opts/src/alarm.cpp                      | 12 ++--
 libprogram_opts/src/application.cpp                | 10 ++--
 libprogram_opts/src/program_options.cpp            | 46 +++++++--------
 libprogram_opts/src/string_convert.cpp             | 29 +++++-----
 libprogram_opts/src/value_store.cpp                |  4 +-
 sync-prg-opts.sh                                   | 11 ++++
 40 files changed, 433 insertions(+), 282 deletions(-)

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