From 98ecf620f7de377dc8ae9ad7fbd1e3b24477e138 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:11:56 +0200
Subject: 3.17

---
 shared/loki/Factory.h    | 40 ++++++++++++++++++++--------------------
 shared/loki/Register.h   |  4 ++--
 shared/loki/ScopeGuard.h |  2 +-
 shared/loki/Singleton.h  |  6 +++---
 shared/loki/TypeTraits.h |  4 ++--
 5 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'shared/loki')

diff --git a/shared/loki/Factory.h b/shared/loki/Factory.h
index 6a1ac6b7..abf4ab3b 100644
--- a/shared/loki/Factory.h
+++ b/shared/loki/Factory.h
@@ -210,7 +210,7 @@ struct FactoryImpl<AP, Id, Seq<P1, P2, P3, P4, P5, P6> >
     virtual ~FactoryImpl() {}
     virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                              Parm6 )
-    = 0;
+        = 0;
 };
 
 template<typename AP, typename Id,
@@ -229,7 +229,7 @@ struct FactoryImpl<AP, Id, Seq<P1, P2, P3, P4, P5, P6, P7> >
     virtual ~FactoryImpl() {}
     virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                              Parm6, Parm7 )
-    = 0;
+        = 0;
 };
 
 template<typename AP, typename Id,
@@ -249,7 +249,7 @@ struct FactoryImpl<AP, Id, Seq<P1, P2, P3, P4, P5, P6, P7, P8> >
     virtual ~FactoryImpl() {}
     virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                              Parm6, Parm7, Parm8)
-    = 0;
+        = 0;
 };
 
 template<typename AP, typename Id,
@@ -270,7 +270,7 @@ struct FactoryImpl<AP, Id, Seq<P1, P2, P3, P4, P5, P6, P7, P8, P9> >
     virtual ~FactoryImpl() {}
     virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                              Parm6, Parm7, Parm8, Parm9)
-    = 0;
+        = 0;
 };
 
 template<typename AP, typename Id,
@@ -292,7 +292,7 @@ struct FactoryImpl<AP, Id, Seq<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10> >
     virtual ~FactoryImpl() {}
     virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                              Parm6, Parm7, Parm8, Parm9,Parm10)
-    = 0;
+        = 0;
 };
 
 template<typename AP, typename Id,
@@ -317,7 +317,7 @@ struct FactoryImpl<AP, Id, Seq<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11> >
     virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                              Parm6, Parm7, Parm8, Parm9,Parm10,
                              Parm11)
-    = 0;
+        = 0;
 };
 
 template<typename AP, typename Id,
@@ -343,7 +343,7 @@ struct FactoryImpl<AP, Id, Seq<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12
     virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                              Parm6, Parm7, Parm8, Parm9,Parm10,
                              Parm11,Parm12)
-    = 0;
+        = 0;
 };
 
 template<typename AP, typename Id,
@@ -370,7 +370,7 @@ struct FactoryImpl<AP, Id, Seq<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12
     virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                              Parm6, Parm7, Parm8, Parm9,Parm10,
                              Parm11,Parm12,Parm13)
-    = 0;
+        = 0;
 };
 
 template<typename AP, typename Id,
@@ -398,7 +398,7 @@ struct FactoryImpl<AP, Id, Seq<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12
     virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                              Parm6, Parm7, Parm8, Parm8,Parm10,
                              Parm11,Parm12,Parm13,Parm14)
-    = 0;
+        = 0;
 };
 
 template<typename AP, typename Id,
@@ -427,7 +427,7 @@ struct FactoryImpl<AP, Id, Seq<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12
     virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                              Parm6, Parm7, Parm8, Parm9,Parm10,
                              Parm11,Parm12,Parm13,Parm14,Parm15 )
-    = 0;
+        = 0;
 };
 
 #ifndef LOKI_DISABLE_TYPELIST_MACROS
@@ -503,7 +503,7 @@ struct FactoryImpl<AP, Id, LOKI_TYPELIST_6( P1, P2, P3, P4, P5, P6 )>
 virtual ~FactoryImpl() {}
 virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                          Parm6 )
-= 0;
+    = 0;
 };
 
 template<typename AP, typename Id,
@@ -522,7 +522,7 @@ struct FactoryImpl<AP, Id, LOKI_TYPELIST_7( P1, P2, P3, P4, P5, P6, P7 )>
 virtual ~FactoryImpl() {}
 virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                          Parm6, Parm7 )
-= 0;
+    = 0;
 };
 
 template<typename AP, typename Id,
@@ -542,7 +542,7 @@ struct FactoryImpl<AP, Id, LOKI_TYPELIST_8( P1, P2, P3, P4, P5, P6, P7, P8 )>
 virtual ~FactoryImpl() {}
 virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                          Parm6, Parm7, Parm8)
-= 0;
+    = 0;
 };
 
 template<typename AP, typename Id,
@@ -563,7 +563,7 @@ struct FactoryImpl<AP, Id, LOKI_TYPELIST_9( P1, P2, P3, P4, P5, P6, P7, P8, P9 )
 virtual ~FactoryImpl() {}
 virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                          Parm6, Parm7, Parm8, Parm9)
-= 0;
+    = 0;
 };
 
 template<typename AP, typename Id,
@@ -585,7 +585,7 @@ struct FactoryImpl<AP, Id, LOKI_TYPELIST_10( P1, P2, P3, P4, P5, P6, P7, P8, P9,
 virtual ~FactoryImpl() {}
 virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                          Parm6, Parm7, Parm8, Parm9,Parm10)
-= 0;
+    = 0;
 };
 
 template<typename AP, typename Id,
@@ -610,7 +610,7 @@ virtual ~FactoryImpl() {}
 virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                          Parm6, Parm7, Parm8, Parm9,Parm10,
                          Parm11)
-= 0;
+    = 0;
 };
 
 template<typename AP, typename Id,
@@ -636,7 +636,7 @@ virtual ~FactoryImpl() {}
 virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                          Parm6, Parm7, Parm8, Parm9,Parm10,
                          Parm11,Parm12)
-= 0;
+    = 0;
 };
 
 template<typename AP, typename Id,
@@ -663,7 +663,7 @@ virtual ~FactoryImpl() {}
 virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                          Parm6, Parm7, Parm8, Parm9,Parm10,
                          Parm11,Parm12,Parm13)
-= 0;
+    = 0;
 };
 
 template<typename AP, typename Id,
@@ -691,7 +691,7 @@ virtual ~FactoryImpl() {}
 virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                          Parm6, Parm7, Parm8, Parm8,Parm10,
                          Parm11,Parm12,Parm13,Parm14)
-= 0;
+    = 0;
 };
 
 template<typename AP, typename Id,
@@ -720,7 +720,7 @@ virtual ~FactoryImpl() {}
 virtual AP* CreateObject(const Id& id,Parm1, Parm2, Parm3, Parm4, Parm5,
                          Parm6, Parm7, Parm8, Parm9,Parm10,
                          Parm11,Parm12,Parm13,Parm14,Parm15 )
-= 0;
+    = 0;
 };
 
 #endif //LOKI_DISABLE_TYPELIST_MACROS
diff --git a/shared/loki/Register.h b/shared/loki/Register.h
index 0edf4a37..32409f4b 100644
--- a/shared/loki/Register.h
+++ b/shared/loki/Register.h
@@ -81,7 +81,7 @@ struct UnRegisterOnDeleteElement
 template<typename ElementList>
 struct RegisterOnCreateSet
         : GenScatterHierarchy<ElementList, Private::RegisterOnCreateElement>
-    {};
+{};
 
 ////////////////////////////////////////////////////////////////////////////////
 ///  \class UnRegisterOnDeleteSet
@@ -95,7 +95,7 @@ struct RegisterOnCreateSet
 template<typename ElementList>
 struct UnRegisterOnDeleteSet
         : GenScatterHierarchy<ElementList, Private::UnRegisterOnDeleteElement>
-    {};
+{};
 
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/shared/loki/ScopeGuard.h b/shared/loki/ScopeGuard.h
index 0b5445f5..46e4d892 100644
--- a/shared/loki/ScopeGuard.h
+++ b/shared/loki/ScopeGuard.h
@@ -66,7 +66,7 @@ protected:
                 j.Execute();
             }
             catch(...)
-                {}
+            {}
     }
 
     mutable bool dismissed_;
diff --git a/shared/loki/Singleton.h b/shared/loki/Singleton.h
index 40cc7550..c5f1f567 100644
--- a/shared/loki/Singleton.h
+++ b/shared/loki/Singleton.h
@@ -567,21 +567,21 @@ public:
 ///  \brief  Longest possible SingletonWithLongevity lifetime: 0xFFFFFFFF
 template <class T>
 struct DieLast  : SingletonFixedLongevity<0xFFFFFFFF ,T>
-    {};
+{};
 
 ///  \struct DieDirectlyBeforeLast
 ///  \ingroup LongevityLifetimeGroup
 ///  \brief  Lifetime is a one less than DieLast: 0xFFFFFFFF-1
 template <class T>
 struct DieDirectlyBeforeLast  : SingletonFixedLongevity<0xFFFFFFFF-1 ,T>
-    {};
+{};
 
 ///  \struct DieFirst
 ///  \ingroup LongevityLifetimeGroup
 ///  \brief  Shortest possible SingletonWithLongevity lifetime: 0
 template <class T>
 struct DieFirst : SingletonFixedLongevity<0,T>
-    {};
+{};
 
 }//namespace LongevityLifetime
 
diff --git a/shared/loki/TypeTraits.h b/shared/loki/TypeTraits.h
index 00ef069e..2d5af757 100644
--- a/shared/loki/TypeTraits.h
+++ b/shared/loki/TypeTraits.h
@@ -154,7 +154,7 @@ template <> struct AddParameterType<void>
 
 template <typename T>
 struct IsFunctionPointerRaw
-    {enum {result = 0};};
+{enum {result = 0};};
 
 template <typename T>
 struct IsFunctionPointerRaw<T(*)()>
@@ -531,7 +531,7 @@ struct IsFunctionPointerRaw<T(*)(
 
 template <typename T>
 struct IsMemberFunctionPointerRaw
-    {enum {result = 0};};
+{enum {result = 0};};
 
 template <typename T, typename S>
 struct IsMemberFunctionPointerRaw<T (S::*)()>
-- 
cgit