* some WS fixes

[apt.git] / apt-pkg / contrib / configuration.h

diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 643e0f628d7999ddf29e8c8c54e10a1725673845..0ed8f59d3853fdd11698bde51dff76ed00db03f9 100644 (file)
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: configuration.h,v 1.12 2001/02/20 07:03:17 jgg Exp $
+// $Id: configuration.h,v 1.16 2002/11/11 06:55:50 doogie Exp $

 /* ######################################################################
 
    Configuration Class
 /* ######################################################################
 
    Configuration Class


@@ -33,6 +33,9 @@
 #endif 
 
 #include <string>
 #endif 
 
 #include <string>

+#include <iostream>
+
+using std::string;

 
 class Configuration
 {
 
 class Configuration
 {


@@ -70,7 +73,7 @@ class Configuration
    string FindFile(const char *Name,const char *Default = 0) const;
    string FindDir(const char *Name,const char *Default = 0) const;
    int FindI(const char *Name,int Default = 0) const;
    string FindFile(const char *Name,const char *Default = 0) const;
    string FindDir(const char *Name,const char *Default = 0) const;
    int FindI(const char *Name,int Default = 0) const;

-   int FindI(string Name,bool Default = 0) const {return FindI(Name.c_str(),Default);};
+   int FindI(string Name,int Default = 0) const {return FindI(Name.c_str(),Default);};

    bool FindB(const char *Name,bool Default = false) const;
    bool FindB(string Name,bool Default = false) const {return FindB(Name.c_str(),Default);};
    string FindAny(const char *Name,const char *Default = 0) const;
    bool FindB(const char *Name,bool Default = false) const;
    bool FindB(string Name,bool Default = false) const {return FindB(Name.c_str(),Default);};
    string FindAny(const char *Name,const char *Default = 0) const;


@@ -88,7 +91,8 @@ class Configuration
    
    inline const Item *Tree(const char *Name) const {return Lookup(Name);};
 
    
    inline const Item *Tree(const char *Name) const {return Lookup(Name);};
 

-   void Dump();
+   inline void Dump() { Dump(std::clog); };
+   void Dump(std::ostream& str);

 
    Configuration(const Item *Root);
    Configuration();
 
    Configuration(const Item *Root);
    Configuration();