Commit f781a7de authored by Julien Michel's avatar Julien Michel

Merge branch 'fix-clang-warnings' into 'develop'

Fix clang missing override warnings

See merge request !30
parents f4aaebfa 82005eec

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -48,19 +48,19 @@ public:
itkTypeMacro(CurlHelper, CurlHelperInterface);
itkNewMacro(Self);
bool TestUrlAvailability(const std::string& url) const ITK_OVERRIDE;
bool TestUrlAvailability(const std::string& url) const override;
bool IsCurlReturnHttpError(const std::string& url) const;
int RetrieveFile(const std::ostringstream& urlStream, std::string filename) const ITK_OVERRIDE;
int RetrieveFile(const std::ostringstream& urlStream, std::string filename) const override;
int RetrieveFile(const std::string& urlString, std::string filename) const ITK_OVERRIDE;
int RetrieveFile(const std::string& urlString, std::string filename) const override;
int RetrieveUrlInMemory(const std::string& urlString, std::string& output) const ITK_OVERRIDE;
int RetrieveUrlInMemory(const std::string& urlString, std::string& output) const override;
int RetrieveFileMulti(const std::vector<std::string>& listURLs,
const std::vector<std::string>& listFiles,
int maxConnect) const ITK_OVERRIDE;
int maxConnect) const override;
itkGetMacro(Timeout,long int);
......@@ -71,7 +71,7 @@ protected:
m_Browser("Mozilla/5.0 (Windows; U; Windows NT 6.0; en-GB; rv:1.8.1.11) "
"Gecko/20071127 Firefox/2.0.0.11"),
m_Timeout(10) {}
~CurlHelper() ITK_OVERRIDE {}
~CurlHelper() override {}
private:
CurlHelper(const Self &); //purposely not implemented
......
......@@ -66,7 +66,7 @@ public:
protected:
CurlHelperInterface() {}
~CurlHelperInterface() ITK_OVERRIDE {}
~CurlHelperInterface() override {}
private:
CurlHelperInterface(const Self &); //purposely not implemented
......
......@@ -47,20 +47,20 @@ public:
itkNewMacro(Self);
bool TestUrlAvailability(const std::string& url) const ITK_OVERRIDE;
bool TestUrlAvailability(const std::string& url) const override;
int RetrieveUrlInMemory(const std::string& urlString, std::string& output) const ITK_OVERRIDE;
int RetrieveUrlInMemory(const std::string& urlString, std::string& output) const override;
int RetrieveFile(const std::ostringstream& urlStream, std::string filename) const ITK_OVERRIDE;
int RetrieveFile(const std::ostringstream& urlStream, std::string filename) const override;
int RetrieveFile(const std::string& urlString, std::string filename) const ITK_OVERRIDE;
int RetrieveFile(const std::string& urlString, std::string filename) const override;
int RetrieveFileMulti(const std::vector<std::string>& listURLs,
const std::vector<std::string>& listFiles,
int maxConnect) const ITK_OVERRIDE;
int maxConnect) const override;
protected:
CurlHelperStub() {}
~CurlHelperStub() ITK_OVERRIDE {}
~CurlHelperStub() override {}
private:
CurlHelperStub(const Self &); //purposely not implemented
......
......@@ -94,7 +94,7 @@ protected:
}
}
~CurlResource() ITK_OVERRIDE
~CurlResource() override
{
curl_easy_cleanup(m_Curl);
}
......@@ -140,7 +140,7 @@ protected:
}
}
~CurlMultiResource() ITK_OVERRIDE
~CurlMultiResource() override
{
curl_multi_cleanup(m_Curl);
}
......@@ -187,7 +187,7 @@ public:
protected:
CurlFileDescriptorResource(){}
~CurlFileDescriptorResource() ITK_OVERRIDE
~CurlFileDescriptorResource() override
{
fclose(m_File);
}
......
......@@ -159,10 +159,10 @@ protected:
GeometriesSet(ogr::Layer layer);
/** Destructor. */
~GeometriesSet() ITK_OVERRIDE;
~GeometriesSet() override;
/** Prints self to stream. */
void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
typedef boost::variant<ogr::DataSource::Pointer, ogr::Layer> AnyGeometriesSetType;
AnyGeometriesSetType m_GeometriesSet;
......
......@@ -119,7 +119,7 @@ public:
* initializing them.
* \post <tt>GetOutput() != NULL</tt>
*/
void PrepareOutputs() ITK_OVERRIDE;
void PrepareOutputs() override;
protected:
/** Default constructor.
......@@ -129,7 +129,7 @@ protected:
/** Destructor.
* Does nothing.
*/
~GeometriesSource() ITK_OVERRIDE;
~GeometriesSource() override;
/** Ensures that the output geometries are allocated before processing.
* If the output hasn't been set, at this point, the default output geometries
......
......@@ -91,13 +91,13 @@ protected:
/** Destructor.
* Does nothing.
*/
~GeometriesToGeometriesFilter() ITK_OVERRIDE;
~GeometriesToGeometriesFilter() override;
/** Processes the input to fill the output.
* This is the main processing function. It either works \em in-place or by
* \em copying the transformed input \c Feature s into the output.
*/
void GenerateData(void) ITK_OVERRIDE;
void GenerateData(void) override;
private: