Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
mattijs 2012-09-25 14:15:58 +01:00
commit 6e03b278f0
3 changed files with 12 additions and 12 deletions

View File

@ -172,25 +172,25 @@ public:
// Friend operators
inline friend incompressiblePerfectGas operator+ <Specie>
friend incompressiblePerfectGas operator+ <Specie>
(
const incompressiblePerfectGas&,
const incompressiblePerfectGas&
);
inline friend incompressiblePerfectGas operator- <Specie>
friend incompressiblePerfectGas operator- <Specie>
(
const incompressiblePerfectGas&,
const incompressiblePerfectGas&
);
inline friend incompressiblePerfectGas operator* <Specie>
friend incompressiblePerfectGas operator* <Specie>
(
const scalar s,
const incompressiblePerfectGas&
);
inline friend incompressiblePerfectGas operator== <Specie>
friend incompressiblePerfectGas operator== <Specie>
(
const incompressiblePerfectGas&,
const incompressiblePerfectGas&

View File

@ -158,25 +158,25 @@ public:
// Friend operators
inline friend perfectGas operator+ <Specie>
friend perfectGas operator+ <Specie>
(
const perfectGas&,
const perfectGas&
);
inline friend perfectGas operator- <Specie>
friend perfectGas operator- <Specie>
(
const perfectGas&,
const perfectGas&
);
inline friend perfectGas operator* <Specie>
friend perfectGas operator* <Specie>
(
const scalar s,
const perfectGas&
);
inline friend perfectGas operator== <Specie>
friend perfectGas operator== <Specie>
(
const perfectGas&,
const perfectGas&

View File

@ -160,25 +160,25 @@ public:
// Friend operators
inline friend rhoConst operator+ <Specie>
friend rhoConst operator+ <Specie>
(
const rhoConst&,
const rhoConst&
);
inline friend rhoConst operator- <Specie>
friend rhoConst operator- <Specie>
(
const rhoConst&,
const rhoConst&
);
inline friend rhoConst operator* <Specie>
friend rhoConst operator* <Specie>
(
const scalar s,
const rhoConst&
);
inline friend rhoConst operator== <Specie>
friend rhoConst operator== <Specie>
(
const rhoConst&,
const rhoConst&