mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make libpq++ safe again for older C++ compilers. Do 'using namespace std'

Browse Source 
only if configure found it was safe to do so; do not assume const_cast
is available.
This commit is contained in:
Tom Lane 2001-09-30 22:30:37 +00:00
parent 9588084263
commit 95d4821b1c
7 changed files with 17 additions and 20 deletions

4
src/interfaces/libpq++/pgconnection.cc

@ -10,14 +10,16 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgconnection.cc,v 1.11 2001/05/09 17:29:10 momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgconnection.cc,v 1.12 2001/09/30 22:30:37 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "pgconnection.h"
#ifdef HAVE_NAMESPACE_STD
using namespace std;
#endif
// ****************************************************************

5
src/interfaces/libpq++/pgconnection.h

@ -13,7 +13,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: pgconnection.h,v 1.13 2001/08/24 14:07:49 petere Exp $
* $Id: pgconnection.h,v 1.14 2001/09/30 22:30:37 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -96,9 +96,6 @@ private:
};
#ifdef HAVE_NAMESPACE_STD
#undef PGSTD
#endif
#endif // PGCONNECTION_H

5
src/interfaces/libpq++/pgcursordb.cc

@ -10,15 +10,16 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgcursordb.cc,v 1.5 2001/05/09 17:29:10 momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgcursordb.cc,v 1.6 2001/09/30 22:30:37 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "pgcursordb.h"
#ifdef HAVE_NAMESPACE_STD
using namespace std;
#endif
// ****************************************************************

4
src/interfaces/libpq++/pgcursordb.h

@ -14,7 +14,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
*
* $Id: pgcursordb.h,v 1.8 2001/07/11 22:12:43 momjian Exp $
* $Id: pgcursordb.h,v 1.9 2001/09/30 22:30:37 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -78,9 +78,7 @@ private:
}; // End PgCursor Class Declaration
#ifdef HAVE_NAMESPACE_STD
#undef PGSTD
#endif
#endif // PGCURSORDB_H

9
src/interfaces/libpq++/pgdatabase.cc

@ -10,15 +10,16 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgdatabase.cc,v 1.11 2001/05/09 17:46:11 momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgdatabase.cc,v 1.12 2001/09/30 22:30:37 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "pgdatabase.h"
#ifdef HAVE_NAMESPACE_STD
using namespace std;
#endif
// OBSOLESCENT (uses PQprint(), which is no longer being maintained)
@ -33,7 +34,7 @@ void PgDatabase::DisplayTuples(FILE *out,
po.header = printHeader;
po.align = fillAlign;
po.standard = po.html3 = po.expanded = po.pager = 0;
po.fieldSep = const_cast<char *>(fieldSep);
po.fieldSep = (char *) (fieldSep);
po.tableOpt = po.caption = 0;
po.fieldName = 0;
@ -54,7 +55,7 @@ void PgDatabase::PrintTuples(FILE *out,
po.align = fillAlign;
po.standard = po.html3 = po.expanded = po.pager = 0;
po.tableOpt = po.caption = 0;
po.fieldSep = const_cast<char *>(terseOutput ? "" : "|");
po.fieldSep = (char *) (terseOutput ? "" : "|");
po.fieldName = 0;
PQprint(out,pgResult,&po);

5
src/interfaces/libpq++/pglobject.cc

@ -10,7 +10,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pglobject.cc,v 1.7 2001/05/09 17:29:10 momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pglobject.cc,v 1.8 2001/09/30 22:30:37 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -21,8 +21,9 @@ extern "C" {
#include "libpq/libpq-fs.h"
}
#ifdef HAVE_NAMESPACE_STD
using namespace std;
#endif
// ****************************************************************

5
src/interfaces/libpq++/pglobject.h

@ -11,7 +11,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
*
* $Id: pglobject.h,v 1.8 2001/07/11 22:12:43 momjian Exp $
* $Id: pglobject.h,v 1.9 2001/09/30 22:30:37 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -68,9 +68,6 @@ private:
};
#ifdef HAVE_NAMESPACE_STD
#undef PGSTD
#endif
#endif // PGLOBJECT_H