lilypond-1.1.1

diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh
index cb36305966495f2bda9fcc96c0de0475d9ce0034..66644eeef3898a2c93bd3abf5b913f241a7fad67 100644 (file)
--- a/lily/include/identifier.hh
+++ b/lily/include/identifier.hh
@@ -32,8 +32,8 @@ class Duration_identifier;
 
 
 #define IDACCESSOR(Class)\
-virtual Class *  access_ ## Class (bool=true) const { error (#Class  + String ("_identifier")); return 0; }\
-virtual Class ## _identifier * access_ ## Class ## _identifier () { return 0; }
+virtual Class *  access_content_ ## Class (bool) const { error (#Class  + String ("_identifier")); return 0; }\
+
 
 /**
    A declarable data structure in mudela. 
@@ -78,11 +78,7 @@ struct Class ## _identifier : Identifier {\
                             Class ## _identifier (Class ## _identifier const&);\
                             Class ## _identifier (Class*st, int code);\
                             VIRTUAL_COPY_CONS (Class ## _identifier, Identifier);\
-                            virtual Class ## _identifier * access_ ## Class ## _identifier ()\
-    {\
-      return this;\
-    }\
-                            virtual Class* access_ ## Class (bool copy_b) const;\
+                            virtual Class* access_content_ ## Class (bool copy_b) const;\
                             ~Class ## _identifier();\
                             virtual void do_print () const; \
                             virtual String do_str () const; \

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index 2f3c3f599c57f2f6ca630fc0df26fb60b30adb7c..d280d158acab436876ceee114b4b70db9a8280b8 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -22,26 +22,7 @@
 class Musical_req  : public virtual Request  {
 public:
 
-  DEFAULTACCESSOR(Lyric_req)
-  DEFAULTACCESSOR(Note_req )
-  DEFAULTACCESSOR(Stem_req )
-  DEFAULTACCESSOR(Melodic_req )
-  DEFAULTACCESSOR(Slur_req )
-  DEFAULTACCESSOR(Beam_req )
-  DEFAULTACCESSOR(Abbreviation_beam_req)
-  DEFAULTACCESSOR(Rhythmic_req)
-  DEFAULTACCESSOR(Musical_script_req)
-  DEFAULTACCESSOR(Text_req)
-  DEFAULTACCESSOR(Rest_req )
-  DEFAULTACCESSOR(Skip_req)
-  DEFAULTACCESSOR(Dynamic_req)
-  DEFAULTACCESSOR(Absolute_dynamic_req )
-  DEFAULTACCESSOR(Tie_req)
-  DEFAULTACCESSOR(Musical_span_req)
-  DEFAULTACCESSOR(Plet_req)
-  DEFAULTACCESSOR(Span_dynamic_req )
-  DEFAULTACCESSOR(Abbreviation_req)
-  DEFAULTACCESSOR(Multi_measure_rest_req)
+
   REQUESTMETHODS(Musical_req);
 };
 
@@ -131,7 +112,6 @@ public:
   bool forceacc_b_;
   Note_req();
   bool do_equal_b (Request*) const;
-  Rhythmic_req* access_Rhythmic_req () { return Rhythmic_req::access_Rhythmic_req (); }
   REQUESTMETHODS(Note_req);
 };