← Back to branch summary

~ubuntu-branches/ubuntu/trusty/etl/trusty-proposed

« back to all changes in this revision

Viewing changes to ETL/_smach.h

  • Committer: Package Import Robot
  • Author(s): Dmitry Smirnov
  • Date: 2012-05-12 16:24:53 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120512162453-gho4kely37m2t4xr
Tags: 0.04.15-1
http://bugs.debian.org/665041
* New maintainers (Closes: #665041)
* New upstream release.
* imported latest QA changes
* Packaging update
  + to straight debhelper + dh-autoreconf
  + compat & debhelper to version 9
  + corrected Vcs-Browser URL
  + allow dh_auto_test failure (fixes FTBFS)
  + Maintainer set to d-multimedia

Show diffs side-by-side

added added

removed removed

Lines of Context:
ETL/_smach.h
582
582
 
583
583
                        return ret;
584
584
                }
585
 
                catch(egress_exception) { return egress()?RESULT_ACCEPT:RESULT_ERROR; }
 
585
                catch(egress_exception) {
 
586
                        if (egress()) {
 
587
                                RESULT_ACCEPT;
 
588
                        } else {
 
589
                                RESULT_ERROR;
 
590
                        }
 
591
                }
586
592
                catch(pop_exception) { pop_state(); return RESULT_ACCEPT; }
587
593
                catch(const state_base* state) { return enter(state)?RESULT_ACCEPT:RESULT_ERROR; }
588
594
        }