minor fixes for clang++

[senf.git] / senf / Utils / String.test.cc

diff --git a/senf/Utils/String.test.cc b/senf/Utils/String.test.cc
index 1ba4935..e2bd8c9 100644 (file)
--- a/senf/Utils/String.test.cc
+++ b/senf/Utils/String.test.cc
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // 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 String unit tests */
@@ -34,24 +39,24 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOST_AUTO_UNIT_TEST(stringJoin)
+SENF_AUTO_UNIT_TEST(stringJoin)
 {
     char const * seq[] = { "foo", "bar", "baz" };
     BOOST_CHECK_EQUAL( senf::stringJoin(std::make_pair(seq, seq+sizeof(seq)/sizeof(seq[0])), "::"),
                        "foo::bar::baz" );
 }
 
-BOOST_AUTO_UNIT_TEST(lexicalCast)
+SENF_AUTO_UNIT_TEST(lexicalCast)
 {
-    SENF_CHECK_NO_THROW( 
-        BOOST_CHECK_EQUAL( 
-            senf::lexical_cast<unsigned>()[std::setbase(0)](std::string("0x1a2b")), 
+    SENF_CHECK_NO_THROW(
+        BOOST_CHECK_EQUAL(
+            senf::lexical_cast<unsigned>()[std::setbase(0)](std::string("0x1a2b")),
             6699u ) );
-    SENF_CHECK_NO_THROW( 
-        BOOST_CHECK_EQUAL( 
-            senf::lexical_cast<std::string>()[std::hex][std::uppercase][std::showbase](6699u), 
+    SENF_CHECK_NO_THROW(
+        BOOST_CHECK_EQUAL(
+            senf::lexical_cast<std::string>()[std::hex][std::uppercase][std::showbase](6699u),
             "0X1A2B" ) );
     SENF_CHECK_NO_THROW(
         BOOST_CHECK_EQUAL(
@@ -61,7 +66,7 @@ BOOST_AUTO_UNIT_TEST(lexicalCast)
             senf::lexical_cast<std::string>(6699u), "6699" ) );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f