From: Reza Rastak <rastak@stanford.edu>
Date: Thu, 22 Aug 2019 05:18:04 +0000 (-0700)
Subject: 'optional' corrected to 'std_cxx17::optional' in the documentation
X-Git-Tag: v9.2.0-rc1~1179^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=381a8d3739e10a450b7efeb62fd2f74add7ee19c;p=dealii.git

'optional' corrected to 'std_cxx17::optional' in the documentation
---

diff --git a/doc/news/changes/minor/20190821RezaRastak b/doc/news/changes/minor/20190821RezaRastak
index ed8bc606f8..4520f4499f 100644
--- a/doc/news/changes/minor/20190821RezaRastak
+++ b/doc/news/changes/minor/20190821RezaRastak
@@ -1,5 +1,5 @@
 New: method try_get_data() added to CellDataStorage in both const and
-non-const forms. It returns an optional which determines whether a
+non-const forms. It returns a std_cxx17::optional which determines whether a
 cell has a data associated with it.
 <br>
 (Reza Rastak, 2019/08/21)
diff --git a/include/deal.II/base/quadrature_point_data.h b/include/deal.II/base/quadrature_point_data.h
index 7933a289ec..ab9467e579 100644
--- a/include/deal.II/base/quadrature_point_data.h
+++ b/include/deal.II/base/quadrature_point_data.h
@@ -170,9 +170,10 @@ public:
   get_data(const CellIteratorType &cell) const;
 
   /**
-   * Returns an optional indicating whether @p cell contains an associated
-   * data or not. If data is available, dereferencing the optional
-   * reveals a vector of pointers to the underlying data at quadrature points.
+   * Returns a std_cxx17::optional indicating whether @p cell contains an
+   * associated data or not. If data is available, dereferencing the
+   * std_cxx17::optional reveals a vector of pointers to the underlying data
+   * at the quadrature points.
    * A possible additional typename @p T is the class to which the base class
    * DataType could be cast. Since @p DataType is stored as shared pointers,
    * there is minimal overhead in returning a vector by value instead of by
@@ -189,9 +190,10 @@ public:
   try_get_data(const CellIteratorType &cell);
 
   /**
-   * Returns an optional indicating whether @p cell contains an associated
-   * data or not. If data is available, dereferencing the optional reveals
-   * a vector of constant pointers to the underlying data at quadrature points.
+   * Returns a std_cxx17::optional indicating whether @p cell contains an
+   * associated data or not. If data is available, dereferencing the
+   * std_cxx17::optional reveals a vector of constant pointers to the
+   * underlying data at the quadrature points.
    * A possible additional typename @p T is the class to which the base class
    * DataType could be cast. Since @p DataType is stored as shared pointers,
    * there is minimal overhead in returning a vector by value instead of by