fixes for Ubuntu Oneiric (g++ 4.6.1, boost 1.46.1)

[senf.git] / senf / Utils / Termlib / Terminfo.cc

diff --git a/senf/Utils/Termlib/Terminfo.cc b/senf/Utils/Termlib/Terminfo.cc
index 83459b1..b1eb5c8 100644 (file)
--- a/senf/Utils/Termlib/Terminfo.cc
+++ b/senf/Utils/Termlib/Terminfo.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program 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 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program 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.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Terminfo non-inline non-template implementation */
@@ -37,7 +42,7 @@
 
 //#include "Terminfo.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 char const * const senf::term::Terminfo::properties::BooleanNames [] = {
     "AutoLeftMargin", "AutoRightMargin", "NoEscCtlc", "CeolStandoutGlitch", "EatNewlineGlitch",
@@ -126,7 +131,7 @@ char const * const senf::term::Terminfo::properties::StringNames[] = {
      "AcsUlcorner", "AcsLlcorner", "AcsUrcorner", "AcsLrcorner", "AcsLtee", "AcsRtee", "AcsBtee",
      "AcsTtee", "AcsHline", "AcsVline", "AcsPlus", "MemoryLock", "MemoryUnlock", "BoxChars1" };
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::term::Terminfo
 
 prefix_ senf::term::Terminfo::Terminfo()
@@ -367,18 +372,18 @@ prefix_ std::string senf::term::Terminfo::findTerminfo(std::string const & name)
         char const * tivar (::getenv("TERMINFO"));
         if (tivar) {
             tientry = boost::filesystem::path(tivar) / subdir;
-            if (boost::filesystem::exists(tientry)) return tientry.native_file_string();
+            if (boost::filesystem::exists(tientry)) return tientry.string();
         }
     }
 
     tientry = boost::filesystem::path("/etc/terminfo") / subdir;
-    if (boost::filesystem::exists(tientry)) return tientry.native_file_string();
+    if (boost::filesystem::exists(tientry)) return tientry.string();
 
     tientry = boost::filesystem::path("/lib/terminfo")  / subdir;
-    if (boost::filesystem::exists(tientry)) return tientry.native_file_string();
+    if (boost::filesystem::exists(tientry)) return tientry.string();
 
     tientry = boost::filesystem::path("/usr/share/terminfo") / subdir;
-    if (boost::filesystem::exists(tientry)) return tientry.native_file_string();
+    if (boost::filesystem::exists(tientry)) return tientry.string();
 
     return "";
 }
@@ -456,7 +461,7 @@ prefix_ void senf::term::Terminfo::load(std::istream & is)
             *j = 0;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::term::KeyParser
 
 char const * const senf::term::KeyParser::KeyNames[] = {
@@ -605,7 +610,7 @@ prefix_ void senf::term::KeyParser::dump(std::ostream & os)
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Terminfo.mpp"