← Back to branch summary

~ubuntu-branches/ubuntu/dapper/boost/dapper

« back to all changes in this revision

Viewing changes to libs/program_options/src/cmdline.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Domenico Andreoli, Christophe Prud'homme, Domenico Andreoli
  • Date: 2006-01-11 11:11:42 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060111111142-xy6z1i5himlgu8iw
Tags: 1.33.1-2
http://bugs.debian.org/346367
http://bugs.debian.org/347519
http://bugs.debian.org/345714
[ Christophe Prud'homme ]
* Bug fix: "libboost-wave-dev: Dependency on libboost-filesystem-dev
  missing", thanks to Martin v . Löwis (Closes: #346367).

[ Domenico Andreoli ]
* boost/graph/topological_sort.hpp: removed name of unused parameter
  to prevent long compiler warning.  Closes: #347519.
* Applied patch from upstream CVS to fix parsing of valid options
  with a common root.  Closes: #345714.
* libboost-python-dev now correctly depends on python2.4-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/program_options/src/cmdline.cpp
83
83
namespace boost { namespace program_options { namespace detail {
84
84
 
85
85
    // vc6 needs this, but borland chokes when this is added.
86
 
#if BOOST_WORKAROUND(_MSC_VER, <= 1200)
 
86
#if BOOST_WORKAROUND(_MSC_VER, < 1300)
87
87
    using namespace std;
88
88
    using namespace program_options;
89
89
#endif
248
248
            if (!ok) {
249
249
                option opt;
250
250
                opt.value.push_back(args[0]);
 
251
                opt.original_tokens.push_back(args[0]);
251
252
                result.push_back(opt);
252
253
                args.erase(args.begin());
253
254
            }
331
332
            // Everything's OK, move the values to the result.            
332
333
            for(;!other_tokens.empty() && max_tokens--; ) {
333
334
                opt.value.push_back(other_tokens[0]);
 
335
                opt.original_tokens.push_back(other_tokens[0]);
334
336
                other_tokens.erase(other_tokens.begin());
335
337
            }
336
338
        }
368
370
            opt.string_key = name;
369
371
            if (!adjacent.empty())
370
372
                opt.value.push_back(adjacent);
 
373
            opt.original_tokens.push_back(tok);
371
374
            result.push_back(opt);
372
375
            args.erase(args.begin());
373
376
        }
416
419
                    
417
420
                    option opt;
418
421
                    opt.string_key = name;
 
422
                    opt.original_tokens.push_back(tok);
419
423
                    if (!adjacent.empty())
420
424
                        opt.value.push_back(adjacent);
421
425
                    result.push_back(opt);
442
446
            opt.string_key = name;
443
447
            if (!adjacent.empty())
444
448
                opt.value.push_back(adjacent);
 
449
            opt.original_tokens.push_back(tok);
445
450
            result.push_back(opt);
446
451
            args.erase(args.begin());
447
452
        }