Commit 3c263106 authored by Brad King's avatar Brad King

COMP: Added definition of __HPACC_USING_MULTIPLIES_IN_FUNCTIONAL on HP to...

COMP: Added definition of __HPACC_USING_MULTIPLIES_IN_FUNCTIONAL on HP to rename "times" to standard-specified name "multiplies".
parent c3f48926
......@@ -3,16 +3,35 @@
#include "vtkConfigure.h"
#ifdef _MSC_VER
#pragma warning (push, 1)
#pragma warning (disable: 4702)
#pragma warning (disable: 4786)
/* Avoid warnings in MSVC standard headers. */
#if defined(_MSC_VER)
# pragma warning (push, 1)
# pragma warning (disable: 4702)
# pragma warning (disable: 4786)
#endif
/* The HP standard library defines the functor "times" instead of
"multiplies" as specified by C++98 20.3.2 for backward
compatibility with earlier specifications. Defining this macro
fixes this behavior. The name "times" also conflicts with the
function declared in sys/times.h on that platform, so we must do
this as a work-around anyway. */
#if defined(__HP_aCC) && !defined(__HPACC_USING_MULTIPLIES_IN_FUNCTIONAL)
# define __HPACC_USING_MULTIPLIES_IN_FUNCTIONAL
# define VTK_DEFINED___HPACC_USING_MULTIPLIES_IN_FUNCTIONAL
#endif
/* Include the real header. */
#include <@VTK_STL_HEADER@>
#ifdef _MSC_VER
#pragma warning(pop)
/* Cleanup. */
#if defined(VTK_DEFINED___HPACC_USING_MULTIPLIES_IN_FUNCTIONAL)
# undef VTK_DEFINED___HPACC_USING_MULTIPLIES_IN_FUNCTIONAL
# undef __HPACC_USING_MULTIPLIES_IN_FUNCTIONAL
#endif
#if defined(_MSC_VER)
# pragma warning(pop)
#endif
#endif
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