Commit cb8b348c authored by Thomas Feuvrier's avatar Thomas Feuvrier

COMP: Comment UNREFERENCED_PARAMETER for cygwin platform

parent 45749c7c
...@@ -35,6 +35,10 @@ IF(WIN32) ...@@ -35,6 +35,10 @@ IF(WIN32)
ENDIF(NOT CYGWIN) ENDIF(NOT CYGWIN)
ENDIF(NOT BORLAND) ENDIF(NOT BORLAND)
ENDIF(WIN32) ENDIF(WIN32)
# __CYGWIN__ must be define for ossim (ex: ossimCommon.h, isnan definition, .. )
#IF(CYGWIN)
# ADD_DEFINITIONS(-D__CYGWIN__)
#ENDIF(CYGWIN)
# If CMake is the version we're expecting, don't show the # If CMake is the version we're expecting, don't show the
# CMAKE_BACKWARDS_COMPATIBILITY option. If the version is higher than the # CMAKE_BACKWARDS_COMPATIBILITY option. If the version is higher than the
......
...@@ -25,6 +25,12 @@ SET(liblas_SOURCES ...@@ -25,6 +25,12 @@ SET(liblas_SOURCES
${liblas_SOURCES_DIR}/detail/writer.cpp ${liblas_SOURCES_DIR}/detail/writer.cpp
) )
#IF(CMAKE_COMPILER_IS_GNUCXX)
# FOREACH(f ${liblas_SOURCES} )
# SET_SOURCE_FILES_PROPERTIES( ${f} PROPERTIES COMPILE_FLAGS "-Wno-long-long -pedantic -std=c++98" )
# ENDFOREACH(f)
#ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ADD_LIBRARY(otbliblas ${liblas_SOURCES} ) ADD_LIBRARY(otbliblas ${liblas_SOURCES} )
INSTALL(TARGETS otbliblas INSTALL(TARGETS otbliblas
......
...@@ -309,8 +309,11 @@ inline void check_stream_state(std::basic_ios<C, T>& srtm) ...@@ -309,8 +309,11 @@ inline void check_stream_state(std::basic_ios<C, T>& srtm)
else if (srtm.bad()) else if (srtm.bad())
throw std::runtime_error("fatal I/O error occured"); throw std::runtime_error("fatal I/O error occured");
#else #else
// OTB Modifications for cygwin compilation
#ifndef __CYGWIN__
UNREFERENCED_PARAMETER(srtm); UNREFERENCED_PARAMETER(srtm);
#endif #endif
#endif
} }
#ifdef _MSC_VER #ifdef _MSC_VER
......
...@@ -58,7 +58,13 @@ namespace ossim ...@@ -58,7 +58,13 @@ namespace ossim
* *
* @see nan() * @see nan()
*/ */
#if defined(WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__) // BEGIN OTB modifications : select "std::isnan" for CYGWIN platform
#if defined(__CYGWIN__)
inline bool isnan(const float& v) { return ( std::isnan(v) ); }
inline bool isnan(const double& v) { return ( std::isnan(v) ); }
//#if defined(WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__)
// END OTB modifications : std::isnan for CYGWIN
#elif defined(WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__)
inline bool isnan(const float& v) { return _isnan(v); } inline bool isnan(const float& v) { return _isnan(v); }
inline bool isnan(const double& v) { return _isnan(v); } inline bool isnan(const double& v) { return _isnan(v); }
#elif defined(sun) || defined(__sun) #elif defined(sun) || defined(__sun)
...@@ -76,6 +82,7 @@ namespace ossim ...@@ -76,6 +82,7 @@ namespace ossim
inline bool isnan(const double& v) { return ( std::isnan(v) ); } inline bool isnan(const double& v) { return ( std::isnan(v) ); }
#endif #endif
/* #if defined(WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__) */ /* #if defined(WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__) */
/* inline bool isnan(const float& v) { return _isnan(v); } */ /* inline bool isnan(const float& v) { return _isnan(v); } */
/* inline bool isnan(const double& v) { return _isnan(v); } */ /* inline bool isnan(const double& v) { return _isnan(v); } */
......
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