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/longcast.rst b/docs/source/lang/cpp/longcast.rst
new file mode 100644
index 0000000..2b92345
--- /dev/null
+++ b/docs/source/lang/cpp/longcast.rst
@@ -0,0 +1,27 @@
+.. highlight:: cpp
+
+.. _lang-longcast:
+
+``long()`` (cast)
+=================
+
+Converts a value to the :ref:`long <lang-long>` data type.  Here is
+an example::
+
+    double d = 2.5;
+    long i = long(d); // i holds "2L", an long value
+
+The value inside of the parentheses (``long(...)``) can be of any type.
+However, if it is not a numeric type (like ``double``, ``char``,
+etc.), you will get strange results.
+
+See the :ref:`long <lang-long>` reference for details about the
+precision and limitations of ``long`` variables on the Maple.
+
+See Also
+--------
+
+-  :ref:`long <lang-long>`
+
+
+.. include:: cc-attribution.txt