summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/general
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-01 23:53:13 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-01 23:53:13 +0100
commita2710f435fa569d29a02603699e450506429f33b (patch)
treed1aaa60900bfd731d889d716b6a78d2347b0295f /user_guide_src/source/general
parentb537c4d32d109cef2ddf541aa976c3e96736bf06 (diff)
parent27c80af1dd9b871ab44452a8de22fd9cabaa184c (diff)
Merge remote-tracking branch 'upstream/develop' into develop-db-sqlite
Diffstat (limited to 'user_guide_src/source/general')
-rw-r--r--user_guide_src/source/general/styleguide.rst16
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
===============================