From owner-svn-ports-head@FreeBSD.ORG Mon Dec 3 11:27:48 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0F0291E0; Mon, 3 Dec 2012 11:27:48 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E6ABF8FC08; Mon, 3 Dec 2012 11:27:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB3BRlCi015191; Mon, 3 Dec 2012 11:27:47 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB3BRl8P015190; Mon, 3 Dec 2012 11:27:47 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201212031127.qB3BRl8P015190@svn.freebsd.org> From: Pietro Cerutti Date: Mon, 3 Dec 2012 11:27:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308138 - head/biology/lamarc/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2012 11:27:48 -0000 Author: gahr Date: Mon Dec 3 11:27:47 2012 New Revision: 308138 URL: http://svnweb.freebsd.org/changeset/ports/308138 Log: - Fix build with clang Feature safe: yes Added: head/biology/lamarc/files/ head/biology/lamarc/files/patch-src-tools_stringx.h (contents, props changed) Added: head/biology/lamarc/files/patch-src-tools_stringx.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/lamarc/files/patch-src-tools_stringx.h Mon Dec 3 11:27:47 2012 (r308138) @@ -0,0 +1,56 @@ +--- src/tools/stringx.h.orig 2012-12-03 12:01:34.000000000 +0100 ++++ src/tools/stringx.h 2012-12-03 12:02:30.000000000 +0100 +@@ -107,6 +107,26 @@ + + bool ciStringEqual(const std::string& s1, const std::string& s2); + ++ ++// functions for making xmltags and lines of xml ++std::string MakeTag(const std::string& str); ++std::string MakeCloseTag(const std::string& str); ++std::string MakeTagWithName(const std::string& tag, const std::string& name); ++std::string MakeTagWithType(const std::string& tag, const std::string& type); ++std::string MakeTagWithTypePlusPanel(const std::string& tag, const std::string& type); ++std::string MakeTagWithConstraint(const std::string& tag, const std::string& constraint); ++std::string MakeJustified(const std::string & str, long width=DEFLINELENGTH); ++std::string MakeJustified(const char* str, long width=DEFLINELENGTH); ++std::string MakeCentered(const std::string& str, long width=DEFLINELENGTH, ++ long indent=DEFINDENT, bool trunc=true); ++std::string MakeCentered(const char* str, long width=DEFLINELENGTH, ++ long indent=DEFINDENT, bool trunc=true); ++std::string MakeIndent(const std::string & str, unsigned long indent); ++std::string MakeIndent(const char* str, unsigned long indent); ++std::string Pretty(double number, int width=DEFWIDTH); ++std::string Pretty(long number, int width=DEFWIDTH); ++std::string Pretty(unsigned long number, int width=DEFWIDTH); ++std::string Pretty(std::string str, int width=DEFWIDTH); + //------------------------------------------------------------------------------------ + + template +@@ -188,26 +208,6 @@ + + DoubleVec1d StringToDoubleVecOrBarf(const std::string& in); + +-// functions for making xmltags and lines of xml +-std::string MakeTag(const std::string& str); +-std::string MakeCloseTag(const std::string& str); +-std::string MakeTagWithName(const std::string& tag, const std::string& name); +-std::string MakeTagWithType(const std::string& tag, const std::string& type); +-std::string MakeTagWithTypePlusPanel(const std::string& tag, const std::string& type); +-std::string MakeTagWithConstraint(const std::string& tag, const std::string& constraint); +-std::string MakeJustified(const std::string & str, long width=DEFLINELENGTH); +-std::string MakeJustified(const char* str, long width=DEFLINELENGTH); +-std::string MakeCentered(const std::string& str, long width=DEFLINELENGTH, +- long indent=DEFINDENT, bool trunc=true); +-std::string MakeCentered(const char* str, long width=DEFLINELENGTH, +- long indent=DEFINDENT, bool trunc=true); +-std::string MakeIndent(const std::string & str, unsigned long indent); +-std::string MakeIndent(const char* str, unsigned long indent); +-std::string Pretty(double number, int width=DEFWIDTH); +-std::string Pretty(long number, int width=DEFWIDTH); +-std::string Pretty(unsigned long number, int width=DEFWIDTH); +-std::string Pretty(std::string str, int width=DEFWIDTH); +- + bool StringCompare(const std::string&, const char*, long, long); + bool StringCompare(const std::string&, const std::string&, long, long); +