INTEGRATION: CWS vgcleanupmacros (1.3.20); FILE MERGED

2006/05/17 11:23:16 vg 1.3.20.1: #i65486# cleanup:remove obsolete macros

3 files changed, 9 insertions, 30 deletions

diff --git a/vos/inc/vos/conditn.hxx b/vos/inc/vos/conditn.hxx
index 3c768d409c81..75fca720b9d2 100644
--- a/vos/inc/vos/conditn.hxx
+++ b/vos/inc/vos/conditn.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: conditn.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 08:58:10 $
+ *  last change: $Author: vg $ $Date: 2006-06-02 12:35:55 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -47,11 +47,8 @@
 #   include <vos/object.hxx>
 #endif
 
-#ifdef _USE_NAMESPACE
 namespace vos
 {
-#endif
-
 
 /** ICondition
 
@@ -147,9 +144,7 @@ protected:
 
 };
 
-#ifdef _USE_NAMESPACE
 }
-#endif
 
 #endif  // _VOS_CONDITN_HXX_
 
diff --git a/vos/inc/vos/connectn.hxx b/vos/inc/vos/connectn.hxx
index 12bd9523082e..01cbf964b433 100644
--- a/vos/inc/vos/connectn.hxx
+++ b/vos/inc/vos/connectn.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: connectn.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 08:58:26 $
+ *  last change: $Author: vg $ $Date: 2006-06-02 12:36:09 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -45,10 +45,8 @@
 #   include <rtl/ustring.hxx>
 #endif
 
-#ifdef _USE_NAMESPACE
 namespace vos
 {
-#endif
 //---------------------------------------------------------------------------
 /** abstract connection class
  */
@@ -125,9 +123,7 @@ public:
     virtual ::rtl::OUString SAL_CALL getDestination() = 0;
 };
 
-#ifdef _USE_NAMESPACE
 }
-#endif
 
 #endif // _VOS_CONNECTN_HXX_
 
diff --git a/vos/inc/vos/macros.hxx b/vos/inc/vos/macros.hxx
index 6699a158cd50..3f08f9759fed 100644
--- a/vos/inc/vos/macros.hxx
+++ b/vos/inc/vos/macros.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: macros.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 08:59:47 $
+ *  last change: $Author: vg $ $Date: 2006-06-02 12:36:54 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -157,25 +157,13 @@
 #endif
 
 // def. for arbitrary namespace
-#ifdef _USE_NAMESPACE
-#   define VOS_NAMESPACE(class_name, name_space) name_space::class_name
-#else
-#   define VOS_NAMESPACE(class_name, name_space) class_name
-#endif
+#define VOS_NAMESPACE(class_name, name_space) name_space::class_name
 
 // sal_Int16 def. for namespace vos
-#ifdef _USE_NAMESPACE
-#   define NAMESPACE_VOS(class_name) vos::class_name
-#else
-#   define NAMESPACE_VOS(class_name) class_name
-#endif
+#define NAMESPACE_VOS(class_name) vos::class_name
 
 // sal_Int16 def. for namespace std
-#ifdef _USE_NAMESPACE
-#   define NAMESPACE_STD(class_name) std::class_name
-#else
-#   define NAMESPACE_STD(class_name) class_name
-#endif
+#define NAMESPACE_STD(class_name) std::class_name
 
 #endif //_VOS_MACROS_HXX_