From d168b5db084457a106c5bb155be6eca5013f77c0 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Tue, 28 May 2019 14:55:01 -0400 Subject: added AlternativesVector typedef to FileEntry split item creation from refreshConflictLists() --- src/shared/directoryentry.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/shared') diff --git a/src/shared/directoryentry.h b/src/shared/directoryentry.h index 12cef11d..e7af1ae7 100644 --- a/src/shared/directoryentry.h +++ b/src/shared/directoryentry.h @@ -49,8 +49,8 @@ class FileEntry { public: typedef unsigned int Index; - typedef boost::shared_ptr Ptr; + typedef std::vector>> AlternativesVector; public: @@ -72,7 +72,7 @@ public: // gets the list of alternative origins (origins with lower priority than the primary one). // if sortOrigins has been called, it is sorted by priority (ascending) - const std::vector>> &getAlternatives() const { return m_Alternatives; } + const AlternativesVector &getAlternatives() const { return m_Alternatives; } const std::wstring &getName() const { return m_Name; } int getOrigin() const { return m_Origin; } @@ -98,7 +98,7 @@ private: std::wstring m_Name; int m_Origin = -1; std::pair m_Archive; - std::vector>> m_Alternatives; + AlternativesVector m_Alternatives; DirectoryEntry *m_Parent; mutable FILETIME m_FileTime; -- cgit v1.3.1