X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FIteratorTraits.test.cc;h=50ce1d83823072e45c80027299080e5d419df8e2;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=f5aa2cca909afb0179bad6233cb72ddb7e640f31;hpb=31d85cd6b8e03c5ecc924ca8892906be1bab702f;p=senf.git

diff --git a/Utils/IteratorTraits.test.cc b/Utils/IteratorTraits.test.cc
index f5aa2cc..50ce1d8 100644
--- a/Utils/IteratorTraits.test.cc
+++ b/Utils/IteratorTraits.test.cc
@@ -1,6 +1,8 @@
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// $Id$
+//
+// Copyright (C) 2007
+// 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
@@ -19,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief IteratorTraits.test unit tests */
+    \brief IteratorTraits unit tests */
 
 //#include "IteratorTraits.test.hh"
 //#include "IteratorTraits.test.ih"
@@ -29,7 +31,7 @@
 #include <vector>
 #include <string>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -38,7 +40,8 @@
 BOOST_AUTO_UNIT_TEST(iteratorTraits)
 {
     BOOST_CHECK_EQUAL( senf::contiguous_storage_iterator<int*>::value, true );
-#ifdef __GNUG__
+    BOOST_CHECK_EQUAL( senf::contiguous_storage_iterator<void>::value, false );
+#if defined(__GNUG__) && ! defined(_GLIBCXX_DEBUG)
     BOOST_CHECK_EQUAL( senf::contiguous_storage_iterator<std::vector<int>::iterator>::value, true);
     BOOST_CHECK_EQUAL( senf::contiguous_storage_iterator<std::string::iterator>::value, true);
 #endif
@@ -55,4 +58,5 @@ BOOST_AUTO_UNIT_TEST(iteratorTraits)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End: