X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flilypond-version.cc;h=cc829ab6ca19d4aefc147af341a880423adbdb8e;hb=c7b4d476fc85f5b831efaa66f712b15ced19e366;hp=984c4e7c80db96f69086598bf631bae3ced3e860;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/lilypond-version.cc b/lily/lilypond-version.cc
index 984c4e7c80..cc829ab6ca 100644
--- a/lily/lilypond-version.cc
+++ b/lily/lilypond-version.cc
@@ -1,16 +1,27 @@
 /*
-  lilypond-version.cc -- implement Lilypond_version
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2010 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <ctype.h>
 
-#include "lilypond-input-version.hh"
+#include "lilypond-version.hh"
 #include "string-convert.hh"
-#include "array.hh"
+#include "misc.hh"
 
 Lilypond_version::Lilypond_version (int major, int minor, int patch)
 {
@@ -19,14 +30,14 @@ Lilypond_version::Lilypond_version (int major, int minor, int patch)
   patch_ = patch;
 }
 
-Lilypond_version::Lilypond_version (std::string str)
+Lilypond_version::Lilypond_version (string str)
 {
   major_ = 0; 
   minor_ = 0;
   patch_ = 0;
   
-  Array<std::string> version;
-  version = String_convert::split (str, '.');
+  vector<string> version;
+  version = string_split (str, '.');
 
   if (version.size () > 0 && isdigit (version[0][0]))
     major_ = String_convert::dec2int (version[0]);
@@ -42,10 +53,12 @@ Lilypond_version::Lilypond_version (std::string str)
     extra_patch_string_ = version[3];
 }
 
-std::string
+string
 Lilypond_version::to_string () const
 {
-  return std::to_string (major_) + "." + std::to_string (minor_) + "." + std::to_string (patch_);
+  return ::to_string (major_)
+    + "." + ::to_string (minor_)
+    + "." + ::to_string (patch_);
 }
 
 Lilypond_version::operator int () const