diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2011-07-21 11:01:33 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-07-22 17:56:59 +0200 |
commit | 5d8f5cc0e6d658ae1f74bdf977988bbe995701bb (patch) | |
tree | c8d5a1d8472fd1d09dd630cf9287ffdec03e4e45 /doc | |
parent | 1d8db711d6fc2ded779c10987de58bf679191108 (diff) |
Change section order
Diffstat (limited to 'doc')
-rw-r--r-- | doc/manual.xhtml | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/doc/manual.xhtml b/doc/manual.xhtml index 39b4c35..bb505e2 100644 --- a/doc/manual.xhtml +++ b/doc/manual.xhtml @@ -442,9 +442,9 @@ for consistency. <tr><th>10.3.1</th><td><a href="#10.3.1"><code>id</code></a></td></tr> <tr><th>10.3.2</th><td><a href="#10.3.2"><code>auto</code></a></td></tr> <tr><th>10.3.3</th><td><a href="#10.3.3"><code>type</code></a></td></tr> - <tr><th>10.3.4</th><td><a href="#10.3.4"><code>column</code></a></td></tr> - <tr><th>10.3.5</th><td><a href="#10.3.5"><code>transient</code></a></td></tr> - <tr><th>10.3.6</th><td><a href="#10.3.6"><code>null</code>/<code>not_null</code></a></td></tr> + <tr><th>10.3.4</th><td><a href="#10.3.4"><code>null</code>/<code>not_null</code></a></td></tr> + <tr><th>10.3.5</th><td><a href="#10.3.5"><code>column</code></a></td></tr> + <tr><th>10.3.6</th><td><a href="#10.3.6"><code>transient</code></a></td></tr> <tr><th>10.3.7</th><td><a href="#10.3.7"><code>inverse</code></a></td></tr> <tr><th>10.3.8</th><td><a href="#10.3.8"><code>unordered</code></a></td></tr> <tr><th>10.3.9</th><td><a href="#10.3.9"><code>table</code></a></td></tr> @@ -3885,8 +3885,8 @@ class employee <p>By default, an object pointer can be <code>NULL</code>. To specify that a pointer always points to a valid object we can - use the <code>not_null</code> pragma (<a href="#10.3.6">Section - 10.3.6, "<code>null</code>/<code>not_null</code>"</a>) for + use the <code>not_null</code> pragma (<a href="#10.3.4">Section + 10.3.4, "<code>null</code>/<code>not_null</code>"</a>) for single object pointers and the <code>value_not_null</code> pragma (<a href="#10.3.13">Section 10.3.13, "<code>value_null</code>/<code>value_not_null</code>"</a>) @@ -4972,8 +4972,8 @@ t.commit (); <p>Customizing a column name for a data member of a simple value type is straightforward: we simply specify the desired name with - the <code>db column</code> pragma (<a href="#10.3.4">Section - 10.3.4, "<code>column</code>"</a>). For composite value + the <code>db column</code> pragma (<a href="#10.3.5">Section + 10.3.5, "<code>column</code>"</a>). For composite value types things are slightly more complex since they are mapped to multiple columns. Consider the following example:</p> @@ -6229,7 +6229,7 @@ typedef shared_ptr<person> person_ptr; </pre> <p>The <code>NULL</code> semantics can also be specified on the - per-member basis (<a href="#10.3.6">Section 10.3.6, + per-member basis (<a href="#10.3.4">Section 10.3.4, "<code>null</code>/<code>not_null</code>"</a>). If both a type and a member have <code>null</code>/<code>not_null</code> specifiers, then the member specifier takes precedence. If a member specifier @@ -6445,20 +6445,20 @@ typedef std::map<unsigned short, float> age_weight_map; </tr> <tr> - <td><code>column</code></td> - <td>column name for member</td> + <td><code>null</code>/<code>not_null</code></td> + <td>member can/cannot be NULL</td> <td><a href="#10.3.4">10.3.4</a></td> </tr> <tr> - <td><code>transient</code></td> - <td>member is not stored in the database</td> + <td><code>column</code></td> + <td>column name for member</td> <td><a href="#10.3.5">10.3.5</a></td> </tr> <tr> - <td><code>null</code>/<code>not_null</code></td> - <td>member can/cannot be NULL</td> + <td><code>transient</code></td> + <td>member is not stored in the database</td> <td><a href="#10.3.6">10.3.6</a></td> </tr> @@ -6604,11 +6604,11 @@ class person }; </pre> - <p>The <code>null</code> and <code>not_null</code> (<a href="#10.3.6">Section - 10.3.6, "<code>null</code>/<code>not_null</code>"</a>) specifiers + <p>The <code>null</code> and <code>not_null</code> (<a href="#10.3.4">Section + 10.3.4, "<code>null</code>/<code>not_null</code>"</a>) specifiers can be used to control the NULL semantics of a data member.</p> - <h3><a name="10.3.4">10.3.4 <code>column</code></a></h3> + <h3><a name="10.3.5">10.3.5 <code>column</code></a></h3> <p>The <code>column</code> specifier specifies the column name that should be used to store a data member in a relational database. @@ -6633,7 +6633,7 @@ class person name by removing the common data member name decorations, such as leading and trailing underscores, the <code>m_</code> prefix, etc.</p> - <h3><a name="10.3.5">10.3.5 <code>transient</code></a></h3> + <h3><a name="10.3.6">10.3.6 <code>transient</code></a></h3> <p>The <code>transient</code> specifier instructs the ODB compiler not to store a data member in the database. For example:</p> @@ -6655,7 +6655,7 @@ class person references that are only meaningful in the application's memory, as well as utility members such as mutexes, etc.</p> - <h3><a name="10.3.6">10.3.6 <code>null</code>/<code>not_null</code></a></h3> + <h3><a name="10.3.4">10.3.4 <code>null</code>/<code>not_null</code></a></h3> <p>The <code>null</code> and <code>not_null</code> specifiers specify that a data member can or cannot be <code>NULL</code>, respectively. @@ -6876,7 +6876,7 @@ class person cannot be <code>NULL</code>, respectively. The semantics of <code>value_null</code> and <code>value_not_null</code> are similar to that of the <code>null</code> and <code>not_null</code> specifiers - (<a href="#10.3.6">Section 10.3.6, "<code>null</code>/<code>not_null</code>"</a>). + (<a href="#10.3.4">Section 10.3.4, "<code>null</code>/<code>not_null</code>"</a>). For example:</p> <pre class="c++"> @@ -6909,7 +6909,7 @@ class account container's table for a data member. The semantics of <code>id_column</code> are similar to that of the <code>column</code> specifier - (<a href="#10.3.4">Section 10.3.4, "<code>column</code>"</a>). + (<a href="#10.3.5">Section 10.3.5, "<code>column</code>"</a>). For example:</p> <pre class="c++"> @@ -6933,7 +6933,7 @@ class person ordered container's table for a data member. The semantics of <code>index_column</code> are similar to that of the <code>column</code> specifier - (<a href="#10.3.4">Section 10.3.4, "<code>column</code>"</a>). + (<a href="#10.3.5">Section 10.3.5, "<code>column</code>"</a>). For example:</p> <pre class="c++"> @@ -6957,7 +6957,7 @@ class person container's table for a data member. The semantics of <code>key_column</code> are similar to that of the <code>column</code> specifier - (<a href="#10.3.4">Section 10.3.4, "<code>column</code>"</a>). + (<a href="#10.3.5">Section 10.3.5, "<code>column</code>"</a>). For example:</p> <pre class="c++"> @@ -6981,7 +6981,7 @@ class person container's table for a data member. The semantics of <code>value_column</code> are similar to that of the <code>column</code> specifier - (<a href="#10.3.4">Section 10.3.4, "<code>column</code>"</a>). + (<a href="#10.3.5">Section 10.3.5, "<code>column</code>"</a>). For example:</p> <pre class="c++"> |