X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FIteratorTraits.ih;h=20e24764b413f550e7a88e8b850bd614c707e993;hb=412024ed31a4ab4eaea7a4165a434f8efebee325;hp=1abcb6a6ffb458ec12389fe4f608ab0d8240eece;hpb=145f6a7d0f3a6aaa77b3625351c952d24cb0b8a1;p=senf.git

diff --git a/Utils/IteratorTraits.ih b/Utils/IteratorTraits.ih
index 1abcb6a..20e2476 100644
--- a/Utils/IteratorTraits.ih
+++ b/Utils/IteratorTraits.ih
@@ -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
@@ -21,8 +23,8 @@
 /** \file
     \brief IteratorTraits internal header */
 
-#ifndef IH_IteratorTraits_
-#define IH_IteratorTraits_ 1
+#ifndef IH_SENF_Utils_IteratorTraits_
+#define IH_SENF_Utils_IteratorTraits_ 1
 
 // Custom includes
 
@@ -30,21 +32,20 @@
 
 namespace senf {
 
-    // It is not very nice that we need to specialize on the exact iterator names.
-    // The preprocessor guard will need to be expanded by also giving the correct
-    // version numbers. We need to disable it when using stlport and so on ... 
-    // The problem is, that typedefs are not expanded when specializing ...
+    // It is not very nice that we need to specialize on the exact iterator names.  The preprocessor
+    // guard will need to be expanded by also giving the correct version numbers.  The problem is,
+    // that typedefs are not expanded when specializing ...
 
 #if defined(__GNUG__)
     template <class T, class Alloc>
     struct contiguous_storage_iterator<
-        __gnu_cxx::__normal_iterator<T*, std::vector<T,Alloc> > >
+        ::__gnu_cxx::__normal_iterator<T*, std::vector<T,Alloc> > >
         : public boost::true_type
     {};
 
     template <class CharT, class Traits, class Alloc>
     struct contiguous_storage_iterator< 
-        __gnu_cxx::__normal_iterator<CharT*, std::basic_string<CharT, Traits, Alloc> > >
+        ::__gnu_cxx::__normal_iterator<CharT*, std::basic_string<CharT, Traits, Alloc> > >
         : public boost::true_type
     {};
 #endif