Sync

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

diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index 06367592b96501b357cf17417d9ec93cdcac38ca..9b54b72a5633e78ba143bf4c4c3046dc47147cc6 100644 (file)
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: error.h,v 1.2 1998/07/07 04:17:11 jgg Exp $
+// $Id: error.h,v 1.5 1998/09/18 02:42:41 jgg Exp $

 /* ######################################################################
    
    Global Erorr Class - Global error mechanism
 /* ######################################################################
    
    Global Erorr Class - Global error mechanism


@@ -42,7 +42,7 @@
 #define PKGLIB_ERROR_H
 
 #ifdef __GNUG__
 #define PKGLIB_ERROR_H
 
 #ifdef __GNUG__

-#pragma interface "pkglib/error.h"
+#pragma interface "apt-pkg/error.h"

 #endif 
 
 #include <string>
 #endif 
 
 #include <string>


@@ -64,6 +64,7 @@ class GlobalError
 
    // Call to generate an error from a library call.
    bool Errno(const char *Function,const char *Description,...);
 
    // Call to generate an error from a library call.
    bool Errno(const char *Function,const char *Description,...);

+   bool WarningE(const char *Function,const char *Description,...);

 
    /* A warning should be considered less severe than an error, and may be
       ignored by the client. */
 
    /* A warning should be considered less severe than an error, and may be
       ignored by the client. */


@@ -82,8 +83,8 @@ class GlobalError
    GlobalError();
 };
 
    GlobalError();
 };
 

-/* The 'extra-ansi' syntax is used to help with collisions. This is the 
-   single global instance of this class. */
-extern GlobalError *_error;
+// The 'extra-ansi' syntax is used to help with collisions. 
+GlobalError *_GetErrorObj();
+#define _error _GetErrorObj()

 
 #endif
 
 #endif