From: g0dil <g0dil@270642c3-0616-0410-b53a-bc976706d245>
Date: Wed, 11 Aug 2010 14:08:15 +0000 (+0000)
Subject: config: use senf::config::copy_n instead of SENF_copy_n macro
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=c505c034e5fdc932c02aa3dc3847a5551011d87e;p=senf.git

config: use senf::config::copy_n instead of SENF_copy_n macro

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1674 270642c3-0616-0410-b53a-bc976706d245
---

diff --git a/senf/Socket/Protocols/Raw/EUI64.cti b/senf/Socket/Protocols/Raw/EUI64.cti
index 3983515..0ca2283 100644
--- a/senf/Socket/Protocols/Raw/EUI64.cti
+++ b/senf/Socket/Protocols/Raw/EUI64.cti
@@ -35,7 +35,7 @@ template <class InputIterator>
 prefix_ senf::EUI64 senf::EUI64::from_data(InputIterator i)
 {
     EUI64 eui (senf::noinit);
-    SENF_copy_n(i, 8, eui.begin());
+    senf::config::copy_n(i, 8, eui.begin());
     return eui;
 }
 
diff --git a/senf/Socket/Protocols/Raw/MACAddress.ct b/senf/Socket/Protocols/Raw/MACAddress.ct
index bbc076b..bea4f84 100644
--- a/senf/Socket/Protocols/Raw/MACAddress.ct
+++ b/senf/Socket/Protocols/Raw/MACAddress.ct
@@ -38,7 +38,7 @@ template <class InputIterator>
 prefix_ senf::MACAddress::MACAddress senf::MACAddress::from_data(InputIterator i)
 {
     MACAddress mac (senf::noinit);
-    SENF_copy_n(i, 6, mac.begin());
+    senf::config::copy_n(i, 6, mac.begin());
     return mac;
 }
 
diff --git a/senf/config.hh b/senf/config.hh
index 1c6122f..b076e20 100644
--- a/senf/config.hh
+++ b/senf/config.hh
@@ -43,17 +43,18 @@ namespace config {
 # include "local_config.hh"
 #
 # ifndef SENF_ABSOLUTE_INCLUDE_PATH
-#     define SENF_ABSOLUTE_INCLUDE_PATH(senf_relative_include_file_path) <senf/senf_relative_include_file_path>
+#     define SENF_ABSOLUTE_INCLUDE_PATH(senf_relative_include_file_path) \
+          <senf/senf_relative_include_file_path>
 # endif
 #
 # ifndef SENF_copy_n
 #     ifdef HAVE_GNUCXX_COPYN
 #         include <ext/algorithm>
-#         define SENF_copy_n __gnu_cxx::copy_n
+          namespace senf { namespace config { using __gnu_cxx::copy_n; }}
 #     endif
 #     ifdef HAVE_STD_COPYN
 #         include <algorithm>
-#         define SENF_copy_n std::copy_n
+          namespace senf { namespace config { using std::copy_n; }}
 #     endif
 #  endif
 #
@@ -61,7 +62,9 @@ namespace config {
 #     define SENF_MPL_RV_ALIGNMENT 16
 # endif
 #
-# if !defined(SENF_BUFFER_USE_LOCALS) && !defined(SENF_BUFFER_USE_ALLOCA) && !defined(SENF_BUFFER_USE_NEW)
+# if    !defined(SENF_BUFFER_USE_LOCALS) \
+     && !defined(SENF_BUFFER_USE_ALLOCA) \
+     && !defined(SENF_BUFFER_USE_NEW)
 #     define SENF_BUFFER_USE_NEW 1
 # endif
 #