diff --git a/src/gsi/gsi/gsiTypes.h b/src/gsi/gsi/gsiTypes.h index ad806fcca..bdc66b928 100644 --- a/src/gsi/gsi/gsiTypes.h +++ b/src/gsi/gsi/gsiTypes.h @@ -448,7 +448,6 @@ template struct type_traits > : generic_type_trait template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; -template <> struct type_traits > : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; #if QT_VERSION >= 0x50000 template struct type_traits > : generic_type_traits { }; @@ -459,6 +458,7 @@ template <> struct type_traits : generic_type_trait template <> struct type_traits : generic_type_traits { }; #endif #endif +template <> struct type_traits > : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; @@ -492,7 +492,6 @@ template struct type_traits &> : generic_ty template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; -template <> struct type_traits &> : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; #if QT_VERSION >= 0x50000 template struct type_traits &> : generic_type_traits { }; @@ -503,6 +502,7 @@ template <> struct type_traits : generic_type_trait template <> struct type_traits : generic_type_traits { }; #endif #endif +template <> struct type_traits &> : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; @@ -533,7 +533,6 @@ template struct type_traits &> : generic_type_tra template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; -template <> struct type_traits &> : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; #if QT_VERSION >= 0x50000 template struct type_traits &> : generic_type_traits { }; @@ -544,6 +543,7 @@ template <> struct type_traits : generic_type_trait template <> struct type_traits : generic_type_traits { }; #endif #endif +template <> struct type_traits &> : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; @@ -575,7 +575,6 @@ template struct type_traits *> : generic_ty template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; -template <> struct type_traits *> : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; #if QT_VERSION >= 0x50000 template struct type_traits *> : generic_type_traits { }; @@ -586,6 +585,7 @@ template <> struct type_traits : generic_type_trait template <> struct type_traits : generic_type_traits { }; #endif #endif +template <> struct type_traits *> : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; @@ -617,7 +617,6 @@ template struct type_traits *> : generic_type_t template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; -template <> struct type_traits *> : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; #if QT_VERSION >= 0x50000 template struct type_traits *> : generic_type_traits { }; @@ -628,6 +627,7 @@ template <> struct type_traits : generic_type_trait template <> struct type_traits : generic_type_traits { }; #endif #endif +template <> struct type_traits *> : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; template <> struct type_traits : generic_type_traits { }; diff --git a/src/klayout.pro b/src/klayout.pro index 3286b667f..228db95b3 100644 --- a/src/klayout.pro +++ b/src/klayout.pro @@ -74,12 +74,12 @@ ant.depends += layview img.depends += layview edt.depends += layview +plugins.depends += lib rdb db ant + equals(HAVE_PYTHON, "1") { pymod.depends += layview ant img edt lym } -plugins.depends += lib rdb db ant - equals(HAVE_RUBY, "1") { MAIN_DEPENDS += drc lvs drc.depends += rdb lym