From 55d75f18de4fe4eb2fe78676df2e4e1d0d069362 Mon Sep 17 00:00:00 2001 From: Florent Rougon Date: Thu, 16 Nov 2017 16:00:14 +0100 Subject: [PATCH] Add missing include for std::max() and std::min() This include was missing in several files from the simgear/hla directory. --- simgear/hla/HLAArrayDataType.cxx | 2 ++ simgear/hla/HLADataType.cxx | 2 ++ simgear/hla/HLAEnumeratedDataType.cxx | 4 ++-- simgear/hla/HLAFixedRecordDataType.cxx | 3 ++- simgear/hla/HLAInteractionClass.cxx | 6 +++--- simgear/hla/HLAObjectClass.cxx | 2 ++ simgear/hla/HLAVariantRecordDataType.cxx | 3 ++- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/simgear/hla/HLAArrayDataType.cxx b/simgear/hla/HLAArrayDataType.cxx index e5302a8b..4037b81e 100644 --- a/simgear/hla/HLAArrayDataType.cxx +++ b/simgear/hla/HLAArrayDataType.cxx @@ -19,6 +19,8 @@ # include #endif +#include + #include #include "HLAArrayDataType.hxx" diff --git a/simgear/hla/HLADataType.cxx b/simgear/hla/HLADataType.cxx index 1eaf0456..e20251fe 100644 --- a/simgear/hla/HLADataType.cxx +++ b/simgear/hla/HLADataType.cxx @@ -19,6 +19,8 @@ # include #endif +#include + #include #include "HLADataType.hxx" diff --git a/simgear/hla/HLAEnumeratedDataType.cxx b/simgear/hla/HLAEnumeratedDataType.cxx index 9edb9bf0..60b684d0 100644 --- a/simgear/hla/HLAEnumeratedDataType.cxx +++ b/simgear/hla/HLAEnumeratedDataType.cxx @@ -21,11 +21,11 @@ #include -#include "HLAEnumeratedDataType.hxx" - +#include #include #include #include + #include "HLAEnumeratedDataType.hxx" #include "HLADataTypeVisitor.hxx" diff --git a/simgear/hla/HLAFixedRecordDataType.cxx b/simgear/hla/HLAFixedRecordDataType.cxx index aa4f1011..078f9312 100644 --- a/simgear/hla/HLAFixedRecordDataType.cxx +++ b/simgear/hla/HLAFixedRecordDataType.cxx @@ -19,10 +19,11 @@ # include #endif +#include + #include #include "HLAFixedRecordDataType.hxx" - #include "HLADataTypeVisitor.hxx" #include "HLAFixedRecordDataElement.hxx" diff --git a/simgear/hla/HLAInteractionClass.cxx b/simgear/hla/HLAInteractionClass.cxx index c5b1cc5e..c72eb279 100644 --- a/simgear/hla/HLAInteractionClass.cxx +++ b/simgear/hla/HLAInteractionClass.cxx @@ -19,12 +19,12 @@ # include #endif +#include + #include - -#include "HLAInteractionClass.hxx" - #include +#include "HLAInteractionClass.hxx" #include "HLADataElement.hxx" #include "HLAFederate.hxx" diff --git a/simgear/hla/HLAObjectClass.cxx b/simgear/hla/HLAObjectClass.cxx index 2740eb02..4a26f6dd 100644 --- a/simgear/hla/HLAObjectClass.cxx +++ b/simgear/hla/HLAObjectClass.cxx @@ -19,6 +19,8 @@ # include #endif +#include + #include #include "HLAObjectClass.hxx" diff --git a/simgear/hla/HLAVariantRecordDataType.cxx b/simgear/hla/HLAVariantRecordDataType.cxx index d5c5d44b..733e0c60 100644 --- a/simgear/hla/HLAVariantRecordDataType.cxx +++ b/simgear/hla/HLAVariantRecordDataType.cxx @@ -19,10 +19,11 @@ # include #endif +#include + #include #include "HLAVariantRecordDataType.hxx" - #include "HLADataTypeVisitor.hxx" #include "HLAVariantRecordDataElement.hxx"