Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 27 insertions, 0 deletions

diff --git a/docs/source/lang/cpp/doublecast.rst b/docs/source/lang/cpp/doublecast.rst
new file mode 100644
index 0000000..511fe24
--- /dev/null
+++ b/docs/source/lang/cpp/doublecast.rst
@@ -0,0 +1,27 @@
+.. highlight:: cpp
+
+.. _lang-doublecast:
+
+``double()`` (cast)
+===================
+
+Converts a value to the :ref:`double <lang-double>` floating point
+data type.  Here is an example::
+
+   int x = 2;
+   double d = double(x);  // d now holds 2.0, a double value
+
+The value ``x`` can be of any type.  However, if ``x`` is not a number
+(like an ``int`` or ``long``), you will get strange results.
+
+See the :ref:`double <lang-double>` reference for details about the
+precision and limitations of ``double`` values on the Maple.
+
+See Also
+--------
+
+-  :ref:`double <lang-double>`
+-  :ref:`float <lang-float>`
+-  :ref:`float() <lang-floatcast>`
+
+.. include:: cc-attribution.txt