Skip to content
Snippets Groups Projects
Commit 2dba85eb authored by Tishampati Dhar's avatar Tishampati Dhar
Browse files

BUG: Added MSVC 2010 specific code switches. MSVC 2010 does not compile with these lines included

parent 2a3afb51
No related branches found
No related tags found
No related merge requests found
...@@ -185,7 +185,9 @@ public: ...@@ -185,7 +185,9 @@ public:
bool empty() const { return rep.empty(); } bool empty() const { return rep.empty(); }
void swap(self& hs) { rep.swap(hs.rep); } void swap(self& hs) { rep.swap(hs.rep); }
#if _MSC_VER != 1600
friend bool operator==ITK_FRIEND_TEMPLATE_FUNCTION_ARGUMENT(self)(const self &, const self &); friend bool operator==ITK_FRIEND_TEMPLATE_FUNCTION_ARGUMENT(self)(const self &, const self &);
#endif
iterator begin() { return rep.begin(); } iterator begin() { return rep.begin(); }
iterator end() { return rep.end(); } iterator end() { return rep.end(); }
...@@ -289,7 +291,9 @@ public: ...@@ -289,7 +291,9 @@ public:
bool empty() const { return rep.empty(); } bool empty() const { return rep.empty(); }
void swap(self& hs) { rep.swap(hs.rep); } void swap(self& hs) { rep.swap(hs.rep); }
#if _MSC_VER != 1600
friend bool operator==ITK_FRIEND_TEMPLATE_FUNCTION_ARGUMENT(self)(const self &, const self &); friend bool operator==ITK_FRIEND_TEMPLATE_FUNCTION_ARGUMENT(self)(const self &, const self &);
#endif
iterator begin() { return rep.begin(); } iterator begin() { return rep.begin(); }
iterator end() { return rep.end(); } iterator end() { return rep.end(); }
......
...@@ -471,7 +471,9 @@ public: ...@@ -471,7 +471,9 @@ public:
const_iterator end() const { return const_iterator((node*)0, this); } const_iterator end() const { return const_iterator((node*)0, this); }
#if _MSC_VER != 1600
friend bool operator==ITK_FRIEND_TEMPLATE_FUNCTION_ARGUMENT(self)(const self&,const self&); friend bool operator==ITK_FRIEND_TEMPLATE_FUNCTION_ARGUMENT(self)(const self&,const self&);
#endif
public: public:
...@@ -1144,14 +1146,17 @@ void hashtable_base<Value, Alloc>::copy_from(const hashtable_base<Value, Alloc>& ...@@ -1144,14 +1146,17 @@ void hashtable_base<Value, Alloc>::copy_from(const hashtable_base<Value, Alloc>&
// A few compatability fixes. Placed here for automatic include in // A few compatability fixes. Placed here for automatic include in
// both the hash_set and the hash_map sources. // both the hash_set and the hash_map sources.
# if defined (_MSC_VER) || defined(__BORLANDC__) || ((defined(__ICC)||defined(__ECC)) && defined(linux)) # if defined (_MSC_VER) || defined(__BORLANDC__) || ((defined(__ICC)||defined(__ECC)) && defined(linux))
namespace std namespace std
{ {
#if _MSC_VER != 1600
template <class T> template <class T>
struct identity : public std::unary_function<T, T> { struct identity : public std::unary_function<T, T> {
public: public:
const T& operator()(const T& x) const { return x; } const T& operator()(const T& x) const { return x; }
}; };
#endif
} }
template <class _Pair> template <class _Pair>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment