summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib/configuration.h
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-12-13 00:54:37 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-12-13 00:54:37 +0100
commita4f6bdc8bd91c7282ae9ac60c44844c6f0058a65 (patch)
treee72c9cda1f1b29c9bf0744c2ebf04c43d7b22500 /apt-pkg/contrib/configuration.h
parent699b209e5122f8fcd85fc4666c9b7020286ab0d0 (diff)
revert 2184.1.2: do not pollute namespace in headers
The breakage is just to big for now, so guard the change with #ifndef APT_8_CLEANER_HEADERS and be nice to library users
Diffstat (limited to 'apt-pkg/contrib/configuration.h')
-rw-r--r--apt-pkg/contrib/configuration.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index f6f2a3c1d..4c2e75041 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -34,6 +34,10 @@
#include <vector>
#include <iostream>
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+
class Configuration
{
public: