Imported Upstream version 2.19.45

[lilypond.git] / lily / include / skyline-pair.hh

diff --git a/lily/include/skyline-pair.hh b/lily/include/skyline-pair.hh
index 566b9be3f74c74d94e8619500b77bb8815e07468..f7946c1851d50123979a6dd2623e62b90609ae32 100644 (file)
--- 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,12 +22,13 @@
 
 #include "skyline.hh"
 
-class Skyline_pair
+class Skyline_pair : public Simple_smob<Skyline_pair>
 {
+public:
+  static const char * const type_p_name_;
 private:
   Drul_array<Skyline> skylines_;
 
-  DECLARE_SIMPLE_SMOBS (Skyline_pair);
 public:
   Skyline_pair ();
   Skyline_pair (vector<Box> const &boxes, Axis a);
@@ -39,7 +40,6 @@ public:
   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);