zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: Tuple2: Remove comparison operators as friends and make non-members.

Browse Source
This commit is contained in:
laurence
2013-07-19 15:53:08 +01:00
parent 0efac64b91
commit 97bac47725
1 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/OpenFOAM/primitives/Tuple2/Tuple2.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -47,20 +47,6 @@ namespace Foam
template<class Type1, class Type2> template<class Type1, class Type2>
class Tuple2; class Tuple2;
template<class Type1, class Type2>
inline bool operator==
(
const Tuple2<Type1, Type2>&,
const Tuple2<Type1, Type2>&
);
template<class Type1, class Type2>
inline bool operator!=
(
const Tuple2<Type1, Type2>&,
const Tuple2<Type1, Type2>&
);
template<class Type1, class Type2> template<class Type1, class Type2>
inline Istream& operator>>(Istream&, Tuple2<Type1, Type2>&); inline Istream& operator>>(Istream&, Tuple2<Type1, Type2>&);
@ -129,27 +115,6 @@ public:
return s_; return s_;
} }
//- Return reverse pair
inline Tuple2<Type2, Type1> reverseTuple2() const
{
return Tuple2<Type2, Type1>(second(), first());
}
// Friend Operators
friend bool operator== <Type1, Type2>
(
const Tuple2<Type1, Type2>& a,
const Tuple2<Type1, Type2>& b
);
friend bool operator!= <Type1, Type2>
(
const Tuple2<Type1, Type2>& a,
const Tuple2<Type1, Type2>& b
);
// IOstream operators // IOstream operators
@ -169,6 +134,14 @@ public:
}; };
//- Return reverse of a tuple2
template<class Type1, class Type2>
inline Tuple2<Type2, Type1> reverse(const Tuple2<Type1, Type2>& t)
{
return Tuple2<Type2, Type1>(t.second(), t.first());
}
template<class Type1, class Type2> template<class Type1, class Type2>
inline bool operator== inline bool operator==
( (