← Back to branch summary

~ubuntu-branches/ubuntu/wily/ruby-passenger/wily-proposed

« back to all changes in this revision

Viewing changes to ext/boost/date_time/format_date_parser.hpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2013-11-23 23:50:02 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20131123235002-8fdhsq7afj15o2z2
Tags: 4.0.25-1
http://bugs.debian.org/725591
* New upstream release.
* Refresh fix_install_path.patch.
* Build for Ruby 2.0 instead of 1.8. (Closes: #725591)
* Add fix_ftbfs_fortify_source.patch.
* Install passenger template files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/boost/date_time/format_date_parser.hpp
7
7
 * Boost Software License, Version 1.0. (See accompanying
8
8
 * file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
9
9
 * Author: Jeff Garland, Bart Garst
10
 
 * $Date: 2012-09-30 16:25:22 -0700 (Sun, 30 Sep 2012) $
 
10
 * $Date: 2013-06-21 08:04:12 -0700 (Fri, 21 Jun 2013) $
11
11
 */
12
12
 
13
13
 
470
470
    
471
471
    // skip leading whitespace
472
472
    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; } 
473
 
    charT current_char = *sitr;
474
473
 
475
474
    short month(0);
476
475
    
485
484
              mr = m_month_short_names.match(sitr, stream_end);
486
485
              month = mr.current_match;
487
486
              if (mr.has_remaining()) {
488
 
                current_char = mr.last_char();
489
487
                use_current_char = true;
490
488
              }
491
489
              break;
495
493
              mr = m_month_long_names.match(sitr, stream_end);
496
494
              month = mr.current_match;
497
495
              if (mr.has_remaining()) {
498
 
                current_char = mr.last_char();
499
496
                use_current_char = true;
500
497
              }
501
498
              break;
523
520
        itr++;
524
521
        if (use_current_char) {
525
522
          use_current_char = false;
526
 
          current_char = *sitr;
527
523
        }
528
524
        else {
529
525
          sitr++;
575
571
    
576
572
    // skip leading whitespace
577
573
    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; } 
578
 
    charT current_char = *sitr;
579
574
 
580
575
    short wkday(0);
581
576
    
594
589
              mr = m_weekday_short_names.match(sitr, stream_end);
595
590
              wkday = mr.current_match;
596
591
              if (mr.has_remaining()) {
597
 
                current_char = mr.last_char();
598
592
                use_current_char = true;
599
593
              }
600
594
              break;
608
602
              mr = m_weekday_long_names.match(sitr, stream_end);
609
603
              wkday = mr.current_match;
610
604
              if (mr.has_remaining()) {
611
 
                current_char = mr.last_char();
612
605
                use_current_char = true;
613
606
              }
614
607
              break;
635
628
        itr++;
636
629
        if (use_current_char) {
637
630
          use_current_char = false;
638
 
          current_char = *sitr;
639
631
        }
640
632
        else {
641
633
          sitr++;
668
660
    
669
661
    // skip leading whitespace
670
662
    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; } 
671
 
    charT current_char = *sitr;
672
663
 
673
664
    unsigned short year(0);
674
665
    
708
699
        itr++;
709
700
        if (use_current_char) {
710
701
          use_current_char = false;
711
 
          current_char = *sitr;
712
702
        }
713
703
        else {
714
704
          sitr++;