clang compatibility

Fixed some compile issues with clang and
some warnings.

scripts/mkqtdecl_common/produce.rb

@@ -1833,7 +1833,7 @@ END
 
     ofile.puts("")
     ofile.puts("// -----------------------------------------------------------------------")
-    ofile.puts("// class #{cls}")
+    ofile.puts("// #{struct.kind.to_s} #{cls}")
 
     if has_metaobject
 
@@ -2287,7 +2287,7 @@ END
 
     if !is_child_class
       # only for top-level classes external declarations are produced currently
-      @ext_decls << "class #{cls};\nnamespace gsi { GSIQT_PUBLIC gsi::Class<#{cls}> &qtdecl_#{clsn} (); }\n\n"
+      @ext_decls << "#{struct.kind.to_s} #{cls};\nnamespace gsi { GSIQT_PUBLIC gsi::Class<#{cls}> &qtdecl_#{clsn} (); }\n\n"
     end
 
     ofile.puts("")
@@ -2835,7 +2835,7 @@ END
     if cls =~ /^(.*?)::/
       ttfile.puts("#include <#{$1}>")
     else
-      ttfile.puts("class #{cls};")
+      ttfile.puts("#{struct.kind.to_s} #{cls};")
     end
 
     ttfile.puts("namespace tl {")

src/db/dbArray.h

@@ -2213,7 +2213,7 @@ private:
   trans_type m_trans;
   basic_array <coord_type> *mp_base;
 
-  void transform_into_from (const unit_trans_type &tr, const array<Obj, Trans> &d)
+  void transform_into_from (const unit_trans_type & /*tr*/, const array<Obj, Trans> & /*d*/)
   {
     //  .. nothing to do ..
   }
@@ -2249,7 +2249,7 @@ private:
     set_complex (t.mag (), t.rcos (), d);
   }
 
-  void translate_from (const unit_trans_type &tr, const array<Obj, Trans> &d, db::generic_repository<coord_type> &rep, db::ArrayRepository &array_rep)
+  void translate_from (const unit_trans_type & /*tr*/, const array<Obj, Trans> & /*d*/, db::generic_repository<coord_type> & /*rep*/, db::ArrayRepository & /*array_rep*/)
   {
     //  .. nothing to do ..
   }
@@ -2297,7 +2297,7 @@ private:
     }
   }
 
-  void transform_from (const unit_trans_type &tr, const array<Obj, Trans> &d)
+  void transform_from (const unit_trans_type & /*tr*/, const array<Obj, Trans> & /*d*/)
   {
     //  .. nothing to do ..
   }

src/db/dbCellHullGenerator.cc

@@ -202,7 +202,7 @@ private:
 const size_t default_complexity = 100;
 
 CellHullGenerator::CellHullGenerator (const db::Layout &layout)
-  : mp_layout (&layout), m_all_layers (true), m_small_cell_size (100), m_complexity (default_complexity)
+  : m_all_layers (true), m_small_cell_size (100), m_complexity (default_complexity)
 {
   for (db::Layout::layer_iterator l = layout.begin_layers (); l != layout.end_layers (); ++l) {
     m_layers.push_back ((*l).first);
@@ -210,7 +210,7 @@ CellHullGenerator::CellHullGenerator (const db::Layout &layout)
 }
 
 CellHullGenerator::CellHullGenerator (const db::Layout &layout, const std::vector <unsigned int> &layers)
-  : mp_layout (&layout), m_all_layers (true), m_small_cell_size (100), m_complexity (default_complexity)
+  : m_all_layers (true), m_small_cell_size (100), m_complexity (default_complexity)
 {
   std::set <unsigned int> ll;
   ll.insert (layers.begin (), layers.end ());

src/db/dbCellHullGenerator.h

@@ -61,7 +61,6 @@ public:
   }
 
 private:
-  const db::Layout *mp_layout;
   std::vector <unsigned int> m_layers;
   bool m_all_layers;
   db::Coord m_small_cell_size;

src/db/dbEdge.h

@@ -589,7 +589,7 @@ public:
    *
    *  @return The transformation that must be applied to render the original edge
    */
-  void reduce (unit_trans<coord_type> &tr)
+  void reduce (unit_trans<coord_type> & /*tr*/)
   {
     //  .. no reduction possible ..
   }

src/db/dbLibraryManager.cc

@@ -34,6 +34,7 @@
 namespace tl
 {
   template<> DB_PUBLIC tl::Registrar<db::Library> *tl::Registrar<db::Library>::instance = 0;
+  template class DB_PUBLIC tl::RegisteredClass<db::Library>;
 }
 
 namespace db

src/db/dbLibraryManager.h

@@ -152,11 +152,6 @@ private:
 
 }
 
-namespace tl
-{
-  //  make registration available to external DLL's
-  template class DB_PUBLIC tl::RegisteredClass<db::Library>;
-}
 
 #endif
 

src/db/dbPCellVariant.h

@@ -151,7 +151,6 @@ protected:
 private:
   pcell_parameters_type m_parameters;
   mutable std::string m_display_name;
-  mutable bool m_valid_display_name;
   size_t m_pcell_id;
   bool m_registered;
 };

src/db/dbPolygon.h

@@ -2665,7 +2665,7 @@ public:
    *
    *  Asserts, if begin called.
    */
-  const contour_type &hole (unsigned int h) const
+  const contour_type &hole (unsigned int /*h*/) const
   {
     tl_assert (false);
     return hull (); // to please the compiler

src/db/dbPolygonGenerators.cc

@@ -153,7 +153,7 @@ class PGContourList
 {
 public:
   PGContourList () 
-    : m_free_contours (-1), m_next_id (1)
+    : m_free_contours (-1)
   { }
 
   PGPolyContour &operator[] (size_t n) 
@@ -240,7 +240,6 @@ public:
 
 private:
   long m_free_contours;
-  size_t m_next_id;
   std::vector <PGPolyContour> m_contours;
 };
 

src/db/dbPolygonTools.cc

@@ -694,7 +694,7 @@ smooth_contour (db::Polygon::polygon_contour_iterator from, db::Polygon::polygon
 
       bool can_drop = false;
 
-      if (db::Coord(p1.distance(p0)) <= d && db::sprod_sign (p2 - p1, p0 - pm1) > 0 && abs (db::vprod (p2 - p1, p0 - pm1)) < 0.8 * p2.distance (p1) * p0.distance (pm1)) {
+      if (db::Coord (p1.distance(p0)) <= d && db::sprod_sign (p2 - p1, p0 - pm1) > 0 && std::abs (db::vprod (p2 - p1, p0 - pm1)) < 0.8 * p2.distance (p1) * p0.distance (pm1)) {
         //  jog configurations with small edges are candidates
         can_drop = true;
       } else if (db::vprod_sign (p2 - p1, p1 - p0) < 0) {
@@ -702,7 +702,7 @@ smooth_contour (db::Polygon::polygon_contour_iterator from, db::Polygon::polygon
         can_drop = true;
       } else {
         //  convex corners enclosing a little more than 45 degree are candidates too
-        can_drop = (db::sprod_sign (p2 - p1, p1 - p0) > 0 && abs (db::vprod (p2 - p1, p1 - p0)) < 0.8 * p2.distance (p1) * p1.distance (p0));
+        can_drop = (db::sprod_sign (p2 - p1, p1 - p0) > 0 && std::abs (db::vprod (p2 - p1, p1 - p0)) < 0.8 * p2.distance (p1) * p1.distance (p0));
       }
 
       for (size_t j = pi0; can_drop; ) {

src/db/dbShapeIterator.cc

@@ -31,7 +31,7 @@ namespace db
 
 template <class Sh, class Iter>
 inline db::Shape
-iterator_to_shape (db::Shapes *shapes, const db::layer<Sh, db::unstable_layer_tag> &l, const Iter &iter)
+iterator_to_shape (db::Shapes *shapes, const db::layer<Sh, db::unstable_layer_tag> & /*l*/, const Iter &iter)
 {
   //  for unstable containers, we simply use the pointer as a reference
   return db::Shape (shapes, *iter);

src/db/dbStream.cc

@@ -29,6 +29,7 @@
 namespace tl
 {
   template<> DB_PUBLIC tl::Registrar<db::StreamFormatDeclaration> *tl::Registrar<db::StreamFormatDeclaration>::instance = 0;
+  template class DB_PUBLIC tl::RegisteredClass<db::StreamFormatDeclaration>;
 }
 
 namespace db

src/db/dbStream.h

@@ -107,12 +107,6 @@ public:
 
 }
 
-namespace tl
-{
-  //  make registration available to external DLL's
-  template class DB_PUBLIC tl::RegisteredClass<db::StreamFormatDeclaration>;
-}
-
 #endif
 
 

src/db/dbTilingProcessor.cc

@@ -440,8 +440,7 @@ class TilingProcessorCountFunction
   : public tl::EvalFunction
 {
 public:
-  TilingProcessorCountFunction (TilingProcessor *proc)
+  TilingProcessorCountFunction (TilingProcessor * /*proc*/)
-    : mp_proc (proc)
   {
     //  .. nothing yet ..
   }
@@ -450,9 +449,6 @@ public:
   {
     // TODO: ... implement ..
   }
-
-private:
-  TilingProcessor *mp_proc;
 };
 
 void

src/db/dbTrans.h

@@ -318,7 +318,7 @@ struct unit_trans
  */
 template <class C>
 inline unit_trans<C> 
-operator* (const unit_trans<C> &t1, const unit_trans<C> &t2)
+operator* (const unit_trans<C> & /*t1*/, const unit_trans<C> & /*t2*/)
 {
   return unit_trans<C>();
 }

src/db/dbUserObject.cc

@@ -27,7 +27,9 @@
 namespace tl
 {
   template<> DB_PUBLIC tl::Registrar<db::user_object_factory_base<db::Coord> > *tl::Registrar<db::user_object_factory_base<db::Coord> >::instance = 0;
+  template class DB_PUBLIC tl::RegisteredClass<db::user_object_factory_base<db::Coord> >;
   template<> DB_PUBLIC tl::Registrar<db::user_object_factory_base<db::DCoord> > *tl::Registrar<db::user_object_factory_base<db::DCoord> >::instance = 0;
+  template class DB_PUBLIC tl::RegisteredClass<db::user_object_factory_base<db::DCoord> >;
 }
 
 namespace db

src/db/dbUserObject.h

@@ -503,10 +503,6 @@ typedef tl::RegisteredClass<user_object_factory_base<db::DCoord> > DUserObjectDe
 
 namespace tl 
 {
-  //  make registration available to external DLL's
-  template class DB_PUBLIC tl::RegisteredClass<db::user_object_factory_base<db::Coord> >;
-  template class DB_PUBLIC tl::RegisteredClass<db::user_object_factory_base<db::DCoord> >;
-
   /**
    *  @brief The type traits for the user object type
    */

src/edt/edtMainService.cc

@@ -2012,7 +2012,7 @@ class NewObjectsSelection
 {
 public:
   NewObjectsSelection (int cv_index, db::cell_index_type topcell, lay::LayoutView *view)
-    : m_cv_index (cv_index), m_topcell (topcell), mp_view (view)
+    : m_cv_index (cv_index), m_topcell (topcell)
   {
     mp_polygon_service = view->get_plugin <edt::PolygonService> ();
     mp_box_service = view->get_plugin <edt::BoxService> ();
@@ -2071,7 +2071,6 @@ private:
   edt::InstService *mp_inst_service;
   int m_cv_index;
   db::cell_index_type m_topcell;
-  lay::LayoutView *mp_view;
 };
 
 void 

src/edt/edtService.cc

@@ -70,7 +70,6 @@ Service::Service (db::Manager *manager, lay::LayoutView *view, db::ShapeIterator
     m_editing (false), m_immediate (false), 
     m_cell_inst_service (false),
     m_flags (flags),
-    m_line_width (1), m_vertex_size (3),
     m_move_sel (false), m_moving (false),
     m_connect_ac (lay::AC_Any), m_move_ac (lay::AC_Any), m_alt_ac (lay::AC_Global),
     m_snap_to_objects (false),
@@ -92,7 +91,6 @@ Service::Service (db::Manager *manager, lay::LayoutView *view)
     m_editing (false), m_immediate (false), 
     m_cell_inst_service (true),
     m_flags (db::ShapeIterator::Nothing),
-    m_line_width (1), m_vertex_size (3),
     m_move_sel (false), m_moving (false),
     m_connect_ac (lay::AC_Any), m_move_ac (lay::AC_Any), m_alt_ac (lay::AC_Global),
     m_snap_to_objects (true),

src/edt/edtService.h

@@ -532,7 +532,6 @@ private:
 
   //  The look of the markers
   QColor m_color;
-  int m_line_width, m_vertex_size;
 
   //  The current transformation on movement
   db::DTrans m_move_trans;

src/gsi/gsiClass.h

@@ -243,19 +243,6 @@ private:
 // -----------------------------------------------------------------------------
 //  GSI implementation
 
-template <class X> 
-void *_take_and_create (SerialArgs & /*args*/, tl::false_tag /*has_copy_ctor*/)
-{
-  tl_assert (false); // cannot copy object of this type
-  return 0;
-}
-
-template <class X> 
-void *_take_and_create (SerialArgs &from, tl::true_tag /*has_copy_ctor*/)
-{
-  return from.template take_object<X> ();
-}
-
 template <class X> 
 void *_get_vector_of (SerialArgs & /*from*/, const ArgType & /*a*/, void * /*data*/, void (* /*cb*/) (void * /*data*/, void * /*obj*/), tl::false_tag /*has_copy_ctor*/) 
 {

src/gsi/gsiExpression.cc

@@ -1092,7 +1092,7 @@ initialize_expressions ()
 //  VariantUserClassImpl implementation
 
 VariantUserClassImpl::VariantUserClassImpl () 
-  : mp_cls (0), mp_self (0), mp_object_cls (0), m_reference (false), m_is_const (false)
+  : mp_cls (0), mp_self (0), mp_object_cls (0), m_is_const (false)
 { 
   //  .. nothing yet ..
 }

src/gsi/gsiExpression.h

@@ -35,7 +35,7 @@ namespace gsi
 {
 
 class ClassBase;
-class NoAdaptorTag;
+struct NoAdaptorTag;
 template <class T, class A> class Class;
 
 /**
@@ -59,7 +59,7 @@ public:
 private:
   const gsi::ClassBase *mp_cls;
   const tl::VariantUserClassBase *mp_self, *mp_object_cls;
-  bool m_reference, m_is_const;
+  bool m_is_const;
 
   virtual void execute_gsi (const tl::ExpressionParserContext &context, tl::Variant &out, tl::Variant &object, const std::string &method, const std::vector<tl::Variant> &args) const;
 

src/gsi/gsiMethodsVar.h

@@ -813,9 +813,9 @@ public:
   }
 
 #if _COUNT != 0
-  virtual void call (void *cls, SerialArgs &args, SerialArgs &ret) const 
+  virtual void call (void * /*cls*/, SerialArgs &args, SerialArgs &ret) const
 #else
-  virtual void call (void *cls, SerialArgs &, SerialArgs &ret) const 
+  virtual void call (void * /*cls*/, SerialArgs &, SerialArgs &ret) const
 #endif
   {
     this->mark_called ();
@@ -862,9 +862,9 @@ public:
   }
 
 #if _COUNT != 0
-  virtual void call (void *cls, SerialArgs &args, SerialArgs &ret) const 
+  virtual void call (void * /*cls*/, SerialArgs &args, SerialArgs &ret) const
 #else
-  virtual void call (void *cls, SerialArgs &, SerialArgs &ret) const 
+  virtual void call (void * /*cls*/, SerialArgs &, SerialArgs &ret) const
 #endif
   {
     this->mark_called ();
@@ -1249,9 +1249,9 @@ public:
   }
 
 #if _COUNT != 0
-  virtual void call (void *cls, SerialArgs &args, SerialArgs &ret) const 
+  virtual void call (void * /*cls*/, SerialArgs &args, SerialArgs &ret) const
 #else
-  virtual void call (void *cls, SerialArgs &, SerialArgs &ret) const 
+  virtual void call (void * /*cls*/, SerialArgs &, SerialArgs &ret) const
 #endif
   {
     this->mark_called ();

src/gsi/gsiTypes.h

@@ -61,7 +61,7 @@ class MapAdaptor;
 class StringAdaptor;
 class VariantAdaptor;
 class ClassBase;
-class NoAdaptorTag;
+struct NoAdaptorTag;
 template <class X, class A> class Class;
 template <class X> struct ClassTag;
 template <class I> class IterAdaptor;
@@ -1376,8 +1376,9 @@ public:
  *  is an iterator delivering the given types of a vector of the given types and
  *  adds class informations if the type is "T_object", "T_object_ref", "T_object_cref". 
  */
-struct GSI_PUBLIC ArgType
+class GSI_PUBLIC ArgType
 {
+public:
   /**
    *  @brief Default constructor
    *

src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QAbstractTextDocumentLayout::PaintContext
+// struct QAbstractTextDocumentLayout::PaintContext
 
 //  Constructor QAbstractTextDocumentLayout::PaintContext::PaintContext()
 

src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_Selection.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QAbstractTextDocumentLayout::Selection
+// struct QAbstractTextDocumentLayout::Selection
 
 //  Constructor QAbstractTextDocumentLayout::Selection::Selection()
 

src/gsiqt4/gsiDeclQFactoryInterface.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QFactoryInterface
+// struct QFactoryInterface
 
 // QStringList QFactoryInterface::keys()
 

src/gsiqt4/gsiDeclQMetaObject.cc

@@ -39,7 +39,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QMetaObject
+// struct QMetaObject
 
 //  Constructor QMetaObject::QMetaObject()
 

src/gsiqt4/gsiDeclQTextCodec_ConverterState.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QTextCodec::ConverterState
+// struct QTextCodec::ConverterState
 
 //  Constructor QTextCodec::ConverterState::ConverterState(QFlags<QTextCodec::ConversionFlag> f)
 

src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QTextEdit::ExtraSelection
+// struct QTextEdit::ExtraSelection
 
 //  Constructor QTextEdit::ExtraSelection::ExtraSelection()
 

src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QTextLayout::FormatRange
+// struct QTextLayout::FormatRange
 
 //  Constructor QTextLayout::FormatRange::FormatRange()
 

src/gsiqt4/gsiDeclQTextOption_Tab.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QTextOption::Tab
+// struct QTextOption::Tab
 
 //  Constructor QTextOption::Tab::Tab()
 

src/gsiqt4/gsiDeclQtTypeTraits.h

@@ -1198,7 +1198,7 @@ template <> struct type_traits<QEventLoop_Adaptor> : public type_traits<void> {
 };
 }
 
-class QFactoryInterface;
+struct QFactoryInterface;
 namespace tl {
 template <> struct type_traits<QFactoryInterface> : public type_traits<void> {
   typedef tl::false_tag has_copy_constructor;
@@ -2775,7 +2775,7 @@ template <> struct type_traits<QMetaMethod> : public type_traits<void> {
 };
 }
 
-class QMetaObject;
+struct QMetaObject;
 namespace tl {
 template <> struct type_traits<QMetaObject> : public type_traits<void> {
 };

src/gsiqt4/gsiQtExternals.h

@@ -339,7 +339,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class<QEvent> &qtdecl_QEvent (); }
 class QEventLoop;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QEventLoop> &qtdecl_QEventLoop (); }
 
-class QFactoryInterface;
+struct QFactoryInterface;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QFactoryInterface> &qtdecl_QFactoryInterface (); }
 
 class QFile;
@@ -729,7 +729,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class<QMetaEnum> &qtdecl_QMetaEnum (); }
 class QMetaMethod;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMetaMethod> &qtdecl_QMetaMethod (); }
 
-class QMetaObject;
+struct QMetaObject;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMetaObject> &qtdecl_QMetaObject (); }
 
 class QMetaProperty;

src/gsiqt5/gsiDeclQAbstractEventDispatcher_TimerInfo.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QAbstractEventDispatcher::TimerInfo
+// struct QAbstractEventDispatcher::TimerInfo
 
 //  Constructor QAbstractEventDispatcher::TimerInfo::TimerInfo(int id, int i, Qt::TimerType t)
 

src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QAbstractTextDocumentLayout::PaintContext
+// struct QAbstractTextDocumentLayout::PaintContext
 
 //  Constructor QAbstractTextDocumentLayout::PaintContext::PaintContext()
 

src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_Selection.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QAbstractTextDocumentLayout::Selection
+// struct QAbstractTextDocumentLayout::Selection
 
 //  Constructor QAbstractTextDocumentLayout::Selection::Selection()
 

src/gsiqt5/gsiDeclQAccessible_State.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QAccessible::State
+// struct QAccessible::State
 
 //  Constructor QAccessible::State::State()
 

src/gsiqt5/gsiDeclQAudioSystemFactoryInterface.cc

@@ -37,7 +37,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QAudioSystemFactoryInterface
+// struct QAudioSystemFactoryInterface
 
 // QList<QByteArray> QAudioSystemFactoryInterface::availableDevices(QAudio::Mode)
 

src/gsiqt5/gsiDeclQByteArrayDataPtr.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QByteArrayDataPtr
+// struct QByteArrayDataPtr
 
 //  Constructor QByteArrayDataPtr::QByteArrayDataPtr()
 

src/gsiqt5/gsiDeclQCamera_FrameRateRange.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QCamera::FrameRateRange
+// struct QCamera::FrameRateRange
 
 //  Constructor QCamera::FrameRateRange::FrameRateRange()
 

src/gsiqt5/gsiDeclQFactoryInterface.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QFactoryInterface
+// struct QFactoryInterface
 
 // QStringList QFactoryInterface::keys()
 

src/gsiqt5/gsiDeclQIconEngine_AvailableSizesArgument.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QIconEngine::AvailableSizesArgument
+// struct QIconEngine::AvailableSizesArgument
 
 //  Constructor QIconEngine::AvailableSizesArgument::AvailableSizesArgument()
 

src/gsiqt5/gsiDeclQJsonParseError.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QJsonParseError
+// struct QJsonParseError
 
 //  Constructor QJsonParseError::QJsonParseError()
 

src/gsiqt5/gsiDeclQMapDataBase.cc

@@ -35,7 +35,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QMapDataBase
+// struct QMapDataBase
 
 //  Constructor QMapDataBase::QMapDataBase()
 

src/gsiqt5/gsiDeclQMapNodeBase.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QMapNodeBase
+// struct QMapNodeBase
 
 //  Constructor QMapNodeBase::QMapNodeBase()
 

src/gsiqt5/gsiDeclQMediaServiceCameraInfoInterface.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QMediaServiceCameraInfoInterface
+// struct QMediaServiceCameraInfoInterface
 
 // int QMediaServiceCameraInfoInterface::cameraOrientation(const QByteArray &device)
 

src/gsiqt5/gsiDeclQMediaServiceDefaultDeviceInterface.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QMediaServiceDefaultDeviceInterface
+// struct QMediaServiceDefaultDeviceInterface
 
 // QByteArray QMediaServiceDefaultDeviceInterface::defaultDevice(const QByteArray &service)
 

src/gsiqt5/gsiDeclQMediaServiceFeaturesInterface.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QMediaServiceFeaturesInterface
+// struct QMediaServiceFeaturesInterface
 
 // QFlags<QMediaServiceProviderHint::Feature> QMediaServiceFeaturesInterface::supportedFeatures(const QByteArray &service)
 

src/gsiqt5/gsiDeclQMediaServiceProviderFactoryInterface.cc

@@ -35,7 +35,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QMediaServiceProviderFactoryInterface
+// struct QMediaServiceProviderFactoryInterface
 
 // QMediaService *QMediaServiceProviderFactoryInterface::create(QString const &key)
 

src/gsiqt5/gsiDeclQMediaServiceSupportedDevicesInterface.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QMediaServiceSupportedDevicesInterface
+// struct QMediaServiceSupportedDevicesInterface
 
 // QString QMediaServiceSupportedDevicesInterface::deviceDescription(const QByteArray &service, const QByteArray &device)
 

src/gsiqt5/gsiDeclQMediaServiceSupportedFormatsInterface.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QMediaServiceSupportedFormatsInterface
+// struct QMediaServiceSupportedFormatsInterface
 
 // QMultimedia::SupportEstimate QMediaServiceSupportedFormatsInterface::hasSupport(const QString &mimeType, const QStringList &codecs)
 

src/gsiqt5/gsiDeclQMetaObject.cc

@@ -39,7 +39,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QMetaObject
+// struct QMetaObject
 
 //  Constructor QMetaObject::QMetaObject()
 

src/gsiqt5/gsiDeclQPagedPaintDevice_Margins.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QPagedPaintDevice::Margins
+// struct QPagedPaintDevice::Margins
 
 //  Constructor QPagedPaintDevice::Margins::Margins()
 

src/gsiqt5/gsiDeclQStaticPlugin.cc

@@ -35,7 +35,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QStaticPlugin
+// struct QStaticPlugin
 
 //  Constructor QStaticPlugin::QStaticPlugin()
 

src/gsiqt5/gsiDeclQStringDataPtr.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QStringDataPtr
+// struct QStringDataPtr
 
 //  Constructor QStringDataPtr::QStringDataPtr()
 

src/gsiqt5/gsiDeclQTextCodec_ConverterState.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QTextCodec::ConverterState
+// struct QTextCodec::ConverterState
 
 //  Constructor QTextCodec::ConverterState::ConverterState(QFlags<QTextCodec::ConversionFlag> f)
 

src/gsiqt5/gsiDeclQTextEdit_ExtraSelection.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QTextEdit::ExtraSelection
+// struct QTextEdit::ExtraSelection
 
 //  Constructor QTextEdit::ExtraSelection::ExtraSelection()
 

src/gsiqt5/gsiDeclQTextLayout_FormatRange.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QTextLayout::FormatRange
+// struct QTextLayout::FormatRange
 
 //  Constructor QTextLayout::FormatRange::FormatRange()
 

src/gsiqt5/gsiDeclQTextOption_Tab.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QTextOption::Tab
+// struct QTextOption::Tab
 
 //  Constructor QTextOption::Tab::Tab()
 

src/gsiqt5/gsiDeclQTimeZone_OffsetData.cc

@@ -34,7 +34,7 @@
 #include <memory>
 
 // -----------------------------------------------------------------------
-// class QTimeZone::OffsetData
+// struct QTimeZone::OffsetData
 
 //  Constructor QTimeZone::OffsetData::OffsetData()
 

src/gsiqt5/gsiDeclQtTypeTraits.h

@@ -1085,7 +1085,7 @@ template <> struct type_traits<QAudioRecorder_Adaptor> : public type_traits<void
 };
 }
 
-class QAudioSystemFactoryInterface;
+struct QAudioSystemFactoryInterface;
 namespace tl {
 template <> struct type_traits<QAudioSystemFactoryInterface> : public type_traits<void> {
   typedef tl::false_tag has_copy_constructor;
@@ -1196,7 +1196,7 @@ template <> struct type_traits<QButtonGroup_Adaptor> : public type_traits<void>
 };
 }
 
-class QByteArrayDataPtr;
+struct QByteArrayDataPtr;
 namespace tl {
 template <> struct type_traits<QByteArrayDataPtr> : public type_traits<void> {
 };
@@ -2291,7 +2291,7 @@ template <> struct type_traits<QExposeEvent_Adaptor> : public type_traits<void>
 };
 }
 
-class QFactoryInterface;
+struct QFactoryInterface;
 namespace tl {
 template <> struct type_traits<QFactoryInterface> : public type_traits<void> {
   typedef tl::false_tag has_copy_constructor;
@@ -3721,7 +3721,7 @@ template <> struct type_traits<QJsonObject::const_iterator> : public type_traits
 };
 }
 
-class QJsonParseError;
+struct QJsonParseError;
 namespace tl {
 template <> struct type_traits<QJsonParseError> : public type_traits<void> {
 };
@@ -3995,14 +3995,14 @@ template <> struct type_traits<QMainWindow_Adaptor> : public type_traits<void> {
 };
 }
 
-class QMapDataBase;
+struct QMapDataBase;
 namespace tl {
 template <> struct type_traits<QMapDataBase> : public type_traits<void> {
   typedef tl::false_tag has_copy_constructor;
 };
 }
 
-class QMapNodeBase;
+struct QMapNodeBase;
 namespace tl {
 template <> struct type_traits<QMapNodeBase> : public type_traits<void> {
 };
@@ -4292,7 +4292,7 @@ template <> struct type_traits<QMediaService_Adaptor> : public type_traits<void>
 };
 }
 
-class QMediaServiceCameraInfoInterface;
+struct QMediaServiceCameraInfoInterface;
 namespace tl {
 template <> struct type_traits<QMediaServiceCameraInfoInterface> : public type_traits<void> {
   typedef tl::false_tag has_copy_constructor;
@@ -4306,7 +4306,7 @@ template <> struct type_traits<QMediaServiceCameraInfoInterface_Adaptor> : publi
 };
 }
 
-class QMediaServiceDefaultDeviceInterface;
+struct QMediaServiceDefaultDeviceInterface;
 namespace tl {
 template <> struct type_traits<QMediaServiceDefaultDeviceInterface> : public type_traits<void> {
   typedef tl::false_tag has_copy_constructor;
@@ -4320,7 +4320,7 @@ template <> struct type_traits<QMediaServiceDefaultDeviceInterface_Adaptor> : pu
 };
 }
 
-class QMediaServiceFeaturesInterface;
+struct QMediaServiceFeaturesInterface;
 namespace tl {
 template <> struct type_traits<QMediaServiceFeaturesInterface> : public type_traits<void> {
   typedef tl::false_tag has_copy_constructor;
@@ -4334,7 +4334,7 @@ template <> struct type_traits<QMediaServiceFeaturesInterface_Adaptor> : public
 };
 }
 
-class QMediaServiceProviderFactoryInterface;
+struct QMediaServiceProviderFactoryInterface;
 namespace tl {
 template <> struct type_traits<QMediaServiceProviderFactoryInterface> : public type_traits<void> {
   typedef tl::false_tag has_copy_constructor;
@@ -4369,7 +4369,7 @@ template <> struct type_traits<QMediaServiceProviderPlugin_Adaptor> : public typ
 };
 }
 
-class QMediaServiceSupportedDevicesInterface;
+struct QMediaServiceSupportedDevicesInterface;
 namespace tl {
 template <> struct type_traits<QMediaServiceSupportedDevicesInterface> : public type_traits<void> {
   typedef tl::false_tag has_copy_constructor;
@@ -4383,7 +4383,7 @@ template <> struct type_traits<QMediaServiceSupportedDevicesInterface_Adaptor> :
 };
 }
 
-class QMediaServiceSupportedFormatsInterface;
+struct QMediaServiceSupportedFormatsInterface;
 namespace tl {
 template <> struct type_traits<QMediaServiceSupportedFormatsInterface> : public type_traits<void> {
   typedef tl::false_tag has_copy_constructor;
@@ -4552,7 +4552,7 @@ template <> struct type_traits<QMetaMethod> : public type_traits<void> {
 };
 }
 
-class QMetaObject;
+struct QMetaObject;
 namespace tl {
 template <> struct type_traits<QMetaObject> : public type_traits<void> {
 };
@@ -6380,7 +6380,7 @@ template <> struct type_traits<QStateMachine_WrappedEvent_Adaptor> : public type
 };
 }
 
-class QStaticPlugin;
+struct QStaticPlugin;
 namespace tl {
 template <> struct type_traits<QStaticPlugin> : public type_traits<void> {
 };
@@ -6426,7 +6426,7 @@ template <> struct type_traits<QStorageInfo> : public type_traits<void> {
 };
 }
 
-class QStringDataPtr;
+struct QStringDataPtr;
 namespace tl {
 template <> struct type_traits<QStringDataPtr> : public type_traits<void> {
 };

src/gsiqt5/gsiQtExternals.h

@@ -258,7 +258,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class<QAudioProbe> &qtdecl_QAudioProbe (); }
 class QAudioRecorder;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QAudioRecorder> &qtdecl_QAudioRecorder (); }
 
-class QAudioSystemFactoryInterface;
+struct QAudioSystemFactoryInterface;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QAudioSystemFactoryInterface> &qtdecl_QAudioSystemFactoryInterface (); }
 
 class QAudioSystemPlugin;
@@ -291,7 +291,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class<QBuffer> &qtdecl_QBuffer (); }
 class QButtonGroup;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QButtonGroup> &qtdecl_QButtonGroup (); }
 
-class QByteArrayDataPtr;
+struct QByteArrayDataPtr;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QByteArrayDataPtr> &qtdecl_QByteArrayDataPtr (); }
 
 class QByteArrayMatcher;
@@ -603,7 +603,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class<QEventTransition> &qtdecl_QEventTransiti
 class QExposeEvent;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QExposeEvent> &qtdecl_QExposeEvent (); }
 
-class QFactoryInterface;
+struct QFactoryInterface;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QFactoryInterface> &qtdecl_QFactoryInterface (); }
 
 class QFile;
@@ -942,7 +942,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class<QJsonDocument> &qtdecl_QJsonDocument ();
 class QJsonObject;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QJsonObject> &qtdecl_QJsonObject (); }
 
-class QJsonParseError;
+struct QJsonParseError;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QJsonParseError> &qtdecl_QJsonParseError (); }
 
 class QJsonValue;
@@ -1023,10 +1023,10 @@ namespace gsi { GSIQT_PUBLIC gsi::Class<QLoggingCategory> &qtdecl_QLoggingCatego
 class QMainWindow;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMainWindow> &qtdecl_QMainWindow (); }
 
-class QMapDataBase;
+struct QMapDataBase;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMapDataBase> &qtdecl_QMapDataBase (); }
 
-class QMapNodeBase;
+struct QMapNodeBase;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMapNodeBase> &qtdecl_QMapNodeBase (); }
 
 class QMargins;
@@ -1095,16 +1095,16 @@ namespace gsi { GSIQT_PUBLIC gsi::Class<QMediaResource> &qtdecl_QMediaResource (
 class QMediaService;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMediaService> &qtdecl_QMediaService (); }
 
-class QMediaServiceCameraInfoInterface;
+struct QMediaServiceCameraInfoInterface;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMediaServiceCameraInfoInterface> &qtdecl_QMediaServiceCameraInfoInterface (); }
 
-class QMediaServiceDefaultDeviceInterface;
+struct QMediaServiceDefaultDeviceInterface;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMediaServiceDefaultDeviceInterface> &qtdecl_QMediaServiceDefaultDeviceInterface (); }
 
-class QMediaServiceFeaturesInterface;
+struct QMediaServiceFeaturesInterface;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMediaServiceFeaturesInterface> &qtdecl_QMediaServiceFeaturesInterface (); }
 
-class QMediaServiceProviderFactoryInterface;
+struct QMediaServiceProviderFactoryInterface;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMediaServiceProviderFactoryInterface> &qtdecl_QMediaServiceProviderFactoryInterface (); }
 
 class QMediaServiceProviderHint;
@@ -1113,10 +1113,10 @@ namespace gsi { GSIQT_PUBLIC gsi::Class<QMediaServiceProviderHint> &qtdecl_QMedi
 class QMediaServiceProviderPlugin;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMediaServiceProviderPlugin> &qtdecl_QMediaServiceProviderPlugin (); }
 
-class QMediaServiceSupportedDevicesInterface;
+struct QMediaServiceSupportedDevicesInterface;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMediaServiceSupportedDevicesInterface> &qtdecl_QMediaServiceSupportedDevicesInterface (); }
 
-class QMediaServiceSupportedFormatsInterface;
+struct QMediaServiceSupportedFormatsInterface;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMediaServiceSupportedFormatsInterface> &qtdecl_QMediaServiceSupportedFormatsInterface (); }
 
 class QMediaStreamsControl;
@@ -1164,7 +1164,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class<QMetaEnum> &qtdecl_QMetaEnum (); }
 class QMetaMethod;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMetaMethod> &qtdecl_QMetaMethod (); }
 
-class QMetaObject;
+struct QMetaObject;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QMetaObject> &qtdecl_QMetaObject (); }
 
 class QMetaProperty;
@@ -1656,7 +1656,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class<QState> &qtdecl_QState (); }
 class QStateMachine;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QStateMachine> &qtdecl_QStateMachine (); }
 
-class QStaticPlugin;
+struct QStaticPlugin;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QStaticPlugin> &qtdecl_QStaticPlugin (); }
 
 class QStaticText;
@@ -1671,7 +1671,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class<QStatusTipEvent> &qtdecl_QStatusTipEvent
 class QStorageInfo;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QStorageInfo> &qtdecl_QStorageInfo (); }
 
-class QStringDataPtr;
+struct QStringDataPtr;
 namespace gsi { GSIQT_PUBLIC gsi::Class<QStringDataPtr> &qtdecl_QStringDataPtr (); }
 
 class QStringListModel;

src/img/imgLandmarksDialog.cc

@@ -146,7 +146,7 @@ class LandmarkEditorService
 public:
   LandmarkEditorService (lay::LayoutView *view, img::Object *img)
     : lay::ViewService (view->view_object_widget ()), 
-      mp_view (view), mp_image (img), m_selected (-1), m_dragging (false), 
+      mp_image (img), m_selected (-1), m_dragging (false),
       m_mode (LandmarksDialog::None)
   {
     update ();
@@ -362,7 +362,6 @@ public:
   tl::Event updated_event;
 
 private:
-  lay::LayoutView *mp_view;
   img::Object *mp_image;
   std::vector<LandmarkMarker *> m_markers;
   int m_selected;

src/lay/layHelpProvider.cc

@@ -27,10 +27,6 @@
 namespace lay
 {
 
-//  registration point for help providers
-template<>
-tl::Registrar<lay::HelpProvider> *tl::Registrar<lay::HelpProvider>::instance = 0;
-
 // --------------------------------------------------------------------------------------
 //  HelpProvider implementation
 
@@ -41,3 +37,9 @@ HelpProvider::HelpProvider ()
 
 }
 
+namespace tl
+{
+  //  registration point for help providers
+  template<>
+  tl::Registrar<lay::HelpProvider> *Registrar<lay::HelpProvider>::instance = 0;
+}

src/lay/layMacroInterpreter.cc

@@ -31,9 +31,6 @@
 namespace lay
 {
 
-template<>
-tl::Registrar<lay::MacroInterpreter> *tl::Registrar<lay::MacroInterpreter>::instance = 0;
-
 void 
 MacroInterpreter::execute (const lay::Macro *) const
 {
@@ -126,3 +123,8 @@ MacroInterpreter::suffix (const std::string &dsl_name)
 
 }
 
+namespace tl
+{
+  template<> tl::Registrar<lay::MacroInterpreter> *Registrar<lay::MacroInterpreter>::instance = 0;
+  template class LAY_PUBLIC tl::RegisteredClass<lay::MacroInterpreter>;
+}

src/lay/layMacroInterpreter.h

@@ -179,12 +179,6 @@ public:
 
 }
 
-namespace tl
-{
-  //  make registration available to external DLL's
-  template class LAY_PUBLIC tl::RegisteredClass<lay::MacroInterpreter>;
-}
-
 #endif
 
 

src/laybasic/layDrawing.cc

@@ -28,7 +28,7 @@ namespace lay
 {
 
 Drawing::Drawing (unsigned int num_planes, Drawings *drawings)
-  : m_num_planes (num_planes), mp_drawings (drawings)
+  : m_num_planes (num_planes)
 {
   drawings->push_back (this);
 }

src/laybasic/layDrawing.h

@@ -127,7 +127,6 @@ public:
 
 private:
   unsigned int m_num_planes;
-  Drawings *mp_drawings;
 };
 
 /**

src/laybasic/layParsedLayerSource.h

@@ -42,7 +42,7 @@ namespace db
 namespace lay 
 {
 
-struct LayerProperties;
+class LayerProperties;
 class LayoutView;
 class PropertySelectorBase;
 

src/laybasic/layPlugin.cc

@@ -45,7 +45,6 @@ namespace lay
 //  PluginDeclaration implementation
 
 static int s_next_id = 0;
-template<> LAYBASIC_PUBLIC tl::Registrar<lay::PluginDeclaration> *tl::Registrar<lay::PluginDeclaration>::instance = 0;
 
 PluginDeclaration::PluginDeclaration ()
   : m_id (++s_next_id), m_editable_enabled (true)
@@ -581,3 +580,8 @@ PluginRoot::instance ()
 
 }
 
+namespace tl
+{
+  template<> LAYBASIC_PUBLIC Registrar<lay::PluginDeclaration> *tl::Registrar<lay::PluginDeclaration>::instance = 0;
+  template class LAYBASIC_PUBLIC tl::RegisteredClass<lay::PluginDeclaration>;
+}

src/laybasic/layPlugin.h

@@ -871,9 +871,6 @@ inline bool test_and_set (T &target, const T &source)
 
 namespace tl
 {
-  //  make registration available to external DLL's
-  template class LAYBASIC_PUBLIC tl::RegisteredClass<lay::PluginDeclaration>;
-
   //  disable copy ctor for PluginRoot
   template <> struct type_traits<lay::PluginRoot> : public type_traits<void> {
     typedef tl::false_tag has_copy_constructor;

src/laybasic/layRedrawLayerInfo.h

@@ -31,7 +31,7 @@
 
 namespace lay {
 
-struct LayerProperties;
+class LayerProperties;
 
 /**
  *  @brief A helper struct to describe one entry in the redraw queue

src/rba/rba.h

@@ -52,7 +52,7 @@ public:
   { }
 };
 
-class RubyInterpreterPrivateData;
+struct RubyInterpreterPrivateData;
 
 /**
  *  @brief The ruby interpreter wrapper class

src/rdb/rdbFile.cc

@@ -190,10 +190,12 @@ class StandardFormatDeclaration
 
 static tl::RegisteredClass<rdb::FormatDeclaration> format_decl (new StandardFormatDeclaration (), 0, "KLayout-RDB");
 
-// -------------------------------------------------------------
-
-template<>
-RDB_PUBLIC tl::Registrar<rdb::FormatDeclaration> *tl::Registrar<rdb::FormatDeclaration>::instance = 0;
-
 }
 
+// -------------------------------------------------------------
+
+namespace tl
+{
+  template<> RDB_PUBLIC tl::Registrar<rdb::FormatDeclaration> *tl::Registrar<rdb::FormatDeclaration>::instance = 0;
+  template class RDB_PUBLIC tl::RegisteredClass<rdb::FormatDeclaration>;
+}

src/rdb/rdbReader.h

@@ -160,10 +160,5 @@ private:
 
 }
 
-namespace tl {
-  //  make registration available to external DLL's
-  template class RDB_PUBLIC tl::RegisteredClass<rdb::FormatDeclaration>;
-}
-
 #endif
 

src/tl/tlFileSystemWatcher.cc

@@ -31,9 +31,6 @@
 namespace tl
 {
 
-//  Timer interval (in ms)
-const int timer_interval = 100;
-
 //  The maximum allowed processing tim
 const int processing_time = 20;
 

src/tl/tlObjectCollection.h

@@ -447,6 +447,10 @@ template <class T>
 class weak_collection
   : public weak_or_shared_collection<T, false>
 {
+public:
+  weak_collection ()
+    : weak_or_shared_collection<T, false> ()
+  { }
 };
 
 /**
@@ -456,6 +460,10 @@ template <class T>
 class shared_collection
   : public weak_or_shared_collection<T, true>
 {
+public:
+  shared_collection ()
+    : weak_or_shared_collection<T, true> ()
+  { }
 };
 
 }

src/tl/tlVariant.h

@@ -43,7 +43,7 @@
 namespace gsi
 {
   class ClassBase;
-  class NoAdaptorTag;
+  struct NoAdaptorTag;
   template <class T, class A> class Class;
   template <class X> const ClassBase *cls_decl ();
 }

src/unit_tests/gsiTest.h

@@ -245,7 +245,7 @@ struct A_NC
   A_NC (int nn) : A (nn) { }
   
 private:
-  friend class B;
+  friend struct B;
 
   A_NC (const A_NC &a) : A (a) { }
   A_NC &operator= (const A_NC &);

src/unit_tests/tlClassRegistry.cc

@@ -113,7 +113,9 @@ TEST(3)
 
 }
 
-template <> tl::Registrar<class_registry_test::X> *tl::Registrar<class_registry_test::X>::instance = 0;
+namespace tl
-template <> tl::Registrar<class_registry_test::A> *tl::Registrar<class_registry_test::A>::instance = 0;
+{
-
+  template <> tl::Registrar<class_registry_test::X> *Registrar<class_registry_test::X>::instance = 0;
+  template <> tl::Registrar<class_registry_test::A> *Registrar<class_registry_test::A>::instance = 0;
+}
 

src/unit_tests/tlDeferredExecution.cc

@@ -44,8 +44,6 @@ public:
 
 TEST(1) 
 {
-  tl::DeferredMethodScheduler scheduler ();
-
   g_na = g_nb = 0;
 
   QCoreApplication::instance ()->processEvents ();