Commit e3a95d36 authored by Carson Brownlee's avatar Carson Brownlee Committed by Carson Brownlee
Browse files

removing c++11 conditionals

parent ca7c16fc
......@@ -33,10 +33,7 @@ typedef enum : uint32_t
} RTWFrameBufferChannel;
// OSPRay events which can be waited on via ospWait()
typedef enum
# if __cplusplus >= 201103L
: uint32_t
#endif
typedef enum : uint32_t
{
RTW_NONE_FINISHED = 0,
RTW_WORLD_RENDERED = 10,
......@@ -46,10 +43,7 @@ typedef enum
} RTWSyncEvent;
// OSPRay cell types definition for unstructured volumes, values are set to match VTK
typedef enum
# if __cplusplus >= 201103L
: uint8_t
#endif
typedef enum : uint8_t
{
RTW_TETRAHEDRON = 10,
RTW_HEXAHEDRON = 12,
......@@ -59,10 +53,7 @@ typedef enum
} RTWUnstructuredCellType;
// OSPRay PerspectiveCamera stereo image modes
typedef enum
# if __cplusplus >= 201103L
: uint8_t
#endif
typedef enum : uint8_t
{
RTW_STEREO_NONE,
RTW_STEREO_LEFT,
......@@ -72,10 +63,7 @@ typedef enum
} RTWStereoMode;
// OSPRay Curves geometry types
typedef enum
#if __cplusplus >= 201103L
: uint8_t
#endif
typedef enum : uint8_t
{
RTW_ROUND,
RTW_FLAT,
......@@ -84,10 +72,7 @@ typedef enum
} RTWCurveType;
// OSPRay Curves geometry bases
typedef enum
#if __cplusplus >= 201103L
: uint8_t
#endif
typedef enum : uint8_t
{
RTW_LINEAR,
RTW_BEZIER,
......@@ -98,10 +83,7 @@ typedef enum
} RTWCurveBasis;
// AMR Volume rendering methods
typedef enum
# if __cplusplus >= 201103L
: uint8_t
#endif
typedef enum : uint8_t
{
RTW_AMR_CURRENT,
RTW_AMR_FINEST,
......@@ -130,10 +112,7 @@ typedef enum :uint32_t
RTW_TEXTURE_FILTER_NEAREST
} RTWTextureFilter;
typedef enum
# if __cplusplus >= 201103L
: uint32_t
#endif
typedef enum : uint32_t
{
// Object reference type.
RTW_DEVICE = 100,
......
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