diff options
author | Nikolai Pretzell <np@openoffice.org> | 2001-03-12 18:24:52 +0000 |
---|---|---|
committer | Nikolai Pretzell <np@openoffice.org> | 2001-03-12 18:24:52 +0000 |
commit | 506aea6bd135c3919d3a4cfdb186a11cd0f4fa95 (patch) | |
tree | 2f042e41ac5cd5a5e15413db75a3f96ad678756c /xml2cmp/source/support | |
parent | 7f94841d8b915dd9434e296bb37516fb50819cb6 (diff) |
xml-descriptions new dtd, step4
Diffstat (limited to 'xml2cmp/source/support')
-rw-r--r-- | xml2cmp/source/support/cmdline.cxx | 8 | ||||
-rw-r--r-- | xml2cmp/source/support/cmdline.hxx | 4 | ||||
-rw-r--r-- | xml2cmp/source/support/heap.cxx | 14 | ||||
-rw-r--r-- | xml2cmp/source/support/heap.hxx | 4 | ||||
-rw-r--r-- | xml2cmp/source/support/list.hxx | 8 | ||||
-rw-r--r-- | xml2cmp/source/support/makefile.mk | 4 | ||||
-rw-r--r-- | xml2cmp/source/support/sistr.cxx | 4 | ||||
-rw-r--r-- | xml2cmp/source/support/sistr.hxx | 4 | ||||
-rw-r--r-- | xml2cmp/source/support/syshelp.cxx | 11 | ||||
-rw-r--r-- | xml2cmp/source/support/syshelp.hxx | 13 |
10 files changed, 40 insertions, 34 deletions
diff --git a/xml2cmp/source/support/cmdline.cxx b/xml2cmp/source/support/cmdline.cxx index 541b69e12dcc..13eaa7506a91 100644 --- a/xml2cmp/source/support/cmdline.cxx +++ b/xml2cmp/source/support/cmdline.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cmdline.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2001-03-09 15:22:59 $ + * last change: $Author: np $ $Date: 2001-03-12 19:24:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,7 +64,7 @@ #include <ctype.h> #include <string.h> #include <stdlib.h> -#include <ostream.h> +#include <iostream> char C_sUseText[] = "Use: xml2cmp.exe \n" @@ -109,7 +109,7 @@ CommandLine::CommandLine( int argc, if (bDisplayUse) { - cout << C_sUseText; + std::cout << C_sUseText << std::endl; bIsOk = false; exit(0); } diff --git a/xml2cmp/source/support/cmdline.hxx b/xml2cmp/source/support/cmdline.hxx index bc55fff0fd59..729b57208ec6 100644 --- a/xml2cmp/source/support/cmdline.hxx +++ b/xml2cmp/source/support/cmdline.hxx @@ -2,9 +2,9 @@ * * $RCSfile: cmdline.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2001-03-09 15:22:59 $ + * last change: $Author: np $ $Date: 2001-03-12 19:24:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/xml2cmp/source/support/heap.cxx b/xml2cmp/source/support/heap.cxx index fa5c6224f449..24bb0be3be30 100644 --- a/xml2cmp/source/support/heap.cxx +++ b/xml2cmp/source/support/heap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: heap.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2001-03-09 15:22:59 $ + * last change: $Author: np $ $Date: 2001-03-12 19:24:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,10 +63,16 @@ #include "heap.hxx" -#include <iostream.h> +#include <iostream> #include <stdlib.h> -#define AssertionOf(x) {if (!(x)) {cerr << "Assertion failed: " << #x << __FILE__ << __LINE__ << endl; exit(3); }} +#define AssertionOf(x) {if (!(x)) {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/heap.hxx b/xml2cmp/source/support/heap.hxx index 5560d5218bdd..64b89a6a8780 100644 --- a/xml2cmp/source/support/heap.hxx +++ b/xml2cmp/source/support/heap.hxx @@ -2,9 +2,9 @@ * * $RCSfile: heap.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2001-03-09 15:22:59 $ + * last change: $Author: np $ $Date: 2001-03-12 19:24:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/xml2cmp/source/support/list.hxx b/xml2cmp/source/support/list.hxx index 0aa69cb02ce8..f40e33774fce 100644 --- a/xml2cmp/source/support/list.hxx +++ b/xml2cmp/source/support/list.hxx @@ -2,9 +2,9 @@ * * $RCSfile: list.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2001-03-12 17:16:34 $ + * last change: $Author: np $ $Date: 2001-03-12 19:24:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,7 @@ #define __LISTEN_123456__ #include <string.h> -#include <ostream.h> +#include <iostream> #include <stdlib.h> template <class XX> @@ -212,7 +212,7 @@ List<XX>::checkSize(unsigned newLength) newSpace <<= 1; else { - cerr << "List becomes too big" << endl; + std::cerr << "List becomes too big" << std::endl; exit(1); } } diff --git a/xml2cmp/source/support/makefile.mk b/xml2cmp/source/support/makefile.mk index b8f8b58a0f55..2d34106ae73e 100644 --- a/xml2cmp/source/support/makefile.mk +++ b/xml2cmp/source/support/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: np $ $Date: 2001-03-09 15:22:59 $ +# last change: $Author: np $ $Date: 2001-03-12 19:24:51 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses diff --git a/xml2cmp/source/support/sistr.cxx b/xml2cmp/source/support/sistr.cxx index d12a3178c7c0..b021f2b744f0 100644 --- a/xml2cmp/source/support/sistr.cxx +++ b/xml2cmp/source/support/sistr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sistr.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2001-03-09 15:22:59 $ + * last change: $Author: np $ $Date: 2001-03-12 19:24:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/xml2cmp/source/support/sistr.hxx b/xml2cmp/source/support/sistr.hxx index 644fdcca41a9..729ef2503fd7 100644 --- a/xml2cmp/source/support/sistr.hxx +++ b/xml2cmp/source/support/sistr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: sistr.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: np $ $Date: 2001-03-09 15:22:59 $ + * last change: $Author: np $ $Date: 2001-03-12 19:24:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/xml2cmp/source/support/syshelp.cxx b/xml2cmp/source/support/syshelp.cxx index 18be4fba5f9a..f451dd1c6f08 100644 --- a/xml2cmp/source/support/syshelp.cxx +++ b/xml2cmp/source/support/syshelp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: syshelp.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2001-03-12 17:16:34 $ + * last change: $Author: np $ $Date: 2001-03-12 19:24:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,7 +64,6 @@ // NOT FULLY DEFINED SERVICES -#include <fstream.h> #include <string.h> #include "sistr.hxx" @@ -73,7 +72,7 @@ char C_sSpaceInName[] = " "; void -WriteName( ofstream & o_rFile, +WriteName( std::ofstream & o_rFile, const Simstr & i_rIdlDocuBaseDir, const Simstr & i_rName, E_LinkType i_eLinkType ) @@ -177,14 +176,14 @@ WriteName( ofstream & o_rFile, void -WriteStr( ofstream & o_rFile, +WriteStr( std::ofstream & o_rFile, const char * i_sStr ) { o_rFile.write( i_sStr, strlen(i_sStr) ); } void -WriteStr( ofstream & o_rFile, +WriteStr( std::ofstream & o_rFile, const Simstr & i_sStr ) { o_rFile.write( i_sStr.str(), i_sStr.l() ); diff --git a/xml2cmp/source/support/syshelp.hxx b/xml2cmp/source/support/syshelp.hxx index 3ef0f985a85f..1cf85c1b098f 100644 --- a/xml2cmp/source/support/syshelp.hxx +++ b/xml2cmp/source/support/syshelp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: syshelp.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: np $ $Date: 2001-03-12 17:16:34 $ + * last change: $Author: np $ $Date: 2001-03-12 19:24:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,8 @@ // BASE CLASSES // COMPONENTS // PARAMETERS -class ofstream; +#include <fstream> + class Simstr; @@ -92,17 +93,17 @@ enum E_LinkType void WriteName( - ofstream & o_rFile, + std::ofstream & o_rFile, const Simstr & i_rIdlDocuBaseDir, const Simstr & i_rName, E_LinkType i_eLinkType ); void WriteStr( - ofstream & o_rFile, + std::ofstream & o_rFile, const char * i_sStr ); void WriteStr( - ofstream & o_rFile, + std::ofstream & o_rFile, const Simstr & i_sStr ); |