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

tglsfdc · tglsfdc · commit 95d4821b1cc5 · 2001-09-30T22:30:37.000Z
only if configure found it was safe to do so; do not assume const_cast
is available.
diff --git a/src/interfaces/libpq++/pgconnection.cc b/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
 
 
 // ****************************************************************
diff --git a/src/interfaces/libpq++/pgconnection.h b/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 @@ class DLLIMPORT PgConnection {
 };
 
 
-#ifdef HAVE_NAMESPACE_STD
 #undef PGSTD
-#endif
-
 
 #endif	// PGCONNECTION_H
diff --git a/src/interfaces/libpq++/pgcursordb.cc b/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
 
 
 // ****************************************************************
diff --git a/src/interfaces/libpq++/pgcursordb.h b/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 @@ class DLLIMPORT PgCursor : public PgTransaction {
 }; // End PgCursor Class Declaration
 
 
-#ifdef HAVE_NAMESPACE_STD
 #undef PGSTD
-#endif
 
 #endif	// PGCURSORDB_H
 
diff --git a/src/interfaces/libpq++/pgdatabase.cc b/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);
diff --git a/src/interfaces/libpq++/pglobject.cc b/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
 
 
 // ****************************************************************
diff --git a/src/interfaces/libpq++/pglobject.h b/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 @@ class DLLIMPORT PgLargeObject : public PgConnection {
 };
 
 
-#ifdef HAVE_NAMESPACE_STD
 #undef PGSTD
-#endif
-
 
 #endif	// PGLOBJECT_H

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,16 @@`
`10`	`10`	`* Copyright (c) 1994, Regents of the University of California`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgconnection.cc,v 1.11 2001/05/09 17:29:10 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pgconnection.cc,v 1.12 2001/09/30 22:30:37 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`17`	`17`
`18`	`18`	`#include "pgconnection.h"`
`19`	`19`
	`20`	`+#ifdef HAVE_NAMESPACE_STD`
`20`	`21`	`using namespace std;`
	`22`	`+#endif`
`21`	`23`
`22`	`24`
`23`	`25`	`// ****************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* Portions Copyright (c) 1994, Regents of the University of California`
`15`	`15`	`*`
`16`	`16`	`*`
`17`		`- * $Id: pgcursordb.h,v 1.8 2001/07/11 22:12:43 momjian Exp $`
	`17`	`+ * $Id: pgcursordb.h,v 1.9 2001/09/30 22:30:37 tgl Exp $`
`18`	`18`	`*`
`19`	`19`	`*-------------------------------------------------------------------------`
`20`	`20`	`*/`
`@@ -78,9 +78,7 @@ class DLLIMPORT PgCursor : public PgTransaction {`
`78`	`78`	`}; // End PgCursor Class Declaration`
`79`	`79`
`80`	`80`
`81`		`-#ifdef HAVE_NAMESPACE_STD`
`82`	`81`	`#undef PGSTD`
`83`		`-#endif`
`84`	`82`
`85`	`83`	`#endif // PGCURSORDB_H`
`86`	`84`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Copyright (c) 1994, Regents of the University of California`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pglobject.cc,v 1.7 2001/05/09 17:29:10 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pglobject.cc,v 1.8 2001/09/30 22:30:37 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -21,8 +21,9 @@ extern "C" {`
`21`	`21`	`#include "libpq/libpq-fs.h"`
`22`	`22`	`}`
`23`	`23`
`24`		`-`
	`24`	`+#ifdef HAVE_NAMESPACE_STD`
`25`	`25`	`using namespace std;`
	`26`	`+#endif`
`26`	`27`
`27`	`28`
`28`	`29`	`// ****************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* Portions Copyright (c) 1994, Regents of the University of California`
`12`	`12`	`*`
`13`	`13`	`*`
`14`		`- * $Id: pglobject.h,v 1.8 2001/07/11 22:12:43 momjian Exp $`
	`14`	`+ * $Id: pglobject.h,v 1.9 2001/09/30 22:30:37 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -68,9 +68,6 @@ class DLLIMPORT PgLargeObject : public PgConnection {`
`68`	`68`	`};`
`69`	`69`
`70`	`70`
`71`		`-#ifdef HAVE_NAMESPACE_STD`
`72`	`71`	`#undef PGSTD`
`73`		`-#endif`
`74`		`-`
`75`	`72`
`76`	`73`	`#endif // PGLOBJECT_H`