aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-12-09 12:00:24 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-12-09 12:00:24 +0200
commita13a2976c2211f06e359d7cfd96a78e80df2567e (patch)
tree5a69a31ee6cbce4ce8522c3712ad9b95724b1a55
parenta35131e29b9290550a2991027ec5ceb3bea014c4 (diff)
Cosmetic change (rename naked pointer to raw pointer)
-rw-r--r--doc/manual.xhtml4
-rw-r--r--odb/context.hxx2
-rw-r--r--odb/options.cli4
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/manual.xhtml b/doc/manual.xhtml
index aa58a86..84ccd0d 100644
--- a/doc/manual.xhtml
+++ b/doc/manual.xhtml
@@ -3501,7 +3501,7 @@ class person
};
</pre>
- <p>If you would like to use a naked pointer as an object pointer,
+ <p>If you would like to use the raw pointer as an object pointer,
you can use <code>*</code> as a shortcut:</p>
<pre class="c++">
@@ -3515,7 +3515,7 @@ class person
<p>If a pointer type is not explicitly specified, the default
pointer, specified with the <code>--default-pointer</code>
ODB compiler option, is used. If this option is not specified
- either, then the naked pointer is used by default.</p>
+ either, then the raw pointer is used by default.</p>
<p>For additional information on object pointers, refer to
<a href="#@@">Section @@, ""</a>.</p>
diff --git a/odb/context.hxx b/odb/context.hxx
index 6f5e89e..cf4383d 100644
--- a/odb/context.hxx
+++ b/odb/context.hxx
@@ -29,7 +29,7 @@ class generation_failed {};
//
enum pointer_kind
{
- pk_naked,
+ pk_raw,
pk_unique,
pk_shared,
pk_weak
diff --git a/odb/options.cli b/odb/options.cli
index ad8b97b..d796403 100644
--- a/odb/options.cli
+++ b/odb/options.cli
@@ -71,7 +71,7 @@ class options
"Use <ptr> as the default pointer for persistent objects. Objects that
do not have a pointer assigned with the \cb{pointer} pragma specifier
will use this pointer by default. The value of this option can be \cb{*}
- which denotes a 'naked' pointer and is the default, or a qualified name
+ which denotes the raw pointer and is the default, or a qualified name
of a smart pointer class template, for example, \cb{std::auto_ptr}. In
the latter case, the ODB compiler constructs the object pointer by adding
a single template argument of the object type to the qualified name, for
@@ -79,7 +79,7 @@ class options
ODB runtime to return dynamically allocated instances of the object
type.
- Except for the 'naked' pointer and the standard smart pointers defined
+ Except for the raw pointer and the standard smart pointers defined
in the \cb{<memory>} header file, you are expected to include the
definition of the default pointer at the beginning of the generated
header file. There are two common ways to achieve this: you can either