diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-01-27 20:02:53 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-01-27 20:02:53 +0100 |
| commit | 2b3edbddf2398f225836d5763d112f331fe607ed (patch) | |
| tree | bd9a5df6b3b8d607d0a6e0b385c2e23900b76e4f /user_guide_src/source/general/styleguide.rst | |
| parent | c25c3d3d61ff38a348224252c1b3c9041e50ac32 (diff) | |
| parent | 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7 (diff) | |
Merge upstream branch and fix private methods to be protected
Diffstat (limited to 'user_guide_src/source/general/styleguide.rst')
| -rw-r--r-- | user_guide_src/source/general/styleguide.rst | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst index b3dc08871..d8bdd0531 100644 --- a/user_guide_src/source/general/styleguide.rst +++ b/user_guide_src/source/general/styleguide.rst @@ -441,6 +441,13 @@ same level as the control statement that "owns" them. // ... } } + + try { + // ... + } + catch() { + // ... + } **CORRECT**:: @@ -470,6 +477,15 @@ same level as the control statement that "owns" them. // ... } } + + try + { + // ... + } + catch() + { + // ... + } Bracket and Parenthetic Spacing =============================== |