#101136# cleanup regarding namespaces and portability

15 files changed, 97 insertions, 125 deletions

diff --git a/xml2cmp/prj/build.lst b/xml2cmp/prj/build.lst
index f21003a3087c..e9f2979af4ff 100644
--- a/xml2cmp/prj/build.lst
+++ b/xml2cmp/prj/build.lst
@@ -1,7 +1,7 @@
-xc	xml2cmp : soltools NULL
-xc	xml2cmp							usr1	-	all	xc_mkout NULL
-xc	xml2cmp\prj						get	-	all	xc_prj NULL
-xc	xml2cmp\source\support					nmake	-	all	xc_supp NULL
-xc	xml2cmp\source\xcd					nmake	-	all	xc_xcd NULL
-xc	xml2cmp\util						nmake	-	all	xc_util xc_supp xc_xcd NULL
-xc	xml2cmp\source\finder					nmake	-	all	xc_sfi  xc_supp xc_xcd NULL
+xc  xml2cmp : soltools stlport NULL
+xc  xml2cmp                         usr1    -	all	xc_mkout NULL
+xc  xml2cmp\prj                     get -	all	xc_prj NULL
+xc  xml2cmp\source\support                  nmake   -   all	xc_supp NULL
+xc  xml2cmp\source\xcd                  nmake   -	all	xc_xcd NULL
+xc  xml2cmp\util                        nmake   -   all xc_util xc_supp xc_xcd NULL
+xc  xml2cmp\source\finder                   nmake   -   all xc_sfi  xc_supp xc_xcd NULL
diff --git a/xml2cmp/source/finder/dep_main.cxx b/xml2cmp/source/finder/dep_main.cxx
index 7c961e678f38..c9c9644d1fb3 100644
--- a/xml2cmp/source/finder/dep_main.cxx
+++ b/xml2cmp/source/finder/dep_main.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dep_main.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: np $ $Date: 2001-03-23 13:32:07 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:07:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,10 +64,6 @@
 #include "dependy.hxx"
 
 
-using namespace std;
-
-
-
 int
 #ifdef WNT
 _cdecl
@@ -77,9 +73,9 @@ main( int       argc,
 {
     if (argc < 2 || *argv[1] == '?')
     {
-        cout << "\nUse:" << endl
-             << "srvdepy.exe  <xml-component-descriptions-root-directory>"
-             << endl << endl;
+        std::cout << "\nUse:\n"
+             << "srvdepy.exe  <xml-component-descriptions-root-directory>\n"
+             << std::endl;
         return 0;
     }
 
@@ -92,17 +88,19 @@ main( int       argc,
     std::vector<Simstr>  aServs;
 
 
-    cout << "\nNow you can start to put in Service names." << endl
-         << "Please use correct case, but don't use namespaces." << endl
-         << "Just the Service's own name." << endl << endl
-         << "To stop the program, put in a hashmark \"#\" + ENTER." << endl << endl;
+    std::cout
+         << "\nNow you can start to put in Service names.\n"
+         << "Please use correct case, but don't use namespaces.\n"
+         << "Just the Service's own name.\n\n"
+         << "To stop the program, put in a hashmark \"#\" + ENTER.\n"
+         << std::endl;
 
 
 
     do {
 
         sInput[0] = 0;
-        cin >> sInput;
+        std::cin >> sInput;
         Simstr sImplService(sInput);
         if (*sInput != '#')
         {
@@ -111,17 +109,17 @@ main( int       argc,
 
             aDependencies.FindNeededServices( aLibs, aServs, sImplService );
 
-            cout << "\n\n\nNeeded libraries: " << endl;
+            std::cout << "\n\n\nNeeded libraries: " << std::endl;
             for ( unsigned i = 0; i < aLibs.size(); ++i )
             {
-                cout << "    " << aLibs[i].str() << endl;
+                std::cout << "    " << aLibs[i].str() << std::endl;
             }
-            cout << "\nNeeded services: " << endl;
+            std::cout << "\nNeeded services: " << std::endl;
             for ( unsigned s= 0; s < aServs.size(); ++s )
             {
-                cout << "    " << aServs[s].str() << endl;
+                std::cout << "    " << aServs[s].str() << std::endl;
             }
-            cout << endl << endl << endl;
+            std::cout << "\n\n" << std::endl;
         }
     }   while (*sInput != '#');
 
diff --git a/xml2cmp/source/finder/dependy.cxx b/xml2cmp/source/finder/dependy.cxx
index e4d05c18c71f..66e08b95fab7 100644
--- a/xml2cmp/source/finder/dependy.cxx
+++ b/xml2cmp/source/finder/dependy.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dependy.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: np $ $Date: 2001-03-23 13:32:07 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:07:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,9 +69,6 @@
 
 
 
-using namespace std;
-
-
 Simstr              ShortName(const Simstr & i_rService);
 
 
@@ -166,7 +163,7 @@ DependencyFinder::ReadFile(  const char * i_sFilename )
 
     if ( !aParser.Parse(i_sFilename) )
     {
-        cerr << "Error: File \""
+        std::cerr << "Error: File \""
              << i_sFilename
              << "\" could not be parsed."
              << std::endl;
diff --git a/xml2cmp/source/support/cmdline.cxx b/xml2cmp/source/support/cmdline.cxx
index fb60f7dbfda4..ea877baa4028 100644
--- a/xml2cmp/source/support/cmdline.cxx
+++ b/xml2cmp/source/support/cmdline.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cmdline.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mh $ $Date: 2001-09-28 14:37:09 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:07:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,7 +69,7 @@
 
 char C_sUseText[] = "Use: xml2cmp.exe \n"
                     "        [-func funcFile] \n"
-                    "        [-html] \n"
+                    "        [-html htmlFile] \n"
                     "        [-types typeFile] \n"
                     "        [-idlpath idlPath] \n"
                     "        Xml_FileName\n"
diff --git a/xml2cmp/source/support/heap.cxx b/xml2cmp/source/support/heap.cxx
index 80df91178fe9..5c35ca5af977 100644
--- a/xml2cmp/source/support/heap.cxx
+++ b/xml2cmp/source/support/heap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: heap.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: np $ $Date: 2001-03-23 13:23:17 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:07:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,14 +65,13 @@
 
 #include <iostream>
 #include <stdlib.h>
-#define AssertionOf(x)  {if (!(x)) {cerr << "Assertion failed: " << #x << __FILE__ << __LINE__ << std::endl; exit(3); }}
+#define AssertionOf(x)  {if (!(x)) {std::cerr << "Assertion failed: " << #x << __FILE__ << __LINE__ << std::endl; exit(3); }}
 
 #ifdef UNX
 #define stricmp strcasecmp
 #endif
 
 
-using std::cerr;
 
 Heap::Heap(unsigned i_nWidth)
     :   dpColumnsArray(new Column[i_nWidth]),
diff --git a/xml2cmp/source/support/list.hxx b/xml2cmp/source/support/list.hxx
index 00d7b11fa882..6f21648e6796 100644
--- a/xml2cmp/source/support/list.hxx
+++ b/xml2cmp/source/support/list.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: list.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mh $ $Date: 2001-09-28 14:32:42 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:07:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -157,7 +157,9 @@ class DynamicList : public List<XY*>
 template <class XX>
 List<XX>::List()
     :   inhalt(0),
-        len(0)
+        len(0),
+        allocated(0)
+
 {
     alloc(1);
 }
diff --git a/xml2cmp/source/support/syshelp.cxx b/xml2cmp/source/support/syshelp.cxx
index b94ba84e0fff..52d646a68674 100644
--- a/xml2cmp/source/support/syshelp.cxx
+++ b/xml2cmp/source/support/syshelp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: syshelp.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: np $ $Date: 2001-10-02 08:49:24 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:07:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,14 +80,10 @@
 #endif
 
 
-using namespace std;
-using std::ostream;
-
-
 char C_sSpaceInName[] = "&nbsp;&nbsp;&nbsp;";
 
 void
-WriteName( ostream &        o_rFile,
+WriteName( std::ostream &       o_rFile,
            const Simstr &   i_rIdlDocuBaseDir,
            const Simstr &   i_rName,
            E_LinkType       i_eLinkType )
@@ -224,7 +220,7 @@ GatherFileNames( List<Simstr> &     o_sFiles,
 
     // Stayingalive sign
     if (++nAliveCounter % 100 == 1)
-        cout << "." << flush;
+        std::cout << "." << std::flush;
 
     strcpy(sFilter, i_sSrcDirectory);
     strcat(sFilter,C_sXML_END);
@@ -249,7 +245,7 @@ GatherFileNames( List<Simstr> &     o_sFiles,
 
     // Stayingalive sign
     if (++nAliveCounter % 100 == 1)
-        cout << "." << flush;
+        std::cout << "." << std::flush;
 
     while ( (pEntry = readdir(pDir)) != 0 )
     {
diff --git a/xml2cmp/source/support/syshelp.hxx b/xml2cmp/source/support/syshelp.hxx
index 427670e315d1..df2e8842f544 100644
--- a/xml2cmp/source/support/syshelp.hxx
+++ b/xml2cmp/source/support/syshelp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: syshelp.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: np $ $Date: 2001-07-10 11:02:30 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:08:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,7 +68,7 @@
     // BASE CLASSES
     // COMPONENTS
     // PARAMETERS
-#include <iostream>
+#include <iosfwd>
 
 class Simstr;
 template <class XY> class List;
diff --git a/xml2cmp/source/xcd/cr_html.cxx b/xml2cmp/source/xcd/cr_html.cxx
index 3fc43e588475..4f8ee8bcaa69 100644
--- a/xml2cmp/source/xcd/cr_html.cxx
+++ b/xml2cmp/source/xcd/cr_html.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cr_html.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: np $ $Date: 2001-10-02 08:49:26 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:08:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,9 +64,6 @@
 #include "xmltree.hxx"
 #include "../support/syshelp.hxx"
 
-using std::cerr;
-using std::ofstream;
-using std::ios;
 
 
 
@@ -89,9 +86,9 @@ char C_sHtmlFileFoot[] = "</BODY>\n</HTML>\n";
 HtmlCreator::HtmlCreator( const char *              i_pOutputFileName,
                           const XmlElement &        i_rDocument,
                           const Simstr &            i_sIDL_BaseDirectory )
-    :   aFile(i_pOutputFileName, ios::out
+    :   aFile(i_pOutputFileName, std::ios::out
 #ifdef WNT
-                                               | ios::binary
+                                               | std::ios::binary
 #endif
                                                              ),
         rDocument(i_rDocument),
@@ -99,7 +96,7 @@ HtmlCreator::HtmlCreator( const char *              i_pOutputFileName,
 {
     if ( !aFile )
     {
-        cerr << "Error: " << i_pOutputFileName << " could not be created." << std::endl;
+        std::cerr << "Error: " << i_pOutputFileName << " could not be created." << std::endl;
         exit(0);
     }
 }
diff --git a/xml2cmp/source/xcd/cr_html.hxx b/xml2cmp/source/xcd/cr_html.hxx
index 673c4e4f3553..206694817502 100644
--- a/xml2cmp/source/xcd/cr_html.hxx
+++ b/xml2cmp/source/xcd/cr_html.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cr_html.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: np $ $Date: 2001-10-02 08:49:26 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:08:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
diff --git a/xml2cmp/source/xcd/cr_index.cxx b/xml2cmp/source/xcd/cr_index.cxx
index 81010e943e4f..e0ec753db901 100644
--- a/xml2cmp/source/xcd/cr_index.cxx
+++ b/xml2cmp/source/xcd/cr_index.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cr_index.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: np $ $Date: 2001-10-02 08:49:26 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:08:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,10 +69,6 @@
 #include "parse.hxx"
 #include "cr_html.hxx"
 
-using std::cerr;
-using std::ofstream;
-using std::ios;
-using std::ostream;
 
 extern unsigned C_nSupportedServicesIndex;
 
@@ -119,10 +115,10 @@ Index::GatherData(  const List<Simstr> & i_rInputFileList )
 void
 Index::WriteOutput( const char * i_sOuputFile )
 {
-    ofstream aOut( i_sOuputFile, ios::out );
+    std::ofstream aOut( i_sOuputFile, std::ios::out );
     if (! aOut)
     {
-        cerr << "Error: Indexfile \""
+        std::cerr << "Error: Indexfile \""
              << i_sOuputFile
              << "\" could not be created."
              << std::endl;
@@ -161,7 +157,7 @@ Index::ReadFile(  const char * i_sFilename )
     bool bResult = aParser.Parse(i_sFilename);
     if (! bResult)
     {
-        cerr << "Error: File \""
+        std::cerr << "Error: File \""
              << i_sFilename
              << "\" could not be parsed."
              << std::endl;
@@ -203,9 +199,9 @@ Index::CreateHtmlFileName(  char *                      o_sOutputHtml,
 
 
 void
-Index::WriteTableFromHeap( ostream &    o_rOut,
+Index::WriteTableFromHeap( std::ostream &   o_rOut,
                            Heap &       i_rHeap,
-                            const char *    i_sIndexValue,
+                           const char * i_sIndexValue,
                            const char * i_sIndexReference,
                            E_LinkType       i_eLinkType )
 {
@@ -222,7 +218,7 @@ Index::WriteTableFromHeap( ostream &    o_rOut,
 
 
 void
-Index::WriteHeap( ostream &     o_rOut,
+Index::WriteHeap( std::ostream &    o_rOut,
                   Heap &        i_rHeap,
                   E_LinkType    i_eLinkType )
 {
diff --git a/xml2cmp/source/xcd/cr_metho.cxx b/xml2cmp/source/xcd/cr_metho.cxx
index a9cc12c8f621..52500daa1648 100644
--- a/xml2cmp/source/xcd/cr_metho.cxx
+++ b/xml2cmp/source/xcd/cr_metho.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cr_metho.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: np $ $Date: 2001-03-23 13:39:36 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:08:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,10 +66,6 @@
 #include <iostream>
 
 
-using std::cerr;
-using std::ofstream;
-using std::ios;
-
 
 char C_sFileHeader1[] = "/* ";
 char C_sFileHeader2[] = " */\r\n/* Implementation of component_getDescriptionFunc() */\r\n\r\n"
@@ -79,7 +75,7 @@ char C_sFuncBegin[]   = "#ifdef __cplusplus\r\n"
                         "#endif\r\n\r\n"
                         "const sal_Char * SAL_CALL\r\ncomponent_getDescriptionFunc()\r\n"
                         "{\r\n"
-                        "    return (sal_Char*) \r\n"
+                        "    return (const sal_Char*) \r\n"
                         "    \"";
 char C_sFuncEnd[]    =  "\";\r\n"
                         "}\r\n\r\n"
@@ -97,16 +93,16 @@ Create_AccessMethod( const char *           i_pOutputFileName,
     char   sDescrLineChange[] = "\"\r\n    \"";
     int    sDescrLen = strlen(sDescrLineChange);
 
-    ofstream aFile(i_pOutputFileName, ios::out
+    std::ofstream aFile(i_pOutputFileName, std::ios::out
 #ifdef WNT
-                                               | ios::binary
+                                               | std::ios::binary
 #endif
     );
 
 
     if ( !aFile )
     {
-        cerr << "Error: " << i_pOutputFileName << " could not be created." << std::endl;
+        std::cerr << "Error: " << i_pOutputFileName << " could not be created." << std::endl;
         return;
     }
 
diff --git a/xml2cmp/source/xcd/filebuff.cxx b/xml2cmp/source/xcd/filebuff.cxx
index ce72a64f5e3b..2e641a413c4b 100644
--- a/xml2cmp/source/xcd/filebuff.cxx
+++ b/xml2cmp/source/xcd/filebuff.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filebuff.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: np $ $Date: 2001-10-02 08:49:26 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:08:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,20 +66,15 @@
 #include <ctype.h>
 
 
-using std::ifstream;
-using std::ios;
-
-
-
 bool
 LoadXmlFile( Buffer &           o_rBuffer,
              const char *       i_sXmlFilePath )
 {
-    ifstream aXmlFile;
+    std::ifstream aXmlFile;
 
-    aXmlFile.open(i_sXmlFilePath, ios::in
+    aXmlFile.open(i_sXmlFilePath, std::ios::in
 #ifdef WNT
-                                          | ios::binary
+                                          | std::ios::binary
 #endif // WNT
     );
 
@@ -87,7 +82,7 @@ LoadXmlFile( Buffer &           o_rBuffer,
         return false;
 
     // Prepare buffer:
-    aXmlFile.seekg(0, ios::end);
+    aXmlFile.seekg(0, std::ios::end);
     unsigned long nBufferSize = aXmlFile.tellg();
     o_rBuffer.SetSize(nBufferSize + 1);
     o_rBuffer.Data()[nBufferSize] = '\0';
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
index 8ca4d3a5e91c..2d419b0458d0 100644
--- a/xml2cmp/source/xcd/main.cxx
+++ b/xml2cmp/source/xcd/main.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: main.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hjs $ $Date: 2001-07-18 17:52:27 $
+ *  last change: $Author: np $ $Date: 2002-08-08 16:08:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,6 +60,7 @@
  ************************************************************************/
 
 #include <iostream>
+#include <fstream>
 #include <stdio.h>
 
 
@@ -76,10 +77,6 @@
 
 
 
-
-using namespace std;
-
-
 int                     Do_IndexCommandLine(
                             const CommandLine &     i_rCommandLine );
 int                     Do_SingleFileCommandLine(
@@ -125,7 +122,7 @@ Do_SingleFileCommandLine(const CommandLine & i_rCommandLine)
     bool bLoadResult = aParser.LoadFile(i_rCommandLine.XmlSrcFile());
     if (! bLoadResult)
     {
-        cerr << "Error: File %s could not be loaded." << i_rCommandLine.XmlSrcFile() << endl;
+        std::cerr << "Error: File %s could not be loaded." << i_rCommandLine.XmlSrcFile() << std::endl;
         return 1;
     }
 
@@ -134,10 +131,10 @@ Do_SingleFileCommandLine(const CommandLine & i_rCommandLine)
         Create_AccessMethod( i_rCommandLine.FuncFile(),
                              aParser.PureText() );
 
-        cout << "File "
+        std::cout << "File "
              << i_rCommandLine.FuncFile()
              << " with component_getDescriptionFunc() is created now."
-             << endl;
+             << std::endl;
     }
 
     // Parse
@@ -170,14 +167,14 @@ Do_IndexCommandLine(const CommandLine & i_rCommandLine)
                             i_rCommandLine.IdlRootPath(),
                             i_rCommandLine.IndexedTags() );
 
-    std::cout << "Gather xml-files ..." << endl;
+    std::cout << "Gather xml-files ..." << std::endl;
     GatherFileNames( aFiles, i_rCommandLine.XmlSrcDirectory() );
 
-    std::cout << "Create output ..." << endl;
+    std::cout << "Create output ..." << std::endl;
     aIndex.GatherData(aFiles);
     aIndex.WriteOutput( i_rCommandLine.IndexOutputFile() );
 
-    std::cout << "... done." << endl;
+    std::cout << "... done." << std::endl;
 
     return 0;
 };
@@ -193,7 +190,7 @@ void                    Put2File_TypeInfo(
                             const char *            i_sOutputFile,
                             ModuleDescription &     i_rData );
 void                    StreamOut_TypeInfo(
-                            ostream &               o_rOut,
+                            std::ostream &               o_rOut,
                             ModuleDescription &     i_rData,
                             const char *            i_sSeparator );
 
@@ -210,14 +207,14 @@ Create_TypeInfo( const char *           o_sOutputFile,
         Put2File_TypeInfo(o_sOutputFile,i_rData);
 
 #if 0
-    ofstream aOut(o_sOutputFile, ios::out
+    std::ofstream aOut(o_sOutputFile, std::ios::out
 #ifdef WNT
-                                               | ios::binary
+                                               | std::ios::binary
 #endif
     );
     if ( !aOut )
     {
-        cerr << "Error: " << o_sOutputFile << " could not be created." << endl;
+        std::cerr << "Error: " << o_sOutputFile << " could not be created." << std::endl;
         return;
     }
 
@@ -280,21 +277,21 @@ Create_TypeInfo( const char *           o_sOutputFile,
 void
 Put2StdOut_TypeInfo( ModuleDescription &    i_rData )
 {
-    StreamOut_TypeInfo(cout, i_rData, " ");
+    StreamOut_TypeInfo(std::cout, i_rData, " ");
 }
 
 void
 Put2File_TypeInfo( const char *            i_sOutputFile,
                    ModuleDescription &     i_rData )
 {
-    ofstream aOut(i_sOutputFile, ios::out
+    std::ofstream aOut(i_sOutputFile, std::ios::out
 #ifdef WNT
-                                               | ios::binary
+                                               | std::ios::binary
 #endif
     );
     if ( !aOut )
     {
-        cerr << "Error: " << i_sOutputFile << " could not be created." << endl;
+        std::cerr << "Error: " << i_sOutputFile << " could not be created." << std::endl;
         return;
     }
 
@@ -308,7 +305,7 @@ Put2File_TypeInfo( const char *            i_sOutputFile,
 }
 
 void
-StreamOut_TypeInfo( ostream &               o_rOut,
+StreamOut_TypeInfo( std::ostream &               o_rOut,
                     ModuleDescription &     i_rData,
                     const char *            i_sSeparator )
 {
diff --git a/xml2cmp/source/xcd/parse.cxx b/xml2cmp/source/xcd/parse.cxx
index 0157cc7b50ac..894366c33151 100644
--- a/xml2cmp/source/xcd/parse.cxx
+++ b/xml2cmp/source/xcd/parse.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: parse.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: np $Date:  $
+ *  last change: $Author: np $Date: 2001/03/23 13:39:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,15 +71,13 @@
 #endif
 
 
-using namespace std;
-
 
 // NOT FULLY DEFINED SERVICES
 
 
 
 #define AssertionOf(x)  \
-    {if (!(x)) {cerr << "Assertion failed: " << #x << __FILE__ << __LINE__ << std::endl; exit(3); }}
+    {if (!(x)) {std::cerr << "Assertion failed: " << #x << __FILE__ << __LINE__ << std::endl; exit(3); }}
 
 
 
@@ -425,14 +423,15 @@ X2CParser::CheckAndPassEndTag( const char * i_sElementName )
 void
 X2CParser::SyntaxError( const char * i_sText )
 {
-    cerr << "Syntax error "
+    std::cerr
+         << "Syntax error "
          << i_sText
          << " in file: "
          << sFileName.str()
          << " in line "
          << nFileLine
          << "."
-         << endl;
+         << std::endl;
 
      exit(3);
 }