[Fedora-directory-commits] ldapserver/ldap/cm/newinst ux-dialog.cc, 1.8, 1.9

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597/ldap/cm/newinst

Modified Files:
	ux-dialog.cc 
Log Message:
[186642] Directory Server Makefile updates for Internal build (Comment #6)
1) picked up the latest components including Cyrus SASL, Perldap, SetupUtil,
and AdminServer 
2) fixed the java paths for the internal build.
3) added an option -AA to HP-UX C++ compiler to adjust to SetupUtil build (use
libstd 2)
4) replaced <iostream.h>, <strstream.h> and <fstream.h> with <iostream>,
<strstream>, <fstream> respectively in ldap/cm/newinst/ux-dialog.cc 
5) package svrcore and perldap, which were dropped in the current
ldap/cm/Makefile
6) added a perl script genPerlDAPInf.pl to generate perldap.inf file



Index: ux-dialog.cc
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-dialog.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ux-dialog.cc	19 Apr 2005 22:07:21 -0000	1.8
+++ ux-dialog.cc	7 Apr 2006 01:33:37 -0000	1.9
@@ -49,17 +49,20 @@
 **
 *********************************************************************/
 
-#include <errno.h>
-#include <iostream.h>
-#include <fstream.h>
-/* Newer g++ wants the new std header forms */
-#if defined( Linux )
+#if !defined(HPUX) || defined(_HP_NAMESPACE_STD)
+#include <iostream>
 #include <strstream>
+#include <fstream>
+using namespace std;
 using std::ostrstream;
-/* But some platforms won't accept those (specifically HP-UX aCC */
 #else
+/* older HP-UX compiler, using libstd 1 (no -AA) */
+#include <iostream.h> /* use old name on older systems */
 #include <strstream.h>
+#include <fstream.h>
 #endif
+
+#include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <ctype.h>