X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fskyline-pair.hh;h=a174204cd2a004161c420dcd13865d7d552bd3e6;hb=eee5583d9b8b6ff3187060aa48120e4544d2af58;hp=566b9be3f74c74d94e8619500b77bb8815e07468;hpb=01df8ad908c92687d0c352e5ad5f067e52809423;p=lilypond.git

diff --git a/lily/include/skyline-pair.hh b/lily/include/skyline-pair.hh
index 566b9be3f7..a174204cd2 100644
--- a/lily/include/skyline-pair.hh
+++ b/lily/include/skyline-pair.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2008--2012 Han-Wen Nienhuys <hanwen@lilypond.org>
+  Copyright (C) 2008--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,24 +22,24 @@
 
 #include "skyline.hh"
 
-class Skyline_pair
+class Skyline_pair : public Simple_smob<Skyline_pair>
 {
+public:
+  static const char type_p_name_[];
 private:
   Drul_array<Skyline> skylines_;
 
-  DECLARE_SIMPLE_SMOBS (Skyline_pair);
 public:
   Skyline_pair ();
-  Skyline_pair (vector<Box> const &boxes, Axis a);
-  Skyline_pair (vector<Drul_array<Offset> > const &buildings, Axis a);
-  Skyline_pair (vector<Skyline_pair> const &skypairs);
+  Skyline_pair (std::vector<Box> const &boxes, Axis a);
+  Skyline_pair (std::vector<Drul_array<Offset> > const &buildings, Axis a);
+  Skyline_pair (std::vector<Skyline_pair> const &skypairs);
   Skyline_pair (Box const &, Axis a);
 
   Real left () const;
   Real right () const;
   void raise (Real);
   void shift (Real);
-  void deholify ();
   void insert (Box const &, Axis);
   void merge (Skyline_pair const &other);
   Skyline &operator [] (Direction d);