[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=afae898

The following commit has been merged in the master branch:
commit afae8981c9d6d9132622dd69958ace062ccd9d8a
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri May 28 04:59:07 2004 +0000

    Explicitly disallow makernote assignment operator
---
 src/makernote.hpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/makernote.hpp b/src/makernote.hpp
index cda683a..e78c51b 100644
--- a/src/makernote.hpp
+++ b/src/makernote.hpp
@@ -22,7 +22,7 @@
   @file    makernote.hpp
   @brief   Contains the Exif %MakerNote interface, IFD %MakerNote and a 
            MakerNote factory
-  @version $Name:  $ $Revision: 1.19 $
+  @version $Name:  $ $Revision: 1.20 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    18-Feb-04, ahu: created
@@ -98,6 +98,12 @@ namespace Exiv2 {
       in the factory, will pick it up (see mn.sh for details).
      */
     class MakerNote {
+        //! @name Not implemented
+        //@{
+        //! Assignment not allowed (memory management mode alloc_ is const)
+        MakerNote& operator=(const MakerNote& rhs);
+        //@}
+
     public:
 
         //! MakerNote Tag information
@@ -251,6 +257,12 @@ namespace Exiv2 {
       @brief Interface for MakerNotes in IFD format. See MakerNote.
      */
     class IfdMakerNote : public MakerNote {
+        //! @name Not implemented
+        //@{
+        //! Assignment not allowed (Ifd does not have an assignment operator)
+        IfdMakerNote& operator=(const IfdMakerNote& rhs);
+        //@}
+
     public:
         //! @name Creators
         //@{        

-- 
exiv2 packaging