Merge branch 'develop'

Change appveyor badge url
Make build status links point to program_options
2026-01-20 04:42:24 +00:00 · 2018-03-15 22:21:23 +03:00 · 2018-03-15 22:13:25 +03:00 · 2018-03-12 01:37:17 +03:00 · 2018-03-12 01:34:51 +03:00 · 2018-03-12 01:26:55 +03:00
45 changed files with 1064 additions and 299 deletions
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -0,0 +1,3 @@
+fixes:
+  - home/travis/build/*/boost-root/boost/::include/boost/
+  - home/travis/build/*/boost-root/libs/*/src/::src/
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,172 @@
+# Copyright 2016 Peter Dimov
+# Copyright 2017, 2018 James E. King III
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+#
+# Generic Travis CI build script for boostorg repositories
+#
+# Instructions for customizing this script for your library:
+# 
+# 1. Copy the ci/ directory from the same source into your project:
+#    ci/build.sh runs the build
+#    ci/codecov.sh is used to run a profiling build and upload results to codecov.io
+#    ci/coverity.sh is used to run a coverity build and upload results coverity scan
+# 2. Customize the compilers and language levels you want.  Default is C++03.
+# 3. Update the global B2 environment settings to your liking.
+# 4. If you have more than include/, src/, and test/ directories then
+#    add them to the depinst.py line as "--include tools" for tools/ (you
+#    can put multiple --include on the command line).
+# 5. If you want to enable Coverity Scan, you need to provide the environment
+#    variables COVERITY_SCAN_TOKEN and COVERITY_SCAN_NOTIFICATION_EMAIL in
+#    your github settings.
+# 6. Enable pull request builds in your boostorg/<library> account.
+# 7. Change the default C++ version in ci/*.sh (search for CXXSTD)
+#
+# That's it - the scripts will do everything else for you.
+
+sudo: false
+dist: trusty
+language: cpp
+
+env:
+  global:
+  # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
+  # to use the default for a given environment, comment it out; recommend you build debug and release however..
+  # - B2_ADDRESS_MODEL=address-model=64,32
+  # - B2_LINK=link=shared,static
+  # - B2_THREADING=threading=multi,single
+    - B2_VARIANT=variant=release,debug
+
+install:
+  - export SELF=`basename $TRAVIS_BUILD_DIR`
+  - cd ..
+  - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - git submodule update -q --init tools/boostdep
+  - git submodule update -q --init tools/build
+  - git submodule update -q --init tools/inspect
+  - cp -r $TRAVIS_BUILD_DIR/* libs/$SELF
+  - export BOOST_ROOT="`pwd`"
+  - export PATH="`pwd`":$PATH 
+  - python tools/boostdep/depinst/depinst.py $SELF --include example
+  - ./bootstrap.sh
+  - ./b2 headers
+
+addons:
+  apt:
+    packages:
+      - binutils-gold
+      - gdb
+      - libc6-dbg
+        
+branches:
+  only:
+    - develop
+    - master
+    
+script:
+  - cd libs/$SELF
+  - ci/build.sh
+
+jobs:
+  include:
+    - os: linux
+      env: 
+        - COMMENT="C++03"
+        - TOOLSET=gcc,gcc-7
+      addons:
+        apt:
+          packages:
+            - g++-7
+          sources:
+            - ubuntu-toolchain-r-test
+    - os: linux
+      env: 
+        - COMMENT="C++11"
+        - TOOLSET=clang
+        - CXXSTD=11
+      addons:
+        apt:
+          packages:
+            - g++-7
+          sources:
+            - ubuntu-toolchain-r-test
+    - os: linux
+      env: 
+        - COMMENT=valgrind
+        - TOOLSET=clang 
+        - B2_VARIANT=variant=debug
+        - TESTFLAGS=testing.launcher=valgrind
+      addons:
+        apt:
+          packages:
+            - clang-5.0
+            - libstdc++-7-dev
+            - valgrind
+          sources:
+            - llvm-toolchain-trusty-5.0
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env:
+        - COMMENT=cppcheck
+      script:
+        - libs/$SELF/ci/cppcheck.sh
+
+    - os: linux
+      env:
+        - COMMENT=UBSAN
+        - B2_VARIANT=variant=debug
+        - TOOLSET=gcc-7
+        - CXXFLAGS="cxxflags=-fno-omit-frame-pointer cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined"
+        - LINKFLAGS="linkflags=-fsanitize=undefined linkflags=-fno-sanitize-recover=undefined"
+        - UBSAN_OPTIONS=print_stacktrace=1
+      addons:
+        apt:
+          packages:
+            - g++-7
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: 
+        - COMMENT=CodeCov
+        - TOOLSET=gcc-7
+      addons:
+        apt:
+          packages:
+            - gcc-7
+            - g++-7
+          sources:
+            - ubuntu-toolchain-r-test
+      script:
+        - pushd /tmp && git clone https://github.com/linux-test-project/lcov.git && cd lcov && sudo make install && which lcov && lcov --version && popd
+        - cd libs/$SELF
+        - ci/codecov.sh
+
+    #################### Jobs to run on every pull request ####################
+  # osx was disabled because it is very slow to start (can delay builds by 30 minutes)
+  # - os: osx
+  #   osx_image: xcode9
+  #   env:
+  #     - TOOLSET=clang
+  #     - CXXSTD=03,11
+
+    #################### Jobs to run on pushes to master, develop ###################
+ 
+    # Coverity Scan
+    - os: linux
+      if: (branch IN (develop, master)) AND (type IN (cron, push))
+      env:
+        - COMMENT="Coverity Scan"
+        - TOOLSET=gcc
+      script:
+        - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
+        - cd libs/$SELF
+        - ci/coverity.sh
+
+notifications:
+  email:
+    false
+
--- a/11
+++ b/11
@@ -0,0 +1,11 @@
+#  Boost.ProgramOptions Library Jamfile
+#
+#  Copyright (c) 2018 James E. King III
+#
+#  Use, modification, and distribution are 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)
+
+# please order by name to ease maintenance
+build-project example ;
+build-project test ;
--- a/README.md
+++ b/README.md
@@ -0,0 +1,37 @@
+Program Options, part of the collection of [Boost C++ Libraries](http://github.com/boostorg), allows for definition and acquisition of (name, value) pairs from the user via conventional methods such as command line and config file.  It is roughly analogous to getopt_long, but for use with C++.
+
+### License
+
+Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).
+
+### Properties
+
+* C++03
+* Requires Linking
+
+### Build Status
+(in progress...)
+
+|Branch          | Travis | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests |
+|:-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- |
+|[`master`](https://github.com/boostorg/program_options/tree/master) | [![Build Status](https://travis-ci.org/boostorg/program_options.svg?branch=master)](https://travis-ci.org/boostorg/program_options) | [![Build status](https://ci.appveyor.com/api/projects/status/upf5c528fy09fudk?svg=true)](https://ci.appveyor.com/project/jeking3/date-time-1evbf) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/14908/badge.svg)](https://scan.coverity.com/projects/boostorg-program_options) | [![codecov](https://codecov.io/gh/boostorg/program_options/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/program_options/branch/master) | [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/program_options.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](http://www.boost.org/doc/libs/master/doc/html/program_options.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/program_options.html) 
+|[`develop`](https://github.com/boostorg/program_options/tree/develop) | [![Build Status](https://travis-ci.org/boostorg/program_options.svg?branch=develop)](https://travis-ci.org/boostorg/program_options) | [![Build status](https://ci.appveyor.com/api/projects/status/e0quisadwh1v7ok5/branch/develop?svg=true)](https://ci.appveyor.com/project/vprus/program-options/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/14908/badge.svg)](https://scan.coverity.com/projects/boostorg-program_options) | [![codecov](https://codecov.io/gh/boostorg/program_options/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/program_options/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/program_options.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](http://www.boost.org/doc/libs/develop/doc/html/program_options.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/program_options.html)
+ 
+### Directories
+
+| Name      | Purpose                        |
+| --------- | ------------------------------ |
+| `build`   | build script for link library  |
+| `ci`      | continuous integration scripts |
+| `doc`     | documentation                  |
+| `example` | use case examples              |
+| `include` | headers                        |
+| `src`     | source code for link library   |
+| `test`    | unit tests                     |
+
+### More information
+
+* [Ask questions](http://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-program_options): Be sure to read the documentation first to see if it answers your question.
+* [Report bugs](https://github.com/boostorg/program_options/issues): Be sure to mention Boost version, platform and compiler you're using. A small compilable code sample to reproduce the problem is always good as well.
+* [Submit Pull Requests](https://github.com/boostorg/program_options/pulls) against the **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).  Be sure to include tests proving your changes work properly.
+* Discussions about the library are held on the [Boost developers mailing list](http://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](http://www.boost.org/community/policy.html) before posting and add the `[date_time]` tag at the beginning of the subject line.
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -0,0 +1,78 @@
+# Copyright 2016, 2017 Peter Dimov
+# Copyright (C) 2017, 2018 James E. King III
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+# When copying this to a new library, be sure to update the name of the library
+# in two places (once each at the top of install: and test_script:)
+
+version: 1.0.{build}-{branch}
+
+shallow_clone: true
+
+branches:
+  only:
+    - develop
+    - master
+
+matrix:
+  allow_failures:
+    - MAYFAIL: true
+
+environment:
+  global:
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
+    # to use the default for a given environment, comment it out; recommend you build debug and release however..
+    # on Windows it is important to exercise all the possibilities, especially shared vs static
+    # B2_ADDRESS_MODEL: address-model=64,32
+    # B2_LINK: link=shared,static
+    # B2_THREADING: threading=multi,single
+    B2_VARIANT: variant=release,debug
+    CXXSTD: 03
+
+  matrix:
+    - FLAVOR: Visual Studio 2017
+      TOOLSET: msvc-14.1
+      B2_ADDRESS_MODEL: address-model=64,32
+    - FLAVOR: Visual Studio 2013
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      TOOLSET: msvc-12.0
+    - FLAVOR:  mingw32
+      ARCH:    i686
+      B2_ADDRESS_MODEL: address-model=32
+      SCRIPT:  ci\mingw.bat
+    - FLAVOR:  mingw64
+      ARCH:    x86_64
+      B2_ADDRESS_MODEL: address-model=64
+      SCRIPT:  ci\mingw.bat
+    - FLAVOR: cygwin (64-bit)
+      ADDPATH: C:\cygwin64\bin;
+      B2_ADDRESS_MODEL: address-model=64
+      TOOLSET: gcc
+      MAYFAIL: true
+    - FLAVOR: cygwin (32-bit)
+      ADDPATH: C:\cygwin\bin;
+      B2_ADDRESS_MODEL: address-model=32
+      TOOLSET: gcc
+      MAYFAIL: true
+
+install:
+  - set SELF=program_options
+  - cd ..
+  - git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - git submodule update -q --init tools/boostdep
+  - git submodule update -q --init tools/build
+  - git submodule update -q --init tools/inspect
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\%SELF%
+  - python tools/boostdep/depinst/depinst.py --include example %SELF%
+  - cmd /c bootstrap
+  - b2 headers
+
+build: off
+
+test_script:
+  - set SELF=program_options
+  - PATH=%ADDPATH%%PATH%
+  - IF DEFINED SCRIPT (call libs\%SELF%\%SCRIPT%) ELSE (b2 libs/%SELF% toolset=%TOOLSET% cxxstd=%CXXSTD% %CXXFLAGS% %DEFINES% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -9,13 +9,8 @@ SOURCES =
    convert winmain split
    ;

-lib boost_program_options
+boost-lib program_options
    : $(SOURCES).cpp
-    : <link>shared:<define>BOOST_PROGRAM_OPTIONS_DYN_LINK=1 # tell source we're building dll's
-      # See https://svn.boost.org/trac/boost/ticket/5049
+    : # See https://svn.boost.org/trac/boost/ticket/5049
      <target-os>hpux,<toolset>gcc:<define>_INCLUDE_STDC__SOURCE_199901
-    :
-    : <link>shared:<define>BOOST_PROGRAM_OPTIONS_DYN_LINK=1
-    ;
-
-boost-install boost_program_options ;
+    ;
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -0,0 +1,19 @@
+#! /bin/bash
+#
+# Copyright 2017 James E. King III
+# 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)
+#
+# Bash script to run in travis to perform a bjam build
+# cwd should be $BOOST_ROOT/libs/$SELF before running
+#
+
+set -ex
+
+# default language level: c++03
+if [[ -z "$CXXSTD" ]]; then
+    CXXSTD=03
+fi
+
+$BOOST_ROOT/b2 . toolset=$TOOLSET cxxstd=$CXXSTD $CXXFLAGS $DEFINES $LINKFLAGS $TESTFLAGS $B2_ADDRESS_MODEL $B2_LINK $B2_THREADING $B2_VARIANT -j3 $*
--- a/ci/codecov.sh
+++ b/ci/codecov.sh
@@ -0,0 +1,43 @@
+#! /bin/bash
+#
+# Copyright 2017, 2018 James E. King III
+# 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)
+#
+# Bash script to run in travis to perform codecov.io integration
+#
+
+###
+### NOTE: Make sure you grab .codecov.yml
+###
+
+# assumes cwd is the top level directory of the boost project
+# assumes an environment variable $SELF is the boost project name
+
+set -ex
+
+B2_VARIANT=debug
+ci/build.sh cxxflags=-fprofile-arcs cxxflags=-ftest-coverage linkflags=-fprofile-arcs linkflags=-ftest-coverage
+
+# switch back to the original source code directory
+cd $TRAVIS_BUILD_DIR
+
+# get the version of lcov
+lcov --version
+
+# coverage files are in ../../b2 from this location
+lcov --gcov-tool=gcov-7 --rc lcov_branch_coverage=1 --base-directory "$BOOST_ROOT/libs/$SELF" --directory "$BOOST_ROOT" --capture --output-file all.info
+
+# all.info contains all the coverage info for all projects - limit to ours
+lcov --gcov-tool=gcov-7 --rc lcov_branch_coverage=1 --extract all.info "*/boost/$SELF/*" "*/libs/$SELF/src/*" --output-file coverage.info
+
+# dump a summary on the console - helps us identify problems in pathing
+lcov --gcov-tool=gcov-7 --rc lcov_branch_coverage=1 --list coverage.info
+
+#
+# upload to codecov.io
+#
+curl -s https://codecov.io/bash > .codecov
+chmod +x .codecov
+./.codecov -f coverage.info -X gcov -x "gcov-7"
--- a/ci/coverity.sh
+++ b/ci/coverity.sh
@@ -0,0 +1,42 @@
+#! /bin/bash
+#
+# Copyright 2017 James E. King III
+# 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)
+#
+# Bash script to run in travis to perform a Coverity Scan build
+# To skip the coverity integration download (which is huge) if
+# you already have it from a previous run, add --skipdownload
+#
+
+#
+# Environment Variables
+#
+# COVERITY_SCAN_NOTIFICATION_EMAIL  - email address to notify
+# COVERITY_SCAN_TOKEN               - the Coverity Scan token (should be secure)
+# SELF                              - the boost libs directory name
+
+set -ex
+
+pushd /tmp
+if [[ "$1" != "--skipdownload" ]]; then
+  rm -rf coverity_tool.tgz cov-analysis*
+  wget https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_SCAN_TOKEN&project=boostorg/$SELF" -O coverity_tool.tgz
+  tar xzf coverity_tool.tgz
+fi
+COVBIN=$(echo $(pwd)/cov-analysis*/bin)
+export PATH=$COVBIN:$PATH
+popd
+
+ci/build.sh clean
+rm -rf cov-int/
+cov-build --dir cov-int ci/build.sh
+tar cJf cov-int.tar.xz cov-int/
+curl --form token="$COVERITY_SCAN_TOKEN" \
+     --form email="$COVERITY_SCAN_NOTIFICATION_EMAIL" \
+     --form file=@cov-int.tar.xz \
+     --form version="$(git describe --tags)" \
+     --form description="boostorg/$SELF" \
+     https://scan.coverity.com/builds?project="boostorg/$SELF"
+
--- a/ci/cppcheck.sh
+++ b/ci/cppcheck.sh
@@ -0,0 +1,38 @@
+#! /bin/bash
+#
+# Copyright 2018 James E. King III
+# 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)
+#
+# Bash script to run in travis to perform a cppcheck
+# cwd should be $BOOST_ROOT before running
+#
+
+set -ex
+
+# default language level: c++03
+if [[ -z "$CXXSTD" ]]; then
+    CXXSTD=03
+fi
+
+# Travis' ubuntu-trusty comes with cppcheck 1.62 which is pretty old
+# default cppcheck version: 1.82
+if [[ -z "$CPPCHKVER" ]]; then
+    CPPCHKVER=1.82
+fi
+
+pushd ~
+wget https://github.com/danmar/cppcheck/archive/$CPPCHKVER.tar.gz
+tar xzf $CPPCHKVER.tar.gz
+mkdir cppcheck-build
+cd cppcheck-build
+cmake ../cppcheck-$CPPCHKVER -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=~/cppcheck
+make -j3 install
+popd
+
+~/cppcheck/bin/cppcheck -I. --std=c++$CXXSTD --enable=all --error-exitcode=1 \
+         --force --check-config --suppress=*:boost/preprocessor/tuple/size.hpp \
+         -UBOOST_USER_CONFIG -UBOOST_COMPILER_CONFIG -UBOOST_STDLIB_CONFIG -UBOOST_PLATFORM_CONFIG \
+         libs/$SELF 2>&1 | grep -v 'Cppcheck does not need standard library headers'
+
--- a/ci/mingw.bat
+++ b/ci/mingw.bat
@@ -0,0 +1,50 @@
+::
+:: MinGW Build Script for Appveyor, leveraging the MSYS2 installation
+:: Copyright (C) 2018 James E. King III
+:: Distributed under the Boost Software License, Version 1.0.
+:: (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+::
+
+@ECHO ON
+SETLOCAL EnableDelayedExpansion
+
+:: Set up the toolset
+echo using gcc : %FLAVOR% : %ARCH%-w64-mingw32-g++.exe ; > %USERPROFILE%\user-config.jam
+SET UPPERFLAVOR=%FLAVOR%
+CALL :TOUPPER UPPERFLAVOR
+
+:: Install packages needed to build boost
+:: Optional: comment out ones this library does not need, 
+:: so people can copy this script to another library.
+
+FOR %%a IN ("gcc" "icu" "libiconv" "openssl" "xz" "zlib") DO (
+    c:\msys64\usr\bin\env MSYSTEM=%UPPERFLAVOR% c:\msys64\usr\bin\bash -l -c ^
+      "pacman --sync --needed --noconfirm %FLAVOR%/mingw-w64-%ARCH%-%%a" || EXIT /B
+)
+c:\msys64\usr\bin\env MSYSTEM=%UPPERFLAVOR% c:\msys64\usr\bin\bash -l -c ^
+  "pacman --sync --needed --noconfirm python3" || EXIT /B
+
+::
+:: Now build things...
+::
+
+c:\msys64\usr\bin\env MSYSTEM=%UPPERFLAVOR% c:\msys64\usr\bin\bash -l -c ^
+  "cd %CD:\=/% && ./bootstrap.sh --with-toolset=gcc" || EXIT /B
+
+c:\msys64\usr\bin\env MSYSTEM=%UPPERFLAVOR% c:\msys64\usr\bin\bash -l -c ^
+  "cd %CD:\=/% && ./b2 libs/%SELF% toolset=gcc-%FLAVOR% cxxstd=%CXXSTD% %CXXFLAGS% %DEFINES% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3" || EXIT /B
+
+EXIT /B 0
+
+::
+:: Function to uppercase a variable
+:: from: https://stackoverflow.com/questions/34713621/batch-converting-variable-to-uppercase
+::
+
+:TOUPPER <variable>
+@ECHO OFF
+FOR %%a IN ("a=A" "b=B" "c=C" "d=D" "e=E" "f=F" "g=G" "h=H" "i=I"
+            "j=J" "k=K" "l=L" "m=M" "n=N" "o=O" "p=P" "q=Q" "r=R"
+            "s=S" "t=T" "u=U" "v=V" "w=W" "x=X" "y=Y" "z=Z"      ) DO ( CALL SET %~1=%%%~1:%%~a%% )
+@ECHO ON
+GOTO :EOF
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -10,4 +10,14 @@ boostbook program_option
    ;

 doxygen autodoc 
-    : [ glob ../../../boost/program_options/*.hpp ] ;
+    : [ glob ../../../boost/program_options/*.hpp ] ;
+
+###############################################################################
+alias boostdoc
+    : program_options.xml
+    :
+    : <dependency>autodoc
+    : ;
+explicit boostdoc ;
+alias boostrelease ;
+explicit boostrelease ;
--- a/doc/design.xml
+++ b/doc/design.xml
@@ -22,7 +22,7 @@
      not mean strict 7-bit ASCII encoding, but rather "char" strings in local
      8-bit encoding.
    </para>
-          
+
    <para>
      Generally, &quot;Unicode support&quot; can mean
      many things, but for the program_options library it means that:
@@ -54,7 +54,7 @@
                  passed to an ascii value will be converted using a codecvt
                  facet (which may be specified by the user).
                </para>
-              </listitem>                 
+              </listitem>
            </itemizedlist>
          </para>
        </listitem>
@@ -68,8 +68,8 @@
      Second, imagine a reusable library which has some options and exposes
      options description in its interface. If <emphasis>all</emphasis>
      options are either ascii or Unicode, and the library does not use any
-      Unicode strings, then the author will likely to use ascii options, which
-      would make the library unusable inside Unicode
+      Unicode strings, then the author is likely to use ascii options, making
+      the library unusable inside Unicode
      applications. Essentially, it would be necessary to provide two versions
      of the library -- ascii and Unicode.
    </para>
@@ -94,7 +94,7 @@
    <para>The primary question in implementing the Unicode support is whether
      to use templates and <code>std::basic_string</code> or to use some
      internal encoding and convert between internal and external encodings on
-      the interface boundaries.            
+      the interface boundaries.
    </para>

    <para>The choice, mostly, is between code size and execution
@@ -171,14 +171,14 @@
            number of new instantiations.
          </para>
        </listitem>
-          
+
      </itemizedlist>
      There's no clear leader, but the last point seems important, so UTF-8
-      will be used.      
+      will be used.
    </para>

-    <para>Choosing the UTF-8 encoding allows the use of existing parsers, 
-      because 7-bit ascii characters retain their values in UTF-8, 
+    <para>Choosing the UTF-8 encoding allows the use of existing parsers,
+      because 7-bit ascii characters retain their values in UTF-8,
      so searching for 7-bit strings is simple. However, there are
      two subtle issues:
      <itemizedlist>
@@ -197,16 +197,16 @@
      almost universal encoding and since composing characters following '=' (and
      other characters with special meaning to the library) are not likely to appear.
    </para>
-                   
+
  </section>

-  
+
 </section>

 <!--
     Local Variables:
     mode: xml
-     sgml-indent-data: t     
+     sgml-indent-data: t
     sgml-parent-document: ("program_options.xml" "section")
     sgml-set-face: t
     End:
--- a/doc/howto.xml
+++ b/doc/howto.xml
@@ -21,7 +21,7 @@ options groups/hidden options
 -->
  <section>
    <title>Non-conventional Syntax</title>
-    
+
    <para>Sometimes, standard command line syntaxes are not enough. For
    example, the gcc compiler has "-frtti" and -fno-rtti" options, and this
    syntax is not directly supported.
@@ -57,14 +57,14 @@ store(command_line_parser(ac, av).options(desc).extra_parser(reg_foo)
        .run(), vm);
 </programlisting>
      The complete example can be found in the "example/custom_syntax.cpp"
-      file.                
+      file.
    </para>
  </section>

  <section>
    <title>Response Files</title>

-    <indexterm><primary>response files</primary></indexterm> 
+    <indexterm><primary>response files</primary></indexterm>

    <para>Some operating system have very low limits of the command line
      length. The common way to work around those limitations is using
@@ -79,7 +79,7 @@ store(command_line_parser(ac, av).options(desc).extra_parser(reg_foo)
    <para>
      First, you need to define an option for the response file:
 <programlisting>
-("response-file", value&lt;string&gt;(), 
+("response-file", value&lt;string&gt;(),
     "can be specified with '@name', too")
 </programlisting>
    </para>
@@ -120,14 +120,14 @@ if (vm.count("response-file")) {
     vector<string> args;
     copy(tok.begin(), tok.end(), back_inserter(args));
     // Parse the file and store the options
-     store(command_line_parser(args).options(desc).run(), vm);     
+     store(command_line_parser(args).options(desc).run(), vm);
 }
 ]]>
 </programlisting>
      The complete example can be found in the "example/response_file.cpp"
-      file.                
+      file.
    </para>
- 
+
  </section>

  <section>
@@ -146,7 +146,7 @@ if (vm.count("response-file")) {
 <programlisting>
 vector&lt;string&gt; args = split_winmain(lpCmdLine);
 store(command_line_parser(args).options(desc).run(), vm);
-</programlisting>      
+</programlisting>
      The <code>split_winmain</code> function is overloaded for <code>wchar_t</code> strings, so can
      also be used in Unicode applications.
    </para>
@@ -223,7 +223,7 @@ visible.add(general).add(gui);
 variables_map vm;
 store(parse_command_line(ac, av, all), vm);

-if (vm.count("help")) 
+if (vm.count("help"))
 {
    cout << visible;
    return 0;
@@ -235,7 +235,7 @@ if (vm.count("help-module")) {
    } else if (s == "backend") {
        cout << backend;
    } else {
-        cout << "Unknown module '" 
+        cout << "Unknown module '"
             << s << "' in the --help-module option\n";
        return 1;
    }
@@ -243,8 +243,8 @@ if (vm.count("help-module")) {
 }
 if (vm.count("num-threads")) {
    cout << "The 'num-threads' options was set to "
-         << vm["num-threads"].as<int>() << "\n";            
-}                           
+         << vm["num-threads"].as<int>() << "\n";
+}
 ]]></programlisting>
      When parsing the command line, all options are allowed. The "--help"
      message, however, does not include the "Backend options" group -- the
@@ -253,7 +253,7 @@ if (vm.count("num-threads")) {
      option. The complete example can be found in the
      "example/option_groups.cpp" file.
    </para>
-  
+
  </section>

  <section>
@@ -276,7 +276,7 @@ public:
 };
 ]]></programlisting> and then overload the <code>validate</code> function:
 <programlisting><![CDATA[
-void validate(boost::any& v, 
+void validate(boost::any& v,
              const std::vector<std::string>& values,
              magic_number* target_type, int)
 {
@@ -290,16 +290,16 @@ void validate(boost::any& v,
    // one string, it's an error, and exception will be thrown.
    const string& s = validators::get_single_string(values);

-    // Do regex match and convert the interesting part to 
+    // Do regex match and convert the interesting part to
    // int.
    smatch match;
    if (regex_match(s, match, r)) {
        v = any(magic_number(lexical_cast<int>(match[1])));
    } else {
        throw validation_error(validation_error::invalid_option_value);
-    }        
+    }
 }
-]]>        
+]]>
 </programlisting>The function takes four parameters. The first is the storage
      for the value, and in this case is either empty or contains an instance of
      the <code>magic_number</code> class. The second is the list of strings
@@ -372,7 +372,7 @@ void validate(boost::any& v,
 locale::global(locale(""));
      </programlisting>
      which would set up the conversion facet according to the user's selected
-      locale. 
+      locale.
    </para>

    <para>It's wise to check the status of the C++ locale support on your
@@ -382,7 +382,7 @@ locale::global(locale(""));
          <para>Go the the "test" directory and build the "test_convert" binary.</para>
        </listitem>
        <listitem>
-          <para>Set some non-ascii locale in the environmemt. On Linux, one can
+          <para>Set some non-ascii locale in the environment. On Linux, one can
          run, for example: <screen>
 $ export LC_CTYPE=ru_RU.KOI8-R
 </screen>
@@ -402,37 +402,89 @@ $ export LC_CTYPE=ru_RU.KOI8-R
    <section>
      <title>Allowing Unknown Options</title>

-      <para>Usually, the library throws an exception on unknown option names. This 
-      behaviour can be changed. For example, only some part of your application uses 
+      <para>Usually, the library throws an exception on unknown option names. This
+      behaviour can be changed. For example, only some part of your application uses
      <libraryname>Program_options</libraryname>, and you wish to pass unrecognized options to another part of
      the program, or even to another application.</para>

-      <para>To allow unregistered options on the command line, you need to use 
+      <para>To allow unregistered options on the command line, you need to use
      the &basic_command_line_parser; class for parsing (not &parse_command_line;)
-      and call the <methodname alt="boost::program_options::basic_command_line_parser::allow_unregistered">allow_unregistered</methodname> 
+      and call the <methodname alt="boost::program_options::basic_command_line_parser::allow_unregistered">allow_unregistered</methodname>
      method of that class:
      <programlisting>
-parsed_options parsed = 
-    command_line_parser(argc, argv).options(desc).allow_unregistered().run();      
+parsed_options parsed =
+    command_line_parser(argc, argv).options(desc).allow_unregistered().run();
      </programlisting>
-      
-      For each token that looks like an option, but does not have a known name, 
-      an instance of &basic_option; will be added to the result. 
-      The <code>string_key</code> and <code>value</code> fields of the instance will contain results 
+
+      For each token that looks like an option, but does not have a known name,
+      an instance of &basic_option; will be added to the result.
+      The <code>string_key</code> and <code>value</code> fields of the instance will contain results
      of syntactic parsing of the token, the <code>unregistered</code> field will be set to <code>true</code>,
      and the <code>original_tokens</code> field will contain the token as it appeared on the command line.
      </para>

-      <para>If you want to pass the unrecognized options further, the 
+      <para>If you want to pass the unrecognized options further, the
      <functionname alt="boost::program_options::collect_unrecognized">collect_unrecognized</functionname> function can be used.
      The function will collect original tokens for all unrecognized values, and optionally, all found positional options.
-      Say, if your code handles a few options, but does not handles positional options at all, you can use the function like this:
+      Say, if your code handles a few options, but does not handle positional options at all, you can use the function like this:
      <programlisting>
 vector&lt;string&gt; to_pass_further = collect_unrecognized(parsed.options, include_positional);
      </programlisting>
-      
-      </para>     
-            
+
+      </para>
+
+    </section>
+
+    <section>
+      <title>Testing Option Presence</title>
+
+      <para>Until now we have tested whether an option has been set using the
+      <methodname alt="boost::program_options::variables_map::count">count</methodname> method on the &variables_map;
+      class; as you are repeating the (string literal) name of the option this is prone to typos and/or errors
+      resulting from renaming the option in one place but not the other:
+        <programlisting><![CDATA[
+po::options_description desc("Allowed options");
+desc.add_options()
+    ("compression", po::value<int>(), "set compression level")
+;
+
+po::variables_map vm;
+po::store(po::parse_command_line(ac, av, desc), vm);
+po::notify(vm);
+
+if (vm.count("compression")) {
+    cout << "Compression level was set to "
+ << vm["compression"].as<int>() << ".\n";
+} else {
+    cout << "Compression level was not set.\n";
+}
+]]>
+        </programlisting>
+      </para>
+
+      <para>Instead, you can use a variable of type <classname alt="boost::optional">boost::optional</classname>;
+      <libraryname>Program_options</libraryname> provides special support for <libraryname>Boost.Optional</libraryname>
+      such that if the user specifies the option the <classname alt="boost::optional">boost::optional</classname>
+      variable will be initialized to the appropriate value:
+        <programlisting><![CDATA[
+po::options_description desc("Allowed options");
+boost::optional<int> compression;
+desc.add_options()
+    ("compression", po::value(&compression), "set compression level")
+;
+
+po::variables_map vm;
+po::store(po::parse_command_line(ac, av, desc), vm);
+po::notify(vm);
+
+if (compression) {
+    cout << "Compression level was set to " << *compression << ".\n";
+} else {
+    cout << "Compression level was not set.\n";
+}
+]]>
+        </programlisting>
+      </para>
    </section>

 </section>
--- a/doc/overview.xml
+++ b/doc/overview.xml
@@ -22,7 +22,7 @@
      </listitem>
      <listitem>
        <para>The parsers component, which uses this information to find option names
-          and values in the input sources and return them. 
+          and values in the input sources and return them.
        </para>
      </listitem>
      <listitem>
@@ -72,10 +72,10 @@
        </para>
      </listitem>
      <listitem>
-        <para>The storage component is focused on storing options values. It 
+        <para>The storage component is focused on storing options values. It
        </para>
      </listitem>
-  
+

    </itemizedlist>

@@ -105,7 +105,7 @@ desc.add_options()
    ("help", "produce help")
    ("optimization", value&lt;int&gt;()->default_value(10), "optimization level")
    ;
-</programlisting>      
+</programlisting>
    </para>

    <para>The call to the <code>value</code> function creates an instance of
@@ -116,14 +116,14 @@ desc.add_options()
      essentially emulates named parameters of the constructor.) Calls to
      <code>operator()</code> on the object returned by <code>add_options</code>
      forward arguments to the constructor of the <code>option_description</code>
-      class and add the new instance. 
+      class and add the new instance.
    </para>

    <para>
      Note that in addition to the
      <code>value</code>, library provides the <code>bool_switch</code>
      function, and user can write his own function which will return
-      other subclasses of <code>value_semantic</code> with 
+      other subclasses of <code>value_semantic</code> with
      different behaviour. For the remainder of this section, we'll talk only
      about the <code>value</code> function.
    </para>
@@ -135,7 +135,7 @@ desc.add_options()
      where value is just a vector of strings
      (<code>std::vector&lt;std::string&gt;</code>). The semantic layer
      is responsible for converting the value of the option into more usable C++
-      types. 
+      types.
    </para>

    <para>This separation is an important part of library design. The parsers
@@ -153,7 +153,7 @@ desc.add_options()
        <classname>boost::program_options::options_description</classname> class
        and some methods of the
        <classname>boost::program_options::value_semantic</classname> class
-        and includes:        
+        and includes:
        <itemizedlist>
          <listitem>
            <para>
@@ -193,7 +193,7 @@ desc.add_options()
      span several tokens. For example, the following command line is OK:
      <screen>
          test --help --compression 10 --verbose --email beadle@mars beadle2@mars
-      </screen>      
+      </screen>
      </para>

      <section>
@@ -208,18 +208,18 @@ desc.add_options()
        <para>The description string has one or more paragraphs, separated by
        the newline character ('\n'). When an option is output, the library
        will compute the indentation for options's description. Each of the
-        paragraph is output as a separate line with that intentation. If 
+        paragraph is output as a separate line with that intentation. If
        a paragraph does not fit on one line it is spanned over multiple
        lines (which will have the same indentation).
        </para>

        <para>You may specify additional indent for the first specified by
-        inserting spaces at the beginning of a paragraph. For example: 
+        inserting spaces at the beginning of a paragraph. For example:
        <programlisting>
 options.add_options()
    ("help", "   A long help msg a long help msg a long help msg a long help
 msg a long help msg a long help msg a long help msg a long help msg ")
-    ;  
+    ;
        </programlisting>
        will specify a four-space indent for the first line. The output will
        look like:
@@ -230,14 +230,14 @@ msg a long help msg a long help msg a long help msg a long help msg ")
                        help msg a long help msg
                        a long help msg a long
                        help msg
-          
+
        </screen>
        </para>

        <para>For the case where line is wrapped, you can want an additional
        indent for wrapped text. This can be done by
        inserting a tabulator character ('\t') at the desired position. For
-        example: 
+        example:
        <programlisting>
 options.add_options()
      ("well_formated", "As you can see this is a very well formatted
@@ -249,7 +249,7 @@ bla bla bla bla bla bla bla bla bla bla bla\n"
                        "  Value2: \tdoes something else, bla bla bla bla
 bla bla bla bla bla bla bla bla bla bla bla\n\n"
                        "    This paragraph has a first line indent only,
-bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla");          
+bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla");
        </programlisting>
        will produce:
        <screen>
@@ -280,20 +280,20 @@ bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla");
                        bla bla bla
        </screen>
        The tab character is removed before output. Only one tabulator per
-        paragraph is allowed, otherwisee an exception of type
+        paragraph is allowed, otherwise an exception of type
        program_options::error is thrown. Finally, the tabulator is ignored if
-        it's is not on the first line of the paragraph or is on the last
+        it is not on the first line of the paragraph or is on the last
        possible position of the first line.
        </para>

      </section>

    </section>
-      
+
    <section>
      <title>Semantic Information</title>
-      
-      <para>The semantic information is completely provided by the 
+
+      <para>The semantic information is completely provided by the
        <classname>boost::program_options::value_semantic</classname> class. For
        example:
 <programlisting>
@@ -303,18 +303,18 @@ desc.add_options()
    ("email", value&lt; vector&lt;string&gt; &gt;()
        ->composing()->notifier(&amp;your_function), "email")
    ;
-</programlisting>      
+</programlisting>
        These declarations specify that default value of the first option is 10,
        that the second option can appear several times and all instances should
        be merged, and that after parsing is done, the library will  call
        function <code>&amp;your_function</code>, passing the value of the
-        "email" option as argument.      
+        "email" option as argument.
      </para>
    </section>
-    
+
    <section>
      <title>Positional Options</title>
-      
+
      <para>Our definition of option as (name, value) pairs is simple and
        useful, but in one special case of the command line, there's a
        problem. A command line can include a <firstterm>positional option</firstterm>,
@@ -324,7 +324,7 @@ desc.add_options()
        </screen>
        Here, the "/etc/passwd" element does not have any option name.
      </para>
-      
+
      <para>One solution is to ask the user to extract positional options
        himself and process them as he likes. However, there's a nicer approach
        -- provide a method to automatically assign the names for positional
@@ -334,7 +334,7 @@ desc.add_options()
          archiver --compression=9 --input-file=/etc/passwd
        </screen>
      </para>
-      
+
      <para>The &positional_options_desc; class allows the command line
        parser to assign the names. The class specifies how many positional options
        are allowed, and for each allowed option, specifies the name. For example:
@@ -343,7 +343,7 @@ positional_options_description pd; pd.add("input-file", 1);
 </programlisting> specifies that for exactly one, first, positional
        option the name will be "input-file".
      </para>
-      
+
      <para>It's possible to specify that a number, or even all positional options, be
        given the same name.
 <programlisting>
@@ -360,11 +360,11 @@ pd.add("output-file", 2).add("input-file", -1);
      an instance of the &options_description; class.</para>
    </warning>

-      
+
    </section>
-              
+
    <!-- Note that the classes are not modified during parsing -->
-          
+
  </section>

  <section>
@@ -390,7 +390,7 @@ pd.add("output-file", 2).add("input-file", -1);
      The results of parsing are returned as an instance of the &parsed_options;
      class. Typically, that object is passed directly to the storage
      component. However, it also can be used directly, or undergo some additional
-      processing. 
+      processing.
    </para>

    <para>
@@ -422,8 +422,8 @@ pd.add("output-file", 2).add("input-file", -1);
          </para>
        </listitem>
      </itemizedlist>
-    </para>      
-    
+    </para>
+
  </section>


@@ -512,7 +512,7 @@ visual_bell=yes
      <screen>
 gui.accessibility.visual_bell=yes
      </screen>
-                  
+
    </section>

    <section>
@@ -538,7 +538,7 @@ gui.accessibility.visual_bell=yes
      what option names must correspond to it. To describe the second
      parameter we need to consider naming conventions for environment
      variables.</para>
-      
+
      <para>If you have an option that should be specified via environment
      variable, you need make up the variable's name. To avoid name clashes,
      we suggest that you use a sufficiently unique prefix for environment
@@ -551,9 +551,9 @@ gui.accessibility.visual_bell=yes
      Say, if you pass <literal>BOOST_</literal> as the prefix, and there are
      two variables, <envar>CVSROOT</envar> and <envar>BOOST_PROXY</envar>, the
      first variable will be ignored, and the second one will be converted to
-      option <literal>proxy</literal>. 
+      option <literal>proxy</literal>.
      </para>
-      
+
      <para>The above logic is sufficient in many cases, but it is also
      possible to pass, as the second parameter of the &parse_environment;
      function, any function taking a <code>std::string</code> and returning
@@ -561,35 +561,35 @@ gui.accessibility.visual_bell=yes
      environment variable and should return either the name of the option, or
      empty string if the variable should be ignored.
      </para>
-            
+
    </section>
  </section>

  <section>
    <title>Annotated List of Symbols</title>
-    
+
    <para>The following table describes all the important symbols in the
      library, for quick access.</para>
-    
+
    <informaltable pgwide="1">
-        
+
      <tgroup cols="2">
        <colspec colname='c1'/>
        <colspec colname='c2'/>
        <thead>
-          
-          <row>            
+
+          <row>
            <entry>Symbol</entry>
            <entry>Description</entry>
          </row>
        </thead>
-        
+
        <tbody>
-          
-          <row>            
+
+          <row>
            <entry namest='c1' nameend='c2'>Options description component</entry>
          </row>
-          
+
          <row>
            <entry>&options_description;</entry>
            <entry>describes a number of options</entry>
@@ -599,10 +599,10 @@ gui.accessibility.visual_bell=yes
            <entry>defines the option's value</entry>
          </row>

-          <row>            
+          <row>
            <entry namest='c1' nameend='c2'>Parsers component</entry>
          </row>
-          
+
          <row>
            <entry>&parse_command_line;</entry>
            <entry>parses command line (simpified interface)</entry>
@@ -624,7 +624,7 @@ gui.accessibility.visual_bell=yes
            <entry>parses environment</entry>
          </row>

-          <row>            
+          <row>
            <entry namest='c1' nameend='c2'>Storage component</entry>
          </row>

@@ -632,20 +632,20 @@ gui.accessibility.visual_bell=yes
            <entry>&variables_map;</entry>
            <entry>storage for option values</entry>
          </row>
-   
+
        </tbody>
      </tgroup>
-      
+
    </informaltable>
-    
+
  </section>
-  
+
 </section>

 <!--
     Local Variables:
     mode: nxml
-     sgml-indent-data: t     
+     sgml-indent-data: t
     sgml-parent-document: ("program_options.xml" "section")
     sgml-set-face: t
     End:
--- a/doc/post_review_plan.txt
+++ b/doc/post_review_plan.txt
@@ -178,5 +178,4 @@
        
 12. Deferred 

-   - storing value to boost::optional 
   - setting a flag when option is found 
--- a/doc/rationale
+++ b/doc/rationale
@@ -4,12 +4,12 @@ implement generic composition classes. The former was choosen,
 mostly because of simplicity.

 There were two implementation approaches for multiple option
-occurences in options_and_arguments. First is store them
+occurrences in options_and_arguments. First is store them
 separately. The advantage is that it's easy to obtain all
-occurences before certain position on command line. The
+occurrences before certain position on command line. The
 disadvantage is that we cannot return a reference to 
 vector<vector<string> > in get_all_values. It was considered
 that if support for position-dependent options is to be
-added, then we're be mostly interested in occurences of 
+added, then we're be mostly interested in occurrences of
 a single option that were before some point. That's possible
-with vector<vector<string> > storage.
+with vector<vector<string> > storage.
--- a/doc/rationale.dox
+++ b/doc/rationale.dox
@@ -81,7 +81,7 @@

    @section help_handling Handling of --help

-    It was suggested by Gennadiy Rozental that occurence of <tt>--help</tt>
+    It was suggested by Gennadiy Rozental that occurrence of <tt>--help</tt>
    on command line results in throwing an exception. Actually, the 
    &quot;special&quot; option must have been configurable. This was not 
    implemented, because applications might reasonable want to process
--- a/example/option_groups.cpp
+++ b/example/option_groups.cpp
@@ -29,9 +29,9 @@ using namespace boost::program_options;

 #include <iostream>
 #include <fstream>
+#include <exception>
 using namespace std;

-
 int main(int ac, char* av[])
 {
    try {
@@ -39,7 +39,7 @@ int main(int ac, char* av[])
        options_description general("General options");
        general.add_options()
            ("help", "produce a help message")
-            ("help-module", value<string>()->implicit(),
+            ("help-module", value<string>(),
                "produce a help for a given module")
            ("version", "output the version number")
            ;
@@ -91,7 +91,7 @@ int main(int ac, char* av[])
                 << vm["num-threads"].as<int>() << "\n";            
        }                           
    }
-    catch(exception& e) {
+    catch(std::exception& e) {
        cout << e.what() << "\n";
    }
 }
--- a/example/options_description.cpp
+++ b/example/options_description.cpp
@@ -18,7 +18,7 @@ using namespace std;
 template<class T>
 ostream& operator<<(ostream& os, const vector<T>& v)
 {
-    copy(v.begin(), v.end(), ostream_iterator<T>(os, " ")); 
+    copy(v.begin(), v.end(), ostream_iterator<T>(os, " "));
    return os;
 }

@@ -30,26 +30,26 @@ int main(int ac, char* av[])
        po::options_description desc("Allowed options");
        desc.add_options()
            ("help", "produce help message")
-            ("optimization", po::value<int>(&opt)->default_value(10), 
+            ("optimization", po::value<int>(&opt)->default_value(10),
                  "optimization level")
            ("verbose,v", po::value<int>()->implicit_value(1),
                  "enable verbosity (optionally specify level)")
            ("listen,l", po::value<int>(&portnum)->implicit_value(1001)
                  ->default_value(0,"no"),
                  "listen on a port.")
-            ("include-path,I", po::value< vector<string> >(), 
+            ("include-path,I", po::value< vector<string> >(),
                  "include path")
            ("input-file", po::value< vector<string> >(), "input file")
        ;

        po::positional_options_description p;
        p.add("input-file", -1);
-        
+
        po::variables_map vm;
        po::store(po::command_line_parser(ac, av).
                  options(desc).positional(p).run(), vm);
        po::notify(vm);
-    
+
        if (vm.count("help")) {
            cout << "Usage: options_description [options]\n";
            cout << desc;
@@ -58,13 +58,13 @@ int main(int ac, char* av[])

        if (vm.count("include-path"))
        {
-            cout << "Include paths are: " 
+            cout << "Include paths are: "
                 << vm["include-path"].as< vector<string> >() << "\n";
        }

        if (vm.count("input-file"))
        {
-            cout << "Input files are: " 
+            cout << "Input files are: "
                 << vm["input-file"].as< vector<string> >() << "\n";
        }

@@ -73,14 +73,14 @@ int main(int ac, char* av[])
                 << "\n";
        }

-        cout << "Optimization level is " << opt << "\n";                
+        cout << "Optimization level is " << opt << "\n";

-        cout << "Listen port is " << portnum << "\n";                
+        cout << "Listen port is " << portnum << "\n";
    }
    catch(std::exception& e)
    {
        cout << e.what() << "\n";
        return 1;
-    }    
+    }
    return 0;
 }
--- a/include/boost/program_options/detail/cmdline.hpp
+++ b/include/boost/program_options/detail/cmdline.hpp
@@ -136,7 +136,7 @@ namespace boost { namespace program_options { namespace detail {
                      const std::vector<style_parser>& style_parsers);

        // Copies of input.
-        std::vector<std::string> args;
+        std::vector<std::string> m_args;
        style_t m_style;
        bool m_allow_unregistered;

--- a/include/boost/program_options/detail/config_file.hpp
+++ b/include/boost/program_options/detail/config_file.hpp
@@ -27,6 +27,11 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/shared_ptr.hpp>

+#ifdef BOOST_MSVC
+# pragma warning(push)
+# pragma warning(disable: 4251) // class XYZ needs to have dll-interface to be used by clients of class XYZ
+#endif
+


 namespace boost { namespace program_options { namespace detail {
@@ -62,7 +67,7 @@ namespace boost { namespace program_options { namespace detail {
         TODO: maybe, we should just accept a pointer to options_description
         class.
     */    
-    class common_config_file_iterator 
+    class BOOST_PROGRAM_OPTIONS_DECL common_config_file_iterator
        : public eof_iterator<common_config_file_iterator, option>
    {
    public:
@@ -77,6 +82,11 @@ namespace boost { namespace program_options { namespace detail {
        
        void get();
        
+#if BOOST_WORKAROUND(_MSC_VER, <= 1900)
+        void decrement() {}
+        void advance(difference_type) {}
+#endif
+
    protected: // Stubs for derived classes

        // Obtains next line from the config file
@@ -177,4 +187,8 @@ namespace boost { namespace program_options { namespace detail {

 }}}

+#ifdef BOOST_MSVC
+# pragma warning(pop)
+#endif
+
 #endif
--- a/include/boost/program_options/detail/parsers.hpp
+++ b/include/boost/program_options/detail/parsers.hpp
@@ -12,20 +12,6 @@

 namespace boost { namespace program_options {

-    namespace detail {
-        template<class charT, class Iterator>
-        std::vector<std::basic_string<charT> > 
-        make_vector(Iterator i, Iterator e)
-        {
-            std::vector<std::basic_string<charT> > result;
-            // Some compilers don't have templated constructor for 
-            // vector, so we can't create vector from (argv+1, argv+argc) range
-            for(; i != e; ++i)
-                result.push_back(*i);
-            return result;            
-        }
-    }
-
    template<class charT>
    basic_command_line_parser<charT>::
    basic_command_line_parser(const std::vector<
@@ -38,9 +24,8 @@ namespace boost { namespace program_options {
    basic_command_line_parser<charT>::
    basic_command_line_parser(int argc, const charT* const argv[])
    : detail::cmdline(
-        // Explicit template arguments are required by gcc 3.3.1 
-        // (at least mingw version), and do no harm on other compilers.
-        to_internal(detail::make_vector<charT, const charT* const*>(argv+1, argv+argc+!argc)))
+        to_internal(std::vector<std::basic_string<charT> >(argv+1, argv+argc))),
+        m_desc()
    {}

    
@@ -48,7 +33,7 @@ namespace boost { namespace program_options {
    basic_command_line_parser<charT>& 
    basic_command_line_parser<charT>::options(const options_description& desc)
    {
-       detail::cmdline::set_options_description(desc);
+        detail::cmdline::set_options_description(desc);
        m_desc = &desc;
        return *this;
    }
--- a/include/boost/program_options/detail/value_semantic.hpp
+++ b/include/boost/program_options/detail/value_semantic.hpp
@@ -8,6 +8,9 @@

 #include <boost/throw_exception.hpp>

+// forward declaration
+namespace boost { template<class T> class optional; }
+
 namespace boost { namespace program_options { 

    extern BOOST_PROGRAM_OPTIONS_DECL std::string arg;
@@ -152,6 +155,20 @@ namespace boost { namespace program_options {
        }
    }

+    /** Validates optional arguments. */
+    template<class T, class charT>
+    void validate(boost::any& v,
+                  const std::vector<std::basic_string<charT> >& s,
+                  boost::optional<T>*,
+                  int)
+    {
+        validators::check_first_occurrence(v);
+        validators::get_single_string(s);
+        boost::any a;
+        validate(a, s, (T*)0, 0);
+        v = boost::any(boost::optional<T>(boost::any_cast<T>(a)));
+    }
+
    template<class T, class charT>
    void 
    typed_value<T, charT>::
--- a/include/boost/program_options/environment_iterator.hpp
+++ b/include/boost/program_options/environment_iterator.hpp
@@ -40,8 +40,9 @@ namespace boost {
                assert(n != s.npos);
                value().first = s.substr(0, n);
                value().second = s.substr(n+1);
-            }            
-            ++m_environment;
+                
+                ++m_environment;
+            }
        }
        
    private:
--- a/include/boost/program_options/eof_iterator.hpp
+++ b/include/boost/program_options/eof_iterator.hpp
@@ -10,17 +10,17 @@

 namespace boost {

-    /** The 'eof_iterator' class is useful for constructing forward iterators 
-        in cases where iterator extract data from some source and it's easy 
-        to detect 'eof' -- i.e. the situation where there's no data. One 
+    /** The 'eof_iterator' class is useful for constructing forward iterators
+        in cases where iterator extract data from some source and it's easy
+        to detect 'eof' \-- i.e. the situation where there's no data. One
        apparent example is reading lines from a file.
-        
+
        Implementing such iterators using 'iterator_facade' directly would
-        require to create class with three core operation, a couple of 
-        constructors. When using 'eof_iterator', the derived class should define 
+        require to create class with three core operation, a couple of
+        constructors. When using 'eof_iterator', the derived class should define
        only one method to get new value, plus a couple of constructors.

-        The basic idea is that iterator has 'eof' bit. Two iterators are equal 
+        The basic idea is that iterator has 'eof' bit. Two iterators are equal
        only if both have their 'eof' bits set. The 'get' method either obtains
        the new value or sets the 'eof' bit.

@@ -33,13 +33,13 @@ namespace boost {
        3. The 'get' method. It should operate this way:
            - look at some 'data pointer' to see if new element is available;
              if not, it should call 'found_eof'.
-            - extract new element and store it at location returned by the 'value' 
+            - extract new element and store it at location returned by the 'value'
               method.
            - advance the data pointer.

-        Essentially, the 'get' method has the functionality of both 'increment' 
-        and 'dereference'. It's very good for the cases where data extraction 
-        implicitly moves data pointer, like for stream operation.         
+        Essentially, the 'get' method has the functionality of both 'increment'
+        and 'dereference'. It's very good for the cases where data extraction
+        implicitly moves data pointer, like for stream operation.
    */
    template<class Derived, class ValueType>
    class eof_iterator : public iterator_facade<Derived, const ValueType,
@@ -65,16 +65,20 @@ namespace boost {
        {
            m_at_eof = true;
        }
-        
+

    private: // iterator core operations
-        friend class iterator_core_access;
-    
-        void increment() 
+#ifdef __DCC__ 
+        friend class boost::iterator_core_access; 
+#else 
+        friend class iterator_core_access; 	 
+#endif
+
+        void increment()
        {
            static_cast<Derived&>(*this).get();
        }
-    
+
        bool equal(const eof_iterator& other) const
        {
            if (m_at_eof && other.m_at_eof)
@@ -82,14 +86,14 @@ namespace boost {
            else
                return false;
        }
-        
+
        const ValueType& dereference() const
        {
            return m_value;
        }

        bool m_at_eof;
-        ValueType m_value;        
+        ValueType m_value;
    };
 }

--- a/include/boost/program_options/errors.hpp
+++ b/include/boost/program_options/errors.hpp
@@ -26,7 +26,12 @@ namespace boost { namespace program_options {
    inline std::string strip_prefixes(const std::string& text)
    {
        // "--foo-bar" -> "foo-bar"
-        return text.substr(text.find_first_not_of("-/"));
+        std::string::size_type i = text.find_first_not_of("-/");
+        if (i == std::string::npos) {
+            return text;
+        } else {
+            return text.substr(i);
+        }
    }

    /** Base class for all errors in the library. */
@@ -169,7 +174,7 @@ namespace boost { namespace program_options {
        virtual void set_option_name(const std::string& option_name)
        {           set_substitute("option", option_name);}

-        std::string get_option_name() const throw()
+        std::string get_option_name() const
        {           return get_canonical_option_name();         }

        void set_original_token(const std::string& original_token)
--- a/include/boost/program_options/option.hpp
+++ b/include/boost/program_options/option.hpp
@@ -15,7 +15,7 @@ namespace boost { namespace program_options {

    /** Option found in input source.
        Contains a key and a value. The key, in turn, can be a string (name of
-        an option), or an integer (position in input source) -- in case no name
+        an option), or an integer (position in input source) \-- in case no name
        is specified. The latter is only possible for command line.
        The template parameter specifies the type of char used for storing the
        option's value.
@@ -31,6 +31,7 @@ namespace boost { namespace program_options {
        basic_option(const std::string& xstring_key, 
               const std::vector< std::string> &xvalue)
        : string_key(xstring_key)
+        , position_key(-1)
        , value(xvalue)
        , unregistered(false)
        , case_insensitive(false)
--- a/include/boost/program_options/options_description.hpp
+++ b/include/boost/program_options/options_description.hpp
@@ -41,7 +41,7 @@ namespace program_options {
        are used only to validate input. Second affect interpretation of the
        option, for example default value for it or function that should be
        called  when the value is finally known. Routines which perform parsing
-        never use second kind of properties -- they are side effect free.
+        never use second kind of properties \-- they are side effect free.
        @sa options_description
    */
    class BOOST_PROGRAM_OPTIONS_DECL option_description {
@@ -71,7 +71,7 @@ namespace program_options {
            The 'name' parameter is interpreted by the following rules:
            - if there's no "," character in 'name', it specifies long name
            - otherwise, the part before "," specifies long name and the part
-            after -- short name.
+            after \-- short name.
        */
        option_description(const char* name,
                           const value_semantic* s);
@@ -236,6 +236,11 @@ namespace program_options {
        void print(std::ostream& os, unsigned width = 0) const;

    private:
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800))
+        // prevent warning C4512: assignment operator could not be generated
+        options_description& operator=(const options_description&);
+#endif
+
        typedef std::map<std::string, int>::const_iterator name2index_iterator;
        typedef std::pair<name2index_iterator, name2index_iterator> 
            approximation_range;
--- a/include/boost/program_options/parsers.hpp
+++ b/include/boost/program_options/parsers.hpp
@@ -28,20 +28,20 @@ namespace boost { namespace program_options {
    class positional_options_description;


-    /** Results of parsing an input source. 
-        The primary use of this class is passing information from parsers 
+    /** Results of parsing an input source.
+        The primary use of this class is passing information from parsers
        component to value storage component. This class does not makes
-        much sense itself.        
+        much sense itself.
    */
    template<class charT>
    class basic_parsed_options {
    public:
-        explicit basic_parsed_options(const options_description* xdescription, int options_prefix = 0) 
+        explicit basic_parsed_options(const options_description* xdescription, int options_prefix = 0)
        : description(xdescription), m_options_prefix(options_prefix) {}
        /** Options found in the source. */
        std::vector< basic_option<charT> > options;
-        /** Options description that was used for parsing. 
-            Parsers should return pointer to the instance of 
+        /** Options description that was used for parsing.
+            Parsers should return pointer to the instance of
            option_description passed to them, and issues of lifetime are
            up to the caller. Can be NULL.
         */
@@ -55,7 +55,7 @@ namespace boost { namespace program_options {
         *      allow_long_disguise
         *      allow_dash_for_short
         *      allow_slash_for_short
-        */ 
+        */
        int m_options_prefix;
    };

@@ -74,7 +74,7 @@ namespace boost { namespace program_options {

        /** Stores UTF8 encoded options that were passed to constructor,
            to avoid reverse conversion in some cases. */
-        basic_parsed_options<char> utf8_encoded_options;        
+        basic_parsed_options<char> utf8_encoded_options;

        /** Mainly used for the diagnostic messages in exceptions.
         *  The canonical option prefix  for the parser which generated these results,
@@ -84,7 +84,7 @@ namespace boost { namespace program_options {
         *      allow_long_disguise
         *      allow_dash_for_short
         *      allow_slash_for_short
-        */ 
+        */
        int m_options_prefix;
    };

@@ -101,14 +101,14 @@ namespace boost { namespace program_options {

        The class allows one to specify all the information needed for parsing
        and to parse the command line. It is primarily needed to
-        emulate named function parameters -- a regular function with 5
+        emulate named function parameters \-- a regular function with 5
        parameters will be hard to use and creating overloads with a smaller
-        nuber of parameters will be confusing.
+        number of parameters will be confusing.

-        For the most common case, the function parse_command_line is a better 
-        alternative.        
+        For the most common case, the function parse_command_line is a better
+        alternative.

-        There are two typedefs -- command_line_parser and wcommand_line_parser,
+        There are two typedefs \-- command_line_parser and wcommand_line_parser,
        for charT == char and charT == wchar_t cases.
    */
    template<class charT>
@@ -146,10 +146,10 @@ namespace boost { namespace program_options {
            instance of basic_option<charT> will be added to result,
            with 'unrecognized' field set to 'true'. It's possible to
            collect all unrecognized options with the 'collect_unrecognized'
-            funciton. 
+            funciton.
        */
        basic_command_line_parser& allow_unregistered();
-        
+
        using detail::cmdline::style_parser;

        basic_command_line_parser& extra_style_parser(style_parser s);
@@ -162,19 +162,19 @@ namespace boost { namespace program_options {
    typedef basic_command_line_parser<wchar_t> wcommand_line_parser;

    /** Creates instance of 'command_line_parser', passes parameters to it,
-        and returns the result of calling the 'run' method.        
+        and returns the result of calling the 'run' method.
     */
    template<class charT>
    basic_parsed_options<charT>
    parse_command_line(int argc, const charT* const argv[],
                       const options_description&,
                       int style = 0,
-                       function1<std::pair<std::string, std::string>, 
+                       function1<std::pair<std::string, std::string>,
                                 const std::string&> ext
                       = ext_parser());

-    /** Parse a config file. 
-    
+    /** Parse a config file.
+
        Read from given stream.
    */
    template<class charT>
@@ -185,10 +185,10 @@ namespace boost { namespace program_options {
    parse_config_file(std::basic_istream<charT>&, const options_description&,
                      bool allow_unregistered = false);

-    /** Parse a config file. 
-    
+    /** Parse a config file.
+
        Read from file with the given name. The character type is
-        passed to the file stream. 
+        passed to the file stream.
    */
    template<class charT>
 #if ! BOOST_WORKAROUND(__ICL, BOOST_TESTED_AT(700))
@@ -200,7 +200,7 @@ namespace boost { namespace program_options {

    /** Controls if the 'collect_unregistered' function should
        include positional options, or not. */
-    enum collect_unrecognized_mode 
+    enum collect_unrecognized_mode
    { include_positional, exclude_positional };

    /** Collects the original tokens for all named options with
@@ -210,34 +210,34 @@ namespace boost { namespace program_options {
        options.
    */
    template<class charT>
-    std::vector< std::basic_string<charT> > 
+    std::vector< std::basic_string<charT> >
    collect_unrecognized(const std::vector< basic_option<charT> >& options,
                         enum collect_unrecognized_mode mode);

-    /** Parse environment. 
+    /** Parse environment.

        For each environment variable, the 'name_mapper' function is called to
-        obtain the option name. If it returns empty string, the variable is 
-        ignored. 
+        obtain the option name. If it returns empty string, the variable is
+        ignored.

-        This is done since naming of environment variables is typically 
-        different from the naming of command line options.        
+        This is done since naming of environment variables is typically
+        different from the naming of command line options.
    */
    BOOST_PROGRAM_OPTIONS_DECL parsed_options
-    parse_environment(const options_description&, 
+    parse_environment(const options_description&,
                      const function1<std::string, std::string>& name_mapper);

    /** Parse environment.

        Takes all environment variables which start with 'prefix'. The option
-        name is obtained from variable name by removing the prefix and 
+        name is obtained from variable name by removing the prefix and
        converting the remaining string into lower case.
    */
    BOOST_PROGRAM_OPTIONS_DECL parsed_options
    parse_environment(const options_description&, const std::string& prefix);

    /** @overload
-        This function exists to resolve ambiguity between the two above 
+        This function exists to resolve ambiguity between the two above
        functions when second argument is of 'char*' type. There's implicit
        conversion to both function1 and string.
    */
@@ -252,13 +252,13 @@ namespace boost { namespace program_options {
        and escape characters '\'
    */
    BOOST_PROGRAM_OPTIONS_DECL std::vector<std::string>
-    split_unix(const std::string& cmdline, const std::string& seperator = " \t", 
+    split_unix(const std::string& cmdline, const std::string& seperator = " \t",
         const std::string& quote = "'\"", const std::string& escape = "\\");
-         
+
 #ifndef BOOST_NO_STD_WSTRING
    /** @overload */
    BOOST_PROGRAM_OPTIONS_DECL std::vector<std::wstring>
-    split_unix(const std::wstring& cmdline, const std::wstring& seperator = L" \t", 
+    split_unix(const std::wstring& cmdline, const std::wstring& seperator = L" \t",
         const std::wstring& quote = L"'\"", const std::wstring& escape = L"\\");
 #endif

@@ -278,7 +278,7 @@ namespace boost { namespace program_options {
    split_winmain(const std::wstring& cmdline);
    #endif
 #endif
-    
+

 }}

--- a/include/boost/program_options/value_semantic.hpp
+++ b/include/boost/program_options/value_semantic.hpp
@@ -13,10 +13,10 @@
 #include <boost/function/function1.hpp>
 #include <boost/lexical_cast.hpp>

-
 #include <string>
 #include <vector>
 #include <typeinfo>
+#include <limits>

 namespace boost { namespace program_options {

@@ -156,6 +156,7 @@ namespace boost { namespace program_options {
        bool m_zero_tokens;
    };

+#ifndef BOOST_NO_RTTI
    /** Base class for all option that have a fixed type, and are
        willing to announce this type to the outside world.
        Any 'value_semantics' for which you want to find out the
@@ -172,20 +173,23 @@ namespace boost { namespace program_options {
        // class is silly, but just in case.
        virtual ~typed_value_base() {}
    };
+#endif


    /** Class which handles value of a specific type. */
    template<class T, class charT = char>
-    class typed_value : public value_semantic_codecvt_helper<charT>,
-                        public typed_value_base
+    class typed_value : public value_semantic_codecvt_helper<charT>
+#ifndef BOOST_NO_RTTI
+                      , public typed_value_base
+#endif
    {
    public:
        /** Ctor. The 'store_to' parameter tells where to store
            the value when it's known. The parameter can be NULL. */
        typed_value(T* store_to) 
        : m_store_to(store_to), m_composing(false),
-          m_multitoken(false), m_zero_tokens(false),
-          m_required(false)
+          m_implicit(false), m_multitoken(false),
+          m_zero_tokens(false), m_required(false)
        {} 

        /** Specifies default value, which will be used
@@ -214,10 +218,7 @@ namespace boost { namespace program_options {

        /** Specifies an implicit value, which will be used
            if the option is given, but without an adjacent value.
-            Using this implies that an explicit value is optional, but if
-            given, must be strictly adjacent to the option, i.e.: '-ovalue'
-            or '--option=value'.  Giving '-o' or '--option' will cause the
-            implicit value to be applied.
+            Using this implies that an explicit value is optional,
        */
        typed_value* implicit_value(const T &v)
        {
@@ -313,7 +314,7 @@ namespace boost { namespace program_options {

        unsigned max_tokens() const {
            if (m_multitoken) {
-                return 32000;
+                return std::numeric_limits<unsigned>::max BOOST_PREVENT_MACRO_SUBSTITUTION();
            } else if (m_zero_tokens) {
                return 0;
            } else {
@@ -350,10 +351,12 @@ namespace boost { namespace program_options {

    public: // typed_value_base overrides
        
+#ifndef BOOST_NO_RTTI
        const std::type_info& value_type() const
        {
            return typeid(T);
        }
+#endif
        

    private:
--- a/include/boost/program_options/variables_map.hpp
+++ b/include/boost/program_options/variables_map.hpp
@@ -31,35 +31,35 @@ namespace boost { namespace program_options {

    // forward declaration

-    /** Stores in 'm' all options that are defined in 'options'. 
+    /** Stores in 'm' all options that are defined in 'options'.
        If 'm' already has a non-defaulted value of an option, that value
-        is not changed, even if 'options' specify some value.        
+        is not changed, even if 'options' specify some value.
    */
-    BOOST_PROGRAM_OPTIONS_DECL 
+    BOOST_PROGRAM_OPTIONS_DECL
    void store(const basic_parsed_options<char>& options, variables_map& m,
                    bool utf8 = false);

-    /** Stores in 'm' all options that are defined in 'options'. 
+    /** Stores in 'm' all options that are defined in 'options'.
        If 'm' already has a non-defaulted value of an option, that value
-        is not changed, even if 'options' specify some value.        
+        is not changed, even if 'options' specify some value.
        This is wide character variant.
    */
-    BOOST_PROGRAM_OPTIONS_DECL 
-    void store(const basic_parsed_options<wchar_t>& options, 
+    BOOST_PROGRAM_OPTIONS_DECL
+    void store(const basic_parsed_options<wchar_t>& options,
                    variables_map& m);


    /** Runs all 'notify' function for options in 'm'. */
    BOOST_PROGRAM_OPTIONS_DECL void notify(variables_map& m);

-    /** Class holding value of option. Contains details about how the 
+    /** Class holding value of option. Contains details about how the
        value is set and allows to conveniently obtain the value.
    */
    class BOOST_PROGRAM_OPTIONS_DECL variable_value {
    public:
        variable_value() : m_defaulted(false) {}
-        variable_value(const boost::any& xv, bool xdefaulted) 
-        : v(xv), m_defaulted(xdefaulted) 
+        variable_value(const boost::any& xv, bool xdefaulted)
+        : v(xv), m_defaulted(xdefaulted)
        {}

        /** If stored value if of type T, returns that value. Otherwise,
@@ -95,7 +95,7 @@ namespace boost { namespace program_options {
        shared_ptr<const value_semantic> m_value_semantic;

        friend BOOST_PROGRAM_OPTIONS_DECL
-        void store(const basic_parsed_options<char>& options, 
+        void store(const basic_parsed_options<char>& options,
              variables_map& m, bool);

        friend class BOOST_PROGRAM_OPTIONS_DECL variables_map;
@@ -118,11 +118,11 @@ namespace boost { namespace program_options {
                - otherwise, returns empty value

            - if there's defaulted value
-                - if there's next varaible map, which has a non-defauled
+                - if there's next variable map, which has a non-defaulted
                  value, return that
                - otherwise, return value from *this

-            - if there's a non-defauled value, returns it.
+            - if there's a non-defaulted value, returns it.
        */
        const variable_value& operator[](const std::string& name) const;

@@ -138,8 +138,8 @@ namespace boost { namespace program_options {
        const abstract_variables_map* m_next;
    };

-    /** Concrete variables map which store variables in real map. 
-        
+    /** Concrete variables map which store variables in real map.
+
        This class is derived from std::map<std::string, variable_value>,
        so you can use all map operators to examine its content.
    */
@@ -155,8 +155,8 @@ namespace boost { namespace program_options {
        { return abstract_variables_map::operator[](name); }

        // Override to clear some extra fields.
-        void clear(); 
-        
+        void clear();
+
        void notify();

    private:
@@ -164,15 +164,15 @@ namespace boost { namespace program_options {
            which does 'find' in *this. */
        const variable_value& get(const std::string& name) const;

-        /** Names of option with 'final' values -- which should not
+        /** Names of option with 'final' values \-- which should not
            be changed by subsequence assignments. */
        std::set<std::string> m_final;

        friend BOOST_PROGRAM_OPTIONS_DECL
-        void store(const basic_parsed_options<char>& options, 
+        void store(const basic_parsed_options<char>& options,
                          variables_map& xm,
                          bool utf8);
-        
+
        /** Names of required options, filled by parser which has
            access to options_description.
            The map values are the "canonical" names for each corresponding option.
--- a/include/boost/program_options/version.hpp
+++ b/include/boost/program_options/version.hpp
@@ -15,5 +15,8 @@
 #endif
 #define BOOST_PROGRAM_OPTIONS_VERSION 2

+// Signal that implicit options will use values from next
+// token, if available.
+#define BOOST_PROGRAM_OPTIONS_IMPLICIT_VALUE_NEXT_TOKEN 1

 #endif
--- a/meta/libraries.json
+++ b/meta/libraries.json
@@ -0,0 +1,15 @@
+{
+    "key": "program_options",
+    "name": "Program Options",
+    "authors": [
+        "Vladimir Prus"
+    ],
+    "description": "The program_options library allows program developers to obtain program options, that is (name, value) pairs from the user, via conventional methods such as command line and config file.",
+    "category": [
+        "IO",
+        "Miscellaneous"
+    ],
+    "maintainers": [
+        "Vladimir Prus <vladimir.prus -at- gmail.com>"
+    ]
+}
--- a/src/cmdline.cpp
+++ b/src/cmdline.cpp
@@ -103,7 +103,7 @@ namespace boost { namespace program_options { namespace detail {
    void
    cmdline::init(const vector<string>& args)
    {
-        this->args = args;        
+        this->m_args = args;        
        m_style = command_line_style::default_style;
        m_desc = 0;
        m_positional = 0;
@@ -244,6 +244,7 @@ namespace boost { namespace program_options { namespace detail {
        style_parsers.push_back(boost::bind(&cmdline::parse_terminator, this, _1));

        vector<option> result;
+        vector<string>& args = m_args;
        while(!args.empty())
        {
            bool ok = false;
@@ -434,9 +435,6 @@ namespace boost { namespace program_options { namespace detail {
            // (the value in --foo=1) counts as a separate token, and if present
            // must be consumed. The following tokens on the command line may be
            // left unconsumed.
-
-            // We don't check if those tokens look like option, or not!
-
            unsigned min_tokens = d.semantic()->min_tokens();
            unsigned max_tokens = d.semantic()->max_tokens();
            
@@ -450,9 +448,8 @@ namespace boost { namespace program_options { namespace detail {
                        invalid_command_line_syntax(invalid_command_line_syntax::extra_parameter));
                }
                
-                // If an option wants, at minimum, N tokens, we grab them there,
-                // when adding these tokens as values to current option we check
-                // if they look like options
+                // Grab min_tokens values from other_tokens, but only if those tokens
+                // are not recognized as options themselves.
                if (opt.value.size() <= min_tokens) 
                {
                    min_tokens -= static_cast<unsigned>(opt.value.size());
@@ -462,7 +459,7 @@ namespace boost { namespace program_options { namespace detail {
                    min_tokens = 0;
                }

-                // Everything's OK, move the values to the result.            
+                // Everything's OK, move the values to the result.
                for(;!other_tokens.empty() && min_tokens--; ) 
                {
                    // check if extra parameter looks like a known option
--- a/src/options_description.cpp
+++ b/src/options_description.cpp
@@ -8,7 +8,7 @@
 #define BOOST_PROGRAM_OPTIONS_SOURCE
 #include <boost/program_options/config.hpp>
 #include <boost/program_options/options_description.hpp>
-// FIXME: this is only to get multiple_occurences class
+// FIXME: this is only to get multiple_occurrences class
 // should move that to a separate headers.
 #include <boost/program_options/parsers.hpp>

--- a/src/parsers.cpp
+++ b/src/parsers.cpp
@@ -152,7 +152,16 @@ namespace boost { namespace program_options {
        {
            boost::throw_exception(reading_file(filename));
        }
-        return parse_config_file(strm, desc, allow_unregistered);
+
+        basic_parsed_options<charT> result
+                = parse_config_file(strm, desc, allow_unregistered);
+
+        if (strm.bad())
+        {
+            boost::throw_exception(reading_file(filename));
+        }
+
+        return result;
    }

    template
@@ -220,7 +229,7 @@ namespace boost { namespace program_options {
                    {   
                        // Intel-Win-7.1 does not understand
            // push_back on string.         
-                        result += tolower(s[n]);
+                        result += static_cast<char>(tolower(s[n]));
                    }
                }
                return result;
--- a/src/value_semantic.cpp
+++ b/src/value_semantic.cpp
@@ -268,7 +268,7 @@ namespace boost { namespace program_options {

    void error_with_option_name::replace_token(const string& from, const string& to) const
    {
-        while (1)
+        for (;;)
        {
            std::size_t pos = m_message.find(from.c_str(), 0, from.length());
            // not found: all replaced
--- a/src/variables_map.cpp
+++ b/src/variables_map.cpp
@@ -17,12 +17,12 @@ namespace boost { namespace program_options {

    using namespace std;

-    // First, performs semantic actions for 'oa'. 
-    // Then, stores in 'm' all options that are defined in 'desc'. 
-    BOOST_PROGRAM_OPTIONS_DECL 
+    // First, performs semantic actions for 'oa'.
+    // Then, stores in 'm' all options that are defined in 'desc'.
+    BOOST_PROGRAM_OPTIONS_DECL
    void store(const parsed_options& options, variables_map& xm,
               bool utf8)
-    {       
+    {
        // TODO: what if we have different definition
        // for the same option name during different calls
        // 'store'.
@@ -42,16 +42,15 @@ namespace boost { namespace program_options {
        string option_name;
        string original_token;

+#ifndef BOOST_NO_EXCEPTIONS
        try
+#endif
        {

            // First, convert/store all given options
            for (i = 0; i < options.options.size(); ++i) {

                option_name = options.options[i].string_key;
-                original_token = options.options[i].original_tokens.size() ? 
-                                options.options[i].original_tokens[0] :
-                                option_name;
                // Skip positional options without name
                if (option_name.empty())
                    continue;
@@ -59,7 +58,7 @@ namespace boost { namespace program_options {
                // Ignore unregistered option. The 'unregistered'
                // field can be true only if user has explicitly asked
                // to allow unregistered options. We can't store them
-                // to variables map (lacking any information about paring), 
+                // to variables map (lacking any information about paring),
                // so just ignore them.
                if (options.options[i].unregistered)
                    continue;
@@ -68,21 +67,21 @@ namespace boost { namespace program_options {
                if (xm.m_final.count(option_name))
                    continue;

-                string original_token = options.options[i].original_tokens.size() ? 
+                original_token = options.options[i].original_tokens.size() ?
                                        options.options[i].original_tokens[0]     : "";
-                const option_description& d = desc.find(option_name, false, 
+                const option_description& d = desc.find(option_name, false,
                                                        false, false);

-                variable_value& v = m[option_name];            
+                variable_value& v = m[option_name];
                if (v.defaulted()) {
                    // Explicit assignment here erases defaulted value
                    v = variable_value();
                }
-                
+
                d.semantic()->parse(v.value(), options.options[i].value, utf8);

                v.m_value_semantic = d.semantic();
-                
+
                // The option is not composing, and the value is explicitly
                // provided. Ignore values of this option for subsequent
                // calls to 'store'. We store this to a temporary set,
@@ -91,7 +90,7 @@ namespace boost { namespace program_options {
                if (!d.semantic()->is_composing())
                    new_final.insert(option_name);
            }
-        } 
+        }
 #ifndef BOOST_NO_EXCEPTIONS
        catch(error_with_option_name& e)
        {
@@ -102,8 +101,8 @@ namespace boost { namespace program_options {
 #endif
        xm.m_final.insert(new_final.begin(), new_final.end());

-        
-        
+
+
        // Second, apply default values and store required options.
        const vector<shared_ptr<option_description> >& all = desc.options();
        for(i = 0; i < all.size(); ++i)
@@ -112,21 +111,21 @@ namespace boost { namespace program_options {
            string key = d.key("");
            // FIXME: this logic relies on knowledge of option_description
            // internals.
-            // The 'key' is empty if options description contains '*'. 
-            // In that 
+            // The 'key' is empty if options description contains '*'.
+            // In that
            // case, default value makes no sense at all.
            if (key.empty())
            {
                continue;
            }
            if (m.count(key) == 0) {
-            
+
                boost::any def;
                if (d.semantic()->apply_default(def)) {
                    m[key] = variable_value(def, true);
                    m[key].m_value_semantic = d.semantic();
                }
-            }  
+            }

            // add empty value if this is an required option
            if (d.semantic()->is_required()) {
@@ -142,16 +141,16 @@ namespace boost { namespace program_options {
        }
    }

-    BOOST_PROGRAM_OPTIONS_DECL 
+    BOOST_PROGRAM_OPTIONS_DECL
    void store(const wparsed_options& options, variables_map& m)
    {
        store(options.utf8_encoded_options, m, true);
    }

-    BOOST_PROGRAM_OPTIONS_DECL 
+    BOOST_PROGRAM_OPTIONS_DECL
    void notify(variables_map& vm)
-    {        
-        vm.notify();               
+    {
+        vm.notify();
    }

    abstract_variables_map::abstract_variables_map()
@@ -163,7 +162,7 @@ namespace boost { namespace program_options {
    : m_next(next)
    {}

-    const variable_value& 
+    const variable_value&
    abstract_variables_map::operator[](const std::string& name) const
    {
        const variable_value& v = get(name);
@@ -179,7 +178,7 @@ namespace boost { namespace program_options {
        }
    }

-    void 
+    void
    abstract_variables_map::next(abstract_variables_map* next)
    {
        m_next = next;
@@ -209,7 +208,7 @@ namespace boost { namespace program_options {
        else
            return i->second;
    }
-    
+
    void
    variables_map::notify()
    {
@@ -221,29 +220,29 @@ namespace boost { namespace program_options {
            const string& opt = r->first;
            const string& display_opt = r->second;
            map<string, variable_value>::const_iterator iter = find(opt);
-            if (iter == end() || iter->second.empty()) 
+            if (iter == end() || iter->second.empty())
            {
                boost::throw_exception(required_option(display_opt));
-            
+
            }
        }

        // Lastly, run notify actions.
-        for (map<string, variable_value>::iterator k = begin(); 
-             k != end(); 
-             ++k) 
+        for (map<string, variable_value>::iterator k = begin();
+             k != end();
+             ++k)
        {
            /* Users might wish to use variables_map to store their own values
               that are not parsed, and therefore will not have value_semantics
-               defined. Do no crash on such values. In multi-module programs,
+               defined. Do not crash on such values. In multi-module programs,
               one module might add custom values, and the 'notify' function
-               will be called after that, so we check that value_sematics is 
+               will be called after that, so we check that value_sematics is
               not NULL. See:
                   https://svn.boost.org/trac/boost/ticket/2782
            */
            if (k->second.m_value_semantic)
                k->second.m_value_semantic->notify(k->second.value());
-        }               
+        }
    }
-    
+
 }}
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,3 +1,4 @@
+import testing ;

 project
    : requirements 
@@ -33,7 +34,11 @@ test-suite program_options :
    [ po-test unrecognized_test.cpp ]
    [ po-test required_test.cpp : required_test.cfg ]
    [ po-test exception_txt_test.cpp ]
+    [ po-test optional_test.cpp ]
+    [ run options_description_test.cpp : : : <rtti>off <define>BOOST_NO_RTTI <define>BOOST_NO_TYPEID : options_description_no_rtti_test ]
    ;
        
 exe test_convert : test_convert.cpp ;   

+# `quick` target (for CI)
+run quick.cpp : --path=initial ;
--- a/test/cmdline_test.cpp
+++ b/test/cmdline_test.cpp
@@ -77,8 +77,7 @@ void apply_syntax(options_description& desc,
            v = value<string>();
            s.resize(s.size()-1);
        } else if (*(s.end()-1) == '?') {
-            //v = value<string>()->implicit();
-            v = value<string>();
+            v = value<string>()->implicit_value("default");
            s.resize(s.size()-1);
        } else if (*(s.end()-1) == '*') {
            v = value<vector<string> >()->multitoken();
@@ -126,9 +125,9 @@ void test_cmdline(const char* syntax,
        try {
            vector<option> options = cmd.run();

-            for(unsigned i = 0; i < options.size(); ++i)
+            for(unsigned j = 0; j < options.size(); ++j)
            {
-                option opt = options[i];
+                option opt = options[j];

                if (opt.position_key != -1) {
                    if (!result.empty())
@@ -138,18 +137,18 @@ void test_cmdline(const char* syntax,
                    if (!result.empty())
                        result += " ";
                    result += opt.string_key + ":";
-                    for (size_t j = 0; j < opt.value.size(); ++j) {
-                        if (j != 0)
+                    for (size_t k = 0; k < opt.value.size(); ++k) {
+                        if (k != 0)
                            result += "-";
-                        result += opt.value[j];
+                        result += opt.value[k];
                    }                    
                }
            }
        }
-        catch(unknown_option& e) {
+        catch(unknown_option&) {
            status = s_unknown_option;
        }
-        catch(ambiguous_option& e) {
+        catch(ambiguous_option&) {
            status = s_ambiguous_option;
        }
        catch(invalid_command_line_syntax& e) {
@@ -607,6 +606,34 @@ void test_unregistered()
    // It's not clear yet, so I'm leaving the decision till later.
 }

+void test_implicit_value()
+{
+    using namespace command_line_style;
+    cmdline::style_t style;
+
+    style = cmdline::style_t(
+        allow_long | long_allow_adjacent
+        );
+
+    test_case test_cases1[] = {
+        // 'bar' does not even look like option, so is consumed
+        {"--foo bar", s_success, "foo:bar"},
+        // '--bar' looks like option, and such option exists, so we don't consume this token
+        {"--foo --bar", s_success, "foo: bar:"},
+        // '--biz' looks like option, but does not match any existing one.
+        // Presently this results in parse error, since
+        // (1) in cmdline.cpp:finish_option, we only consume following tokens if they are
+        // requires
+        // (2) in cmdline.cpp:run, we let options consume following positional options
+        // For --biz, an exception is thrown between 1 and 2.
+        // We might want to fix that in future.
+        {"--foo --biz", s_unknown_option, ""},
+        {0, 0, 0}
+    };
+
+    test_cmdline("foo? bar?", style, test_cases1);
+}
+
 int main(int /*ac*/, char** /*av*/)
 {
    test_long_options();
@@ -619,6 +646,7 @@ int main(int /*ac*/, char** /*av*/)
    test_additional_parser();
    test_style_parser();
    test_unregistered();
+    test_implicit_value();

    return 0;
 }
--- a/test/exception_txt_test.cpp
+++ b/test/exception_txt_test.cpp
@@ -59,7 +59,7 @@ void test_each_exception_message(const string& test_description, const vector<co
        if (style == -1)
            store(parse_config_file(is, desc), vm);
        else
-            store(parse_command_line(argv.size(), argv.data(), desc, style), vm);
+            store(parse_command_line(argv.size(), &argv[0], desc, style), vm);
        notify(vm);    
    } 
    catch (EXCEPTION& e)
@@ -620,7 +620,27 @@ void test_invalid_command_line_style_exception_msg()
    }
 }

+void test_empty_value_inner(options_description &opts, variables_map& vm) {
+    positional_options_description popts;
+    opts.add_options()("foo", value<uint32_t>()->value_name("<time>")->required());
+    popts.add("foo", 1);
+    vector<string> tokens(1, "");
+    parsed_options parsed = command_line_parser(tokens)
+        .style(command_line_style::default_style & ~command_line_style::allow_guessing)
+        .options(opts)
+        .positional(popts)
+        .run();
+    store(parsed, vm);
+}

+void test_empty_value() {
+    // Test that passing empty token for an option that requires integer does not result
+    // in out-of-range error in error reporting code.
+    test_exception<invalid_option_value>(
+        "test_empty_value",
+        "the argument for option '--foo' is invalid",
+        test_empty_value_inner);
+}

 int main(int /*ac*/, char** /*av*/)
 {
@@ -633,6 +653,7 @@ int main(int /*ac*/, char** /*av*/)
   test_multiple_values_not_allowed_exception_msg();
   test_required_option_exception_msg();
   test_at_least_one_value_required_exception_msg();
+   test_empty_value();

   string test_name;
   string expected_message;
--- a/test/optional_test.cpp
+++ b/test/optional_test.cpp
@@ -0,0 +1,53 @@
+// 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/program_options.hpp>
+namespace po = boost::program_options;
+
+#include <boost/optional.hpp>
+
+#include <string>
+
+#include "minitest.hpp"
+
+std::vector<std::string> sv(const char* array[], unsigned size)
+{
+    std::vector<std::string> r;
+    for (unsigned i = 0; i < size; ++i)
+        r.push_back(array[i]);
+    return r;
+}
+
+void test_optional()
+{
+    boost::optional<int> foo, bar, baz;
+
+    po::options_description desc;
+    desc.add_options()
+        ("foo,f", po::value(&foo), "")
+        ("bar,b", po::value(&bar), "")
+        ("baz,z", po::value(&baz), "")
+        ;
+
+    const char* cmdline1_[] = { "--foo=12", "--bar", "1"};
+    std::vector<std::string> cmdline1 = sv(cmdline1_,
+                                           sizeof(cmdline1_)/sizeof(const char*));
+    po::variables_map vm;
+    po::store(po::command_line_parser(cmdline1).options(desc).run(), vm);
+    po::notify(vm);
+
+    BOOST_REQUIRE(!!foo);
+    BOOST_CHECK(*foo == 12);
+
+    BOOST_REQUIRE(!!bar);
+    BOOST_CHECK(*bar == 1);
+
+    BOOST_CHECK(!baz);
+}
+
+int main(int, char*[])
+{
+    test_optional();
+    return 0;
+}
--- a/test/options_description_test.cpp
+++ b/test/options_description_test.cpp
@@ -25,6 +25,7 @@ void test_type()
        ("bar", value<string>(), "")
        ;
    
+#ifndef BOOST_NO_RTTI
    const typed_value_base* b = dynamic_cast<const typed_value_base*>
        (desc.find("foo", false).semantic().get());
    BOOST_CHECK(b);
@@ -34,6 +35,7 @@ void test_type()
        (desc.find("bar", false).semantic().get());
    BOOST_CHECK(b2);
    BOOST_CHECK(b2->value_type() == typeid(string));
+#endif
 }

 void test_approximation()
--- a/test/quick.cpp
+++ b/test/quick.cpp
@@ -0,0 +1,49 @@
+
+// Copyright 2017 Peter Dimov.
+//
+// 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 library home page at http://www.boost.org/libs/program_options
+
+#include <boost/program_options.hpp>
+#include <boost/core/lightweight_test.hpp>
+
+namespace po = boost::program_options;
+
+int main( int argc, char const* argv[] )
+{
+    po::options_description desc( "Allowed options" );
+
+    desc.add_options()
+        ( "path,p", po::value<std::string>(), "set initial path" )
+    ;
+
+    po::variables_map vm;
+
+    try
+    {
+        po::store( po::parse_command_line( argc, argv, desc ), vm );
+        po::notify( vm );
+    }
+    catch( std::exception const & x )
+    {
+        std::cerr << "Error: " << x.what() << std::endl;
+        return 1;
+    }
+
+    std::string p;
+
+    if( vm.count( "path" ) )
+    {
+        p = vm[ "path" ].as<std::string>();
+    }
+
+    std::string expected( "initial" );
+
+    BOOST_TEST_EQ( p, expected );
+
+    return boost::report_errors();
+}
Author	SHA1	Message	Date
Vladimir Prus	46caf622db	Merge branch 'develop'	2018-03-15 22:21:23 +03:00
Vladimir Prus	168f96934f	Change appveyor badge url	2018-03-15 22:13:25 +03:00
Vladimir Prus	a561f71e84	Make build status links point to program_options	2018-03-12 01:37:17 +03:00
Vladimir Prus	c2f064650d	Add CI status table	2018-03-12 01:34:51 +03:00
James E. King III	5ae515c5b3	add ci bits and readme	2018-03-12 01:26:55 +03:00
Kohei Takahashi	84d5b35261	Compile error with initializer list on c++03	2018-03-06 22:35:28 +03:00
Peter Dimov	ec3aded08e	Add `quick` test target (for CI)	2017-12-02 18:38:20 +02:00
Vladimir Prus	046501c191	Fix member hiding warnings. Fixes #35.	2017-10-25 16:24:36 +03:00
Sylvain Joubert	4f52423dca	Remove extra parens in boost::optional how-to example	2017-10-12 14:28:57 +03:00
Tatsuyuki Ishi	110772c0ac	Simplify vector initialization	2017-07-24 22:34:59 +03:00
Johannes Spangenberg	fcee593529	fix suppressing I/O error in parse_config_file corresponding issue: https://svn.boost.org/trac10/ticket/13125	2017-07-24 22:22:31 +03:00
Vladimir Prus	d9ef3853c6	Merge branch 'develop'	2017-07-24 21:48:56 +03:00
Vladimir Prus	d164a20bc9	Additional test for error reporting. Closes #30.	2017-07-24 21:48:04 +03:00
Vladimir Prus	3e1d2603e6	Fix out-of-range error Closes #31.	2017-07-21 18:30:47 +03:00
Vladimir Prus	acaa4c94e1	Merge branch 'develop'	2017-06-25 21:41:31 +03:00
Vladimir Prus	a30cc1082f	Feature macro for use-next-token-for-implicit-option behaviour.	2017-06-25 21:39:43 +03:00
Vladimir Prus	0565d1ee16	Merge from develop for 1.65.0 - Make options with implicit value use next token, like it did before. - Support boost::optional option variables. - Fix syntax error with BOOST_NO_EXCEPTIONS - Fix uninitlized position_key in some cases.	2017-06-24 20:06:06 +03:00
Vladimir Prus	b35e654335	Update comments.	2017-06-10 22:44:09 +03:00
Vladimir Prus	ed72cc2f92	Add tests for the current implicit_value behaviour.	2017-06-10 22:44:09 +03:00
Vladimir Prus	c83abc21a0	Correct documentation for 'implicit_value' Now we no longer say it requires value to be in the same token.	2017-06-10 22:44:09 +03:00
Vladimir Prus	7729850bb7	Make options with implicit value use next token. This commit reverts: - `88dea3c6fd`. "Stop options with implicit value from consuming separate tokens." - `0c01e9aadc`. "Add testing for implicit_values and non-consuming of separate tokens." These commits from 2014 made options with implicit_value set only consult value in the same token. The problem is that now implicit_value, a sematic properly, forces a particular syntax, which proved to be confusing.	2017-06-10 22:44:09 +03:00
jzmaddock	5dc325580b	Namespace fix for diab (EDG) compiler Extracted from Boost.Config issue: https://svn.boost.org/trac/boost/ticket/11655.	2017-04-17 00:00:32 +03:00
Edward Catmur	3277249932	Support boost::optional option variables.	2016-12-21 13:18:47 +03:00
Isaac Dupree	1c2472b8d7	fix syntax with BOOST_NO_EXCEPTIONS	2016-12-21 11:05:00 +03:00
Vladimir Prus	1f9413f532	Switch to using boost-lib.	2016-10-28 13:57:12 +03:00
Rene Rivera	abbb5c12a6	Add, and update, documentation build targets.	2016-10-10 11:39:52 -05:00
Rene Rivera	dfdbcfca0f	Add, and update, documentation build targets.	2016-10-07 23:07:35 -05:00
Gaurav	5a85b81fcf	get_option_name() can throw std::logic_error get_option_name() calls get_canonical_option_prefix() which throws in file value_semantic.cpp line no 296 296 throw std::logic_error("error_with_option_name::m_option_style can only be " 297 "one of [0, allow_dash_for_short, allow_slash_for_short, " 298 "allow_long_disguise or allow_long]"); 299 }	2015-10-06 09:43:09 +03:00
Vladimir Prus	8ca8b3957a	Fix code duplication.	2015-09-12 21:51:31 +03:00
Vladimir Prus	a495b0210a	Initialize position_key in second basic_option constructor.	2015-09-11 22:15:32 +03:00
Vladimir Prus	fae2d4c57b	Merge from develop for 1.59 - Fix compilation errors, missing dllexport and warnings on Windows and/or MSVC (Daniela Engert, Marcel Raad) - Fix unintialized fields (Zoey Greer) - Stop options with implicit value from consuming separate tokens (Michael John Decker) - Make multitoken limit be max int, not 32K (Hans Hohenfeld) - Code formatting and documentation fixes (Jurko, Lauri Nurmi) - Minimal support for no-rtti build (Minmin Gong) - Don't increment environment pointer past the end (Vladimir Prus)	2015-06-09 09:54:19 +03:00
Vladimir Prus	c0cee7f6da	Go back to std::type_info in one more place.	2015-05-03 21:55:08 +03:00
Vladimir Prus	0756d35f8b	Remove more unnecessary use of boost::type_index.	2015-05-01 19:15:36 +03:00
Vladimir Prus	bd1d0bd861	Put back std::type_info. Since typed_value_base is only used with RTTI on, there's no need to avoid std::type_info there.	2015-04-30 22:15:31 +03:00
Minmin Gong	6feeeb3b92	Using type_index to avoid RTTIs in program_options. (fixes #10347 )	2015-04-30 22:10:44 +03:00
Marcel Raad	0efb385e99	Protect against max macro This fixes compilation for MSVC in the case when NOMINMAX is not defined and the program_options include appears after the windows.h include.	2015-04-13 12:27:53 +03:00
Zoey Greer	2c4d25a04b	Value-initialize m_desc Value-initialize m_desc (to NULL) in this constructor to avoid uninitialized memory situations. This issue is related to Coverity CID12523 and was uncovered by Coverity.	2015-04-13 12:26:37 +03:00
Zoey Greer	bae408095f	Explicitly initialize m_implicit m_implicit was previously uninitialized in this constructor, leading to possibly inconsistent functionality. Instead, we now initialize it to false. This issue is related to Coverity CID10559 and was uncovered by Coverity.	2015-04-13 12:24:31 +03:00
Lauri Nurmi	c724b800a8	Fix spelling of "occurrence" where appropriate.	2015-03-29 19:13:14 +03:00
Vladimir Prus	0f9793e369	Make option_groups.cpp compile.	2015-02-15 21:41:48 +03:00
Michael John Decker	0c01e9aadc	Add testing for implicit_values and non-consuming of separate tokens.	2014-12-31 02:04:17 +03:00
Michael John Decker	88dea3c6fd	Stop options with implicit value from consuming separate tokens. The current documentation states that if an option has implicit value, it will only consume adjacent token.	2014-12-30 10:15:10 +03:00
Vladimir Prus	145e5728d7	Unbreak cmdline_test. There was a k-vs-j loop error introduced by a prior comment.	2014-12-30 10:15:10 +03:00
Vladimir Prus	1d3294a058	Merge pull request #7 from jurko-gospodnetic/develop Slight documentation cleanup.	2014-12-02 09:13:20 +03:00
Jurko	7542447620	fix documentation typos environmemt --> environment does not handles --> does not handle	2014-12-02 01:41:01 +01:00
Jurko	794de34bf9	trim trailing spaces	2014-12-02 01:40:17 +01:00
Vladimir Prus	095cb36f8a	Merge pull request #6 from jurko-gospodnetic/develop Documentation cleanups from Jurko Gospodnetić: - trim trailing spaces - fix documentation typos & style - escape first dash ('-') in double-dashes ('--') in doxygen comments This should prevent doxygen from generating bad documentation HTML pages containing '<ndash></ndash>' where those double-dashes should be.	2014-11-29 10:26:24 +03:00
Jurko	a9ea9bb453	escape first dash ('-') in double-dashes ('--') found in doxygen comments This should prevent doxygen from generating bad documentation HTML pages containing '<ndash></ndash>' where those double-dashes should be.	2014-11-27 10:21:48 +01:00
Jurko	3cec23f2ba	fix documentation typos & style typo corrections: - otherwisee --> otherwise - it's is --> it is - nuber --> number - will likely to use --> is likely to use - varaible --> variable - defauled --> defaulted stylistic changes: - which would make --> making	2014-11-27 10:21:48 +01:00
Jurko	fcc4e6ef1a	trim trailing spaces	2014-11-27 09:45:10 +01:00
Marcel Raad	1a17f20532	Compile fix for MSVC 14 Also fixes some new variable shadowing warnings in cmdline_test with Visual C++ 14.	2014-11-24 17:16:21 +03:00
Hans Hohenfeld	6e846597d5	Use maximum unsigned as default multitoken limit. Fixes #10718.	2014-11-24 17:09:58 +03:00
Daniel James	f081a93643	Add metadata file.	2014-11-24 17:07:37 +03:00
Vladimir Prus	37804b54d4	Remove unnecessary workaround. Closes #9854.	2014-04-09 14:04:48 +04:00
Vladimir Prus	f50b02750a	Don't increment environment pointer past the end. This should not effect correct programs, since once the iterator itself is past-the-end, it should not matter what the underlying state of that iterator is. But, the new behaviour is more obvious.	2014-01-20 09:28:12 +04:00
Daniela Engert	3ce1c74a0f	Suppress msvc level-4 warnings. Even when compiled at warning level 4 (i.e. all), project policies may require compilations without warnings issued. Signed-off-by: Daniela Engert <dani@ngrt.de>	2014-01-09 08:47:21 +04:00
Daniela Engert	2acfab15a3	Fix config_file compilation errors with MSVC Previous fix 4ae33c for ticket #6797 introduced a new problem with Visual Studio compilers about two missing methods in 'common_config_file_iterator'. Adding those seemingly not required methods as empty methods fixes the issue. As an added bonus, the bogus warnings about DLL-interfaces get a silencing treatment, too. Tests were run with vc10, vc11, and vc12. Without this fix, the affected test cases fail on all 3 compilers. With the fix in place, all tests pass. Signed-off-by: Daniela Engert <dani@ngrt.de>	2014-01-09 01:19:15 +04:00
Vladimir Prus	4ae33ce15e	Add dllexport to common_config_file_iterator. As reported in #6797, there are linker errors otherwise. I do not know why regression tests, which test dll linking explicitly, do not catch this.	2013-12-19 08:16:19 +04:00
Vladimir Prus	fda6414443	Don't use vector<>::data. This is only required by C++ 11. Most compilers have it anyway, but there are exceptions, like msvc 8 and msvc 9.	2013-12-19 08:09:13 +04:00