diff --git a/doc/conditional.qbk b/doc/conditional.qbk
new file mode 100644
index 0000000..317bf53
--- /dev/null
+++ b/doc/conditional.qbk
@@ -0,0 +1,18 @@
+
+[/===================================================================]
+[section:conditional conditional]
+[/===================================================================]
+
+
+`#include `
+
+ namespace boost {
+ template struct __conditional;
+ }
+
+If B is true, the member typedef type shall equal T. If B is false, the member typedef type shall equal F.
+
+This trait is really just an alias for `boost::mpl::if_c`.
+
+[endsect]
+
diff --git a/doc/html/boost_typetraits/background.html b/doc/html/boost_typetraits/background.html
index 41c0b33..01b7985 100644
--- a/doc/html/boost_typetraits/background.html
+++ b/doc/html/boost_typetraits/background.html
@@ -56,7 +56,7 @@
method available to them.
@@ -84,7 +84,7 @@
given.
@@ -174,7 +174,7 @@
in the default template.
@@ -247,7 +247,7 @@
otherwise it will call the "slow but safe version".
@@ -280,7 +280,7 @@
-
Table 1.1. Time taken to copy 1000 elements using `copy<const T*, T*>` (times
+
Table 1.1. Time taken to copy 1000 elements using `copy<const T*, T*>` (times
in micro-seconds)
@@ -416,7 +416,7 @@
to hold non-reference types, references, and constant references:
-
Table 1.2. Required Constructor Argument Types
+
Table 1.2. Required Constructor Argument Types
@@ -481,7 +481,7 @@
adds a reference to its type, unless it is already a reference.
-
Table 1.3. Using add_reference to synthesize the correct constructor type
+
Table 1.3. Using add_reference to synthesize the correct constructor type
@@ -597,7 +597,7 @@
easier to maintain and easier to understand.
@@ -610,7 +610,7 @@
can be optimal as well as generic.
@@ -618,7 +618,7 @@
comments when preparing this article.
diff --git a/doc/html/boost_typetraits/category/transform.html b/doc/html/boost_typetraits/category/transform.html
index ae7900b..ee2a020 100644
--- a/doc/html/boost_typetraits/category/transform.html
+++ b/doc/html/boost_typetraits/category/transform.html
@@ -57,6 +57,9 @@
template < class T >
struct add_volatile ;
+template < bool B , class T , class U >
+struct conditional ;
+
template < class ... T >
struct common_type ;
@@ -100,7 +103,7 @@
struct remove_volatile ;
diff --git a/doc/html/boost_typetraits/history.html b/doc/html/boost_typetraits/history.html
index 07985f8..c3adeac 100644
--- a/doc/html/boost_typetraits/history.html
+++ b/doc/html/boost_typetraits/history.html
@@ -27,7 +27,7 @@
History
diff --git a/doc/html/boost_typetraits/intrinsics.html b/doc/html/boost_typetraits/intrinsics.html
index f329ecf..532438c 100644
--- a/doc/html/boost_typetraits/intrinsics.html
+++ b/doc/html/boost_typetraits/intrinsics.html
@@ -99,7 +99,7 @@
of the following macros:
-
Table 1.4. Macros for Compiler Intrinsics
+
Table 1.4. Macros for Compiler Intrinsics
diff --git a/doc/html/boost_typetraits/reference.html b/doc/html/boost_typetraits/reference.html
index 15691e0..67da972 100644
--- a/doc/html/boost_typetraits/reference.html
+++ b/doc/html/boost_typetraits/reference.html
@@ -36,6 +36,7 @@
add_volatile
aligned_storage
alignment_of
+ Conditional
common_type
decay
extent
@@ -108,6 +109,8 @@
remove_volatile
type_with_alignment
+
+
diff --git a/doc/html/boost_typetraits/reference/add_const.html b/doc/html/boost_typetraits/reference/add_const.html
index 277d95f..ac45ffe 100644
--- a/doc/html/boost_typetraits/reference/add_const.html
+++ b/doc/html/boost_typetraits/reference/add_const.html
@@ -53,7 +53,7 @@
or #include < boost / type_traits . hpp >
-
Table 1.5. Examples
+
Table 1.5. Examples
diff --git a/doc/html/boost_typetraits/reference/add_cv.html b/doc/html/boost_typetraits/reference/add_cv.html
index f492e43..1e0e86a 100644
--- a/doc/html/boost_typetraits/reference/add_cv.html
+++ b/doc/html/boost_typetraits/reference/add_cv.html
@@ -54,7 +54,7 @@
or #include < boost / type_traits . hpp >
-
Table 1.6. Examples
+
Table 1.6. Examples
diff --git a/doc/html/boost_typetraits/reference/add_lvalue_reference.html b/doc/html/boost_typetraits/reference/add_lvalue_reference.html
index 613edcd..5edb05b 100644
--- a/doc/html/boost_typetraits/reference/add_lvalue_reference.html
+++ b/doc/html/boost_typetraits/reference/add_lvalue_reference.html
@@ -58,7 +58,7 @@
or #include < boost / type_traits . hpp >
-
Table 1.7. Examples
+
Table 1.7. Examples
diff --git a/doc/html/boost_typetraits/reference/add_pointer.html b/doc/html/boost_typetraits/reference/add_pointer.html
index 71da3d3..b11225e 100644
--- a/doc/html/boost_typetraits/reference/add_pointer.html
+++ b/doc/html/boost_typetraits/reference/add_pointer.html
@@ -56,7 +56,7 @@
or #include < boost / type_traits . hpp >
-
Table 1.8. Examples
+
Table 1.8. Examples
diff --git a/doc/html/boost_typetraits/reference/add_reference.html b/doc/html/boost_typetraits/reference/add_reference.html
index 8d8fc1f..4860561 100644
--- a/doc/html/boost_typetraits/reference/add_reference.html
+++ b/doc/html/boost_typetraits/reference/add_reference.html
@@ -65,7 +65,7 @@
or #include < boost / type_traits . hpp >
-
Table 1.9. Examples
+
Table 1.9. Examples
diff --git a/doc/html/boost_typetraits/reference/add_rvalue_reference.html b/doc/html/boost_typetraits/reference/add_rvalue_reference.html
index 6d8290f..f647c1b 100644
--- a/doc/html/boost_typetraits/reference/add_rvalue_reference.html
+++ b/doc/html/boost_typetraits/reference/add_rvalue_reference.html
@@ -56,7 +56,7 @@
or #include < boost / type_traits . hpp >
-
Table 1.10. Examples
+
Table 1.10. Examples
diff --git a/doc/html/boost_typetraits/reference/add_volatile.html b/doc/html/boost_typetraits/reference/add_volatile.html
index 3ebaef0..c64192a 100644
--- a/doc/html/boost_typetraits/reference/add_volatile.html
+++ b/doc/html/boost_typetraits/reference/add_volatile.html
@@ -53,7 +53,7 @@
or #include < boost / type_traits . hpp >
-
Table 1.11. Examples
+
Table 1.11. Examples
diff --git a/doc/html/boost_typetraits/reference/alignment_of.html b/doc/html/boost_typetraits/reference/alignment_of.html
index f1d3739..034eec5 100644
--- a/doc/html/boost_typetraits/reference/alignment_of.html
+++ b/doc/html/boost_typetraits/reference/alignment_of.html
@@ -7,7 +7,7 @@
-
+