Commit 7950785f authored by Guillaume Pasero's avatar Guillaume Pasero

COMP: fix nullptr_t issue in OSSIM 2.2.0 with clang

parent 48c3bc29
Pipeline #348 failed with stage
in 26 minutes and 10 seconds
......@@ -23,6 +23,8 @@
#include <cassert>
#include "otb_ossim.h"
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
......
......@@ -23,6 +23,8 @@
#include "otbImageKeywordlist.h"
#include "otbMacro.h"
#include "otb_ossim.h"
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
......
/*
* Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
*
* This file is part of Orfeo Toolbox
*
* https://www.orfeo-toolbox.org/
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef otb_ossim_h
#define otb_ossim_h
#include <cstddef>
// export nullptr_t from std as ossimRefPtr uses it (ossim 2.2.0)
using std::nullptr_t;
#endif
......@@ -50,4 +50,8 @@
# define OSSIM_PLUGINS_DLL
#endif /* #if defined(_MSC_VER) */
/** Export nullptr_t from std namespace as ossimRefPtr needs it */
#include <cstddef>
using std::nullptr_t;
#endif /* #ifndef ossimPluginConstants_HEADER */
......@@ -28,6 +28,7 @@
#include <string>
#include <vector>
#include <ossimPluginConstants.h>
#include <ossim/base/ossimRefPtr.h>
class ossimString;
......
......@@ -25,6 +25,7 @@
#ifndef ossimRadarSat2TiffReader_HEADER
#define ossimRadarSat2TiffReader_HEADER 1
#include <ossimPluginConstants.h>
#include <ossim/imaging/ossimTiffTileSource.h>
#include <ossim/base/ossimFilename.h>
......
......@@ -30,6 +30,8 @@
#include <string>
#include <boost/config.hpp>
#include "ossimPluginConstants.h" // OSSIM_PLUGINS_DLL
#include <ossim/base/ossimCommon.h>
#include <ossim/base/ossimFilename.h>
#include <ossim/base/ossimKeywordNames.h>
......@@ -40,7 +42,6 @@
//#include <ossim/projection/ossimSensorModel.h>
//#include <ossim/projection/ossimCoarseGridModel.h>
#include "ossim/ossimSarSensorModel.h"
#include "ossimPluginConstants.h" // OSSIM_PLUGINS_DLL
#include <ossim/support_data/ossimSupportFilesList.h>
......
......@@ -28,6 +28,8 @@
#include <list>
#include <string>
#include <vector>
#include <ossimPluginConstants.h>
#include <ossim/base/ossimConstants.h>
#include <ossim/base/ossimRefPtr.h>
......
......@@ -25,6 +25,7 @@
#ifndef ossimTerraSarTiffReader_HEADER
#define ossimTerraSarTiffReader_HEADER 1
#include <ossimPluginConstants.h>
#include <ossim/imaging/ossimTiffTileSource.h>
#include <ossim/base/ossimFilename.h>
......
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