Commit e6f5c642 authored by Antoine Regimbeau's avatar Antoine Regimbeau

last try to remove warning C4273

parent 22058f32
......@@ -109,8 +109,8 @@ OTBGdalAdapters_EXPORT bool operator!=(const CoordinateTransformation& ct1, cons
class OTBGdalAdapters_EXPORT CoordinateTransformation
{
friend bool operator==(const CoordinateTransformation& ct1, const CoordinateTransformation& ct2) noexcept;
friend bool operator!=(const CoordinateTransformation& ct1, const CoordinateTransformation & ct2) noexcept;
OTBGdalAdapters_EXPORT friend bool operator==(const CoordinateTransformation& ct1, const CoordinateTransformation& ct2) noexcept;
OTBGdalAdapters_EXPORT friend bool operator!=(const CoordinateTransformation& ct1, const CoordinateTransformation & ct2) noexcept;
public:
typedef std::unique_ptr<OGRCoordinateTransformation ,
......
......@@ -91,8 +91,8 @@ OTBGdalAdapters_EXPORT bool operator!=(const SpatialReference& sr1,const Spatial
class OTBGdalAdapters_EXPORT SpatialReference
{
friend class CoordinateTransformation;
friend bool operator==(const SpatialReference& sr1, const SpatialReference & sr2) noexcept;
friend bool operator!=(const SpatialReference& sr1, const SpatialReference & sr2) noexcept;
OTBGdalAdapters_EXPORT friend bool operator==(const SpatialReference& sr1, const SpatialReference & sr2) noexcept;
OTBGdalAdapters_EXPORT friend bool operator!=(const SpatialReference& sr1, const SpatialReference & sr2) noexcept;
public:
typedef std::unique_ptr< OGRSpatialReference ,
......
......@@ -35,14 +35,14 @@ void OGRCoordinateTransformationDeleter::operator()(OGRCoordinateTransformation
}
}
OTBGdalAdapters_EXPORT std::ostream & operator << (std::ostream& o, const CoordinateTransformation & i)
std::ostream & operator << (std::ostream& o, const CoordinateTransformation & i)
{
o << "Source: " << i.GetSourceSpatialReference() << ", Target: " << i.GetTargetSpatialReference();
return o;
}
// equal operator
OTBGdalAdapters_EXPORT bool operator==(const CoordinateTransformation& ct1, const CoordinateTransformation& ct2) noexcept
bool operator==(const CoordinateTransformation& ct1, const CoordinateTransformation& ct2) noexcept
{
auto thisSourceCS = ct1.GetSourceSpatialReference();
auto thisTargetCS = ct1.GetTargetSpatialReference();
......@@ -52,7 +52,7 @@ OTBGdalAdapters_EXPORT bool operator==(const CoordinateTransformation& ct1, cons
return thisSourceCS == otherSourceCS && thisTargetCS == otherTargetCS;
}
OTBGdalAdapters_EXPORT bool operator!=(const CoordinateTransformation& ct1, const CoordinateTransformation & ct2) noexcept
bool operator!=(const CoordinateTransformation& ct1, const CoordinateTransformation & ct2) noexcept
{
return !(ct1==ct2);
}
......
......@@ -37,18 +37,18 @@ void OGRSpatialReferenceDeleter::operator()(OGRSpatialReference * del) const
}
}
OTBGdalAdapters_EXPORT std::ostream & operator << (std::ostream& o, const SpatialReference & i)
std::ostream & operator << (std::ostream& o, const SpatialReference & i)
{
return o << i.ToWkt();
}
OTBGdalAdapters_EXPORT std::ostream & operator << (std::ostream& o, const SpatialReference::hemisphere & hem)
std::ostream & operator << (std::ostream& o, const SpatialReference::hemisphere & hem)
{
return o << (hem == SpatialReference::hemisphere::north ? "N" : "S");
}
OTBGdalAdapters_EXPORT bool operator==(const SpatialReference& sr1,const SpatialReference& sr2) noexcept
bool operator==(const SpatialReference& sr1,const SpatialReference& sr2) noexcept
{
bool rawIsSame ( sr1.m_SR->IsSame(sr2.m_SR.get()) != 0 );
......@@ -69,7 +69,7 @@ OTBGdalAdapters_EXPORT bool operator==(const SpatialReference& sr1,const Spatial
return false;
}
OTBGdalAdapters_EXPORT bool operator!=(const SpatialReference& sr1,const SpatialReference& sr2) noexcept
bool operator!=(const SpatialReference& sr1,const SpatialReference& sr2) noexcept
{
return !(sr1==sr2);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment