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

diff --git a/doc/news/changes/minor/20190821RezaRastak b/doc/news/changes/minor/20190821RezaRastak
index ed8bc606f8177ab0cd16bfbd503f8c93339e23c4..4520f4499f2d1c469e17b33c73378049f7d66728 100644 (file)
--- 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 7933a289ec215bd8b4a598dc775588069f09e039..ab9467e5792e6674dc0e5bcfd5d54546fb5d98df 100644 (file)
--- 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