INTEGRATION: CWS vgcleanupmacros (1.2.20); FILE MERGED

2006/05/17 11:23:18 vg 1.2.20.1: #i65486# cleanup:remove obsolete macros

3 files changed, 6 insertions, 19 deletions

diff --git a/vos/inc/vos/refobj.hxx b/vos/inc/vos/refobj.hxx
index bbbb0ede8825..25e5b24709a7 100644
--- a/vos/inc/vos/refobj.hxx
+++ b/vos/inc/vos/refobj.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: refobj.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 09:02:49 $
+ *  last change: $Author: vg $ $Date: 2006-06-02 12:38:48 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -51,10 +51,8 @@
 #   include <vos/diagnose.hxx>
 #endif
 
-#ifdef _USE_NAMESPACE
 namespace vos
 {
-#endif
 
 template <class T>
 class ORefObj : public IReference
@@ -94,9 +92,7 @@ private:
 // include template implementation
 #include <vos/refobj.inl>
 
-#ifdef _USE_NAMESPACE
 }
-#endif
 
 
 #endif // _VOS_REF_HXX_
diff --git a/vos/inc/vos/runnable.hxx b/vos/inc/vos/runnable.hxx
index 5e9189846307..3bdd5e2d2fc4 100644
--- a/vos/inc/vos/runnable.hxx
+++ b/vos/inc/vos/runnable.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: runnable.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 09:03:22 $
+ *  last change: $Author: vg $ $Date: 2006-06-02 12:39:03 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -43,10 +43,8 @@
 #   include <vos/refernce.hxx>
 #endif
 
-#ifdef _USE_NAMESPACE
 namespace vos
 {
-#endif
 
 
 /** IRunnable
@@ -74,9 +72,7 @@ public:
 };
 
 
-#ifdef _USE_NAMESPACE
 }
-#endif
 
 
 #endif  // _VOS_RUNNABLE_HXX_
diff --git a/vos/inc/vos/stream.hxx b/vos/inc/vos/stream.hxx
index e49a659eb5d4..4aff8d0b7ed7 100644
--- a/vos/inc/vos/stream.hxx
+++ b/vos/inc/vos/stream.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: stream.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 09:04:51 $
+ *  last change: $Author: vg $ $Date: 2006-06-02 12:40:21 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -46,11 +46,8 @@
 #   include <vos/istream.hxx>
 #endif
 
-#ifdef _USE_NAMESPACE
 namespace vos
 {
-#endif
-
 
 /** Adds seeking capabilities to IStream
 */
@@ -295,9 +292,7 @@ inline OStream& operator<< (OStream& rStream, sal_Char value)
     return (rStream);
 }
 
-#ifdef _USE_NAMESPACE
 }
-#endif
 
 #endif // _VOS_STREAM_HXX_