Merge pull request #13153 from savuor:fix/filenodeit_member_ptr

ce46cc98 · Alexander Alekhin · 39f327ac · d6b27395 · ce46cc98 · ce46cc98
Commit ce46cc98 authored Nov 14, 2018 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

persistence.hpp modules/core/include/opencv2/core/persistence.hpp +0 -2

persistence.cpp modules/core/src/persistence.cpp +0 -5

No files found.
--- a/modules/core/include/opencv2/core/persistence.hpp
+++ b/modules/core/include/opencv2/core/persistence.hpp
@@ -642,8 +642,6 @@ public:

    //! returns the currently observed element
    FileNode operator *() const;
-    //! accesses the currently observed element methods
-    FileNode operator ->() const;

    //! moves iterator to the next node
    FileNodeIterator& operator ++ ();

--- a/modules/core/src/persistence.cpp
+++ b/modules/core/src/persistence.cpp
@@ -2388,11 +2388,6 @@ FileNode FileNodeIterator::operator *() const
    return FileNode(idx < nodeNElems ? fs : 0, blockIdx, ofs);
 }

-FileNode FileNodeIterator::operator ->() const
-{
-    return FileNode(idx < nodeNElems ? fs : 0, blockIdx, ofs);
-}
-
 FileNodeIterator& FileNodeIterator::operator ++ ()
 {
    if( idx == nodeNElems || !fs )