summaryrefslogtreecommitdiff
path: root/registry/test/testmerge.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-04-28 15:22:25 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-04-28 15:22:25 +0000
commitc195d1448245f710efa8c924e11e568426a90abf (patch)
tree0c1574aea8c7c2f6c72bbe66d2cbd4e156fb1e1b /registry/test/testmerge.cxx
parente6328a5ffd2fef862b6e6dcf79c97b45314b8019 (diff)
INTEGRATION: CWS ooo20030412 (1.3.48); FILE MERGED
2003/04/01 10:07:31 mh 1.3.48.1: chg: to standard header includes, #i3557#
Diffstat (limited to 'registry/test/testmerge.cxx')
-rw-r--r--registry/test/testmerge.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx
index 060277bdd..8c2d0eee0 100644
--- a/registry/test/testmerge.cxx
+++ b/registry/test/testmerge.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: testmerge.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: jsc $ $Date: 2001-03-14 09:51:06 $
+ * last change: $Author: hr $ $Date: 2003-04-28 16:22:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,7 +59,7 @@
*
************************************************************************/
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <string.h>
@@ -78,6 +78,7 @@
#endif
+using namespace std;
using namespace rtl;
sal_Int32 lValue1 = 123456789;