Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix msvc2013+qt5.6.2 compile error. #26

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix msvc2013+qt5.6.2 compile error. #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/orderedmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ class OrderedMap
typedef typename QLinkedList<Key>::const_iterator QllConstIterator;
typedef QPair<Value, QllIterator> OMHashValue;

typedef typename OMHash::iterator OMHashIterator;
typedef typename OMHash::const_iterator OMHashConstIterator;

public:

class iterator;
Expand All @@ -57,7 +54,7 @@ class OrderedMap

OrderedMap(const OrderedMap<Key, Value>& other);

#if (QT_VERSION >= 0x050200)
#ifdef Q_COMPILER_RVALUE_REFS
OrderedMap(OrderedMap<Key, Value>&& other);
#endif

Expand Down Expand Up @@ -89,7 +86,7 @@ class OrderedMap

OrderedMap<Key, Value> & operator=(const OrderedMap<Key, Value>& other);

#if (QT_VERSION >= 0x050200)
#ifdef Q_COMPILER_RVALUE_REFS
OrderedMap<Key, Value> & operator=(OrderedMap<Key, Value>&& other);
#endif

Expand Down Expand Up @@ -335,6 +332,9 @@ class OrderedMap
}
};

typedef typename OMHash::iterator OMHashIterator;
typedef typename OMHash::const_iterator OMHashConstIterator;

private:
void copy(const OrderedMap<Key, Value> &other);

Expand Down Expand Up @@ -362,7 +362,7 @@ OrderedMap<Key, Value>::OrderedMap(const OrderedMap<Key, Value>& other)
copy(other);
}

#if (QT_VERSION >= 0x050200)
#ifdef Q_COMPILER_RVALUE_REFS
template <typename Key, typename Value>
OrderedMap<Key, Value>::OrderedMap(OrderedMap<Key, Value>&& other)
{
Expand Down Expand Up @@ -525,7 +525,7 @@ OrderedMap<Key, Value> & OrderedMap<Key, Value>::operator=(const OrderedMap<Key,
return *this;
}

#if (QT_VERSION >= 0x050200)
#ifdef Q_COMPILER_RVALUE_REFS
template <typename Key, typename Value>
OrderedMap<Key, Value> & OrderedMap<Key, Value>::operator=(OrderedMap<Key, Value>&& other)
{
Expand Down