From 19cc797c419e8d1c579565d242643904bb2c5dd8 Mon Sep 17 00:00:00 2001
From: Thomas Geymayer <tomgey@gmail.com>
Date: Fri, 12 Jan 2018 07:57:17 +0100
Subject: [PATCH] cppbind: fix exporting integer_sequence and small codingstyle
 fixes

---
 simgear/misc/CMakeLists.txt            | 1 +
 simgear/misc/integer_sequence.hxx      | 4 ++--
 simgear/misc/integer_sequence_test.cxx | 4 ++--
 simgear/nasal/cppbind/NasalContext.hxx | 4 ++--
 simgear/nasal/cppbind/NasalObject.hxx  | 2 +-
 simgear/structure/function_list.hxx    | 4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/simgear/misc/CMakeLists.txt b/simgear/misc/CMakeLists.txt
index 3c5bfedd..c6b0d73a 100644
--- a/simgear/misc/CMakeLists.txt
+++ b/simgear/misc/CMakeLists.txt
@@ -9,6 +9,7 @@ set(HEADERS
     SVGpreserveAspectRatio.hxx
     argparse.hxx
     interpolator.hxx
+    integer_sequence.hxx
     make_new.hxx
     sg_dir.hxx
     sg_hash.hxx
diff --git a/simgear/misc/integer_sequence.hxx b/simgear/misc/integer_sequence.hxx
index 7f372785..47f63c43 100644
--- a/simgear/misc/integer_sequence.hxx
+++ b/simgear/misc/integer_sequence.hxx
@@ -20,7 +20,7 @@
 #ifndef SIMGEAR_MISC_INTEGER_SEQUENCE_HXX_
 #define SIMGEAR_MISC_INTEGER_SEQUENCE_HXX_
 
-#include <simgear_config.h>
+#include <simgear/simgear_config.h>
 
 #include <utility>
 #include <type_traits>
@@ -48,7 +48,7 @@ namespace simgear { namespace detail
   template<class T, class Seq, T El>
   struct append;
 
-  template<class T, T ... Ints, T Int>
+  template<class T, T... Ints, T Int>
   struct append<T, std::integer_sequence<T, Ints...>, Int>
   {
     using type = std::integer_sequence<T, Ints..., Int>;
diff --git a/simgear/misc/integer_sequence_test.cxx b/simgear/misc/integer_sequence_test.cxx
index 82463f50..74ccd3c2 100644
--- a/simgear/misc/integer_sequence_test.cxx
+++ b/simgear/misc/integer_sequence_test.cxx
@@ -8,13 +8,13 @@ void print(const T& v, std::size_t i)
   std::cout << "arg #" << i << ": '" << v << "', ";
 }
 
-template<typename ... Args, std::size_t ... Is>
+template<class... Args, std::size_t... Is>
 void doIt_impl(Args ... args, std::index_sequence<Is...>)
 {
   std::initializer_list<char>{(print(args, Is), '0')...};
 }
 
-template<typename ... Args>
+template<class... Args>
 void doIt(Args ... args)
 {
   static_assert(sizeof...(Args) == std::index_sequence_for<Args...>::size(), "");
diff --git a/simgear/nasal/cppbind/NasalContext.hxx b/simgear/nasal/cppbind/NasalContext.hxx
index e9379c9f..d3a3aee5 100644
--- a/simgear/nasal/cppbind/NasalContext.hxx
+++ b/simgear/nasal/cppbind/NasalContext.hxx
@@ -44,14 +44,14 @@ namespace nasal
       String newString(const char* str);
 
       /** Create a new nasal vector and fill it with the given values */
-      template<class ... Vals>
+      template<class... Vals>
       naRef newVector(Vals ... vals)
       {
         return newVector({to_nasal(vals)...});
       }
 
       /** Raise a nasal runtime error */
-      template<class ... Args>
+      template<class... Args>
       void runtimeError(const char* fmt, Args ... args) const
       {
         naRuntimeError(c_ctx(), fmt, args...);
diff --git a/simgear/nasal/cppbind/NasalObject.hxx b/simgear/nasal/cppbind/NasalObject.hxx
index 565c1670..c48812cf 100644
--- a/simgear/nasal/cppbind/NasalObject.hxx
+++ b/simgear/nasal/cppbind/NasalObject.hxx
@@ -45,7 +45,7 @@ namespace nasal
 
       bool valid() const;
 
-      template<class Ret, class ... Args>
+      template<class Ret, class... Args>
       Ret callMethod(const std::string& name, Args ... args)
       {
         if( !_nasal_impl.valid() )
diff --git a/simgear/structure/function_list.hxx b/simgear/structure/function_list.hxx
index 5268d2ca..89347636 100644
--- a/simgear/structure/function_list.hxx
+++ b/simgear/structure/function_list.hxx
@@ -31,7 +31,7 @@ namespace simgear
    *
    * @tparam Sig    Function signature.
    */
-  template<class Ret, class ... Args>
+  template<class Ret, class... Args>
   class function_list<Ret(Args...)>:
     public std::vector<boost::function<Ret(Args...)>>
   {
@@ -54,7 +54,7 @@ namespace simgear
    * Handle a list of callbacks with the same signature as the given
    * boost::function type.
    */
-  template<class Ret, class ... Args>
+  template<class Ret, class... Args>
   class function_list<boost::function<Ret(Args...)>>:
     public function_list<Ret(Args...)>
   {