[Aptitude-svn-commit] r4355 - branches/aptitude-0.3/aptitude/src/generic/util

[Daniel Burrows]

Author: dburrows
Date: Fri Sep 30 02:51:23 2005
New Revision: 4355

Modified:
   branches/aptitude-0.3/aptitude/src/generic/util/temp.h
Log:
Fix the temporary-directory commit.

Modified: branches/aptitude-0.3/aptitude/src/generic/util/temp.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/util/temp.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/util/temp.h	Fri Sep 30 02:51:23 2005
@@ -157,7 +157,7 @@
      */
     dir get_parent() const
     {
-      return dir;
+      return parent;
     }
 
     /** Increment the reference count of this impl. */
@@ -266,10 +266,17 @@
 
     bool valid() const;
     std::string get_name() const;
+<<<<<<< .mine
+    /** \return the enclosing directory of this temporary name; will
+     *          never be an invalid reference unless this is invalid.
+     */
+    dir get_parent() const;
+=======
     /** \return the enclosing directory of this temporary name; will
      *          never be an invalid reference unless this is invalid.
      */
     std::string get_parent() const;
+>>>>>>> .r4354
   };
 
   class name::impl