[Fedora-directory-commits] setuputil/installer/include nsdefs.h, 1.1.1.1, 1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/setuputil/installer/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28529/setuputil/installer/include

Modified Files:
	nsdefs.h 
Log Message:
Use <iostream> instead of <iostream.h> on those platforms that support it.
With this fix, we don't get the deprecation warnings when building setuputil.
This has been tested on various linux, Solaris 9 with old and new forte, and on HPUX IPF.
Thanks to Nathan and Noriko for the reviews.



Index: nsdefs.h
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/include/nsdefs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nsdefs.h	29 Jul 2005 22:16:28 -0000	1.1.1.1
+++ nsdefs.h	23 Mar 2006 20:45:37 -0000	1.2
@@ -30,6 +30,12 @@
 ** HISTORY
 **
 ** $Log$
+** Revision 1.2  2006/03/23 20:45:37  rmeggins
+** Use <iostream> instead of <iostream.h> on those platforms that support it.
+** With this fix, we don't get the deprecation warnings when building setuputil.
+** This has been tested on various linux, Solaris 9 with old and new forte, and on HPUX IPF.
+** Thanks to Nathan and Noriko for the reviews.
+**
 ** Revision 1.1.1.1  2005/07/29 22:16:28  foxworth
 ** Importing new setup sdk for open source project
 **
@@ -153,7 +159,11 @@
 ** Includes
 **
 **********************************************************************/
-#include <iostream.h>
+#if !defined(HPUX) || defined(_HP_NAMESPACE_STD)
+#include <iostream>
+#else
+#include <iostream.h> /* use old name on older systems */
+#endif
 
 #ifdef XP_WIN32
 #include <stdlib.h>