summaryrefslogtreecommitdiff
path: root/ACE/ace/Global_Macros.h
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-08-05 08:29:30 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-08-05 08:29:30 +0000
commit2f516c412c6353fb7b56ce831ff005fa33761c4c (patch)
tree15c34167a452dafaf428ca52ccaba65fe9e93630 /ACE/ace/Global_Macros.h
parent544b4d2ad7afaab2910a753623e3358511980912 (diff)
downloadATCD-2f516c412c6353fb7b56ce831ff005fa33761c4c.tar.gz
Thu Aug 5 08:13:51 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/CORBA_macros.h: * ace/Global_Macros.h: * ace/Vector_T.h: * ace/ace_wchar.h: * ace/config-cxx-common.h: * ace/config-doxygen.h: * ace/config-g++-common.h: * ace/config-hpux-11.00.h: * ace/config-icc-common.h: * ace/config-integritySCA.h: * ace/config-macros.h: * ace/config-netbsd.h: * ace/config-openvms.h: * ace/config-suncc-common.h: * ace/config-sunos5.4-sunc++-4.x.h: * ace/config-sunos5.5.h: * ace/config-tandem-nsk-mips-v2.h: * ace/config-tandem-nsk-mips-v3.h: * ace/config-unixware-7.1.0.h: * ace/config-unixware-7.1.0.udk.h: * ace/config-win32-borland.h: * ace/config-win32-dmc.h: * ace/config-win32-ghs.h: * ace/config-win32-interix.h: * ace/config-win32-msvc-10.h: * ace/config-win32-msvc-7.h: * ace/config-win32-msvc-8.h: * ace/config-win32-msvc-9.h: * include/makeinclude/platform_aix.GNU: * include/makeinclude/platform_aix_g++.GNU: * include/makeinclude/platform_aix_ibm.GNU: * include/makeinclude/platform_cray.GNU: * include/makeinclude/platform_freebsd.GNU: * include/makeinclude/platform_gnuwin32_common.GNU: * include/makeinclude/platform_hpux_aCC.GNU: * include/makeinclude/platform_hpux_gcc.GNU: * include/makeinclude/platform_integrity_ghs.GNU: * include/makeinclude/platform_irix6.x_common.GNU: * include/makeinclude/platform_linux_common.GNU: * include/makeinclude/platform_lynxos.GNU: * include/makeinclude/platform_macosx.GNU: * include/makeinclude/platform_macosx_common.GNU: * include/makeinclude/platform_macosx_icc.GNU: * include/makeinclude/platform_macosx_panther.GNU: * include/makeinclude/platform_netbsd.GNU: * include/makeinclude/platform_openbsd.GNU: * include/makeinclude/platform_openvms.GNU: * include/makeinclude/platform_qnx_rtp_gcc.GNU: * include/makeinclude/platform_rtems.x_g++.GNU: * include/makeinclude/platform_sunos5_g++.GNU: * include/makeinclude/platform_sunos5_sunc++.GNU: * include/makeinclude/platform_tandem.GNU: * include/makeinclude/platform_tru64_cxx.GNU: * include/makeinclude/platform_tru64_g++.GNU: * include/makeinclude/platform_unixware_g++.GNU: * include/makeinclude/platform_vxworks5.5.x.GNU: * include/makeinclude/platform_vxworks6.2.GNU: * include/makeinclude/platform_vxworks6.3.GNU: * include/makeinclude/platform_win32_dmc.GNU: * include/makeinclude/platform_win32_icc.GNU: * include/makeinclude/platform_win32_interix.GNU: * include/makeinclude/wrapper_macros.GNU: * tests/Bug_3673_Regression_Test.cpp: * tests/Reactor_Exceptions_Test.cpp: Removed support for non exception builds, ACE_HAS_EXCEPTIONS is now always defined * rpmbuild/ace-tao.spec: Small updates * ace/Exception_Macros.h: * bin/MakeProjectCreator/config/exceptions.mpb: Removed these files.
Diffstat (limited to 'ACE/ace/Global_Macros.h')
-rw-r--r--ACE/ace/Global_Macros.h58
1 files changed, 0 insertions, 58 deletions
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h
index 458c909a9ff..fa1f2c69283 100644
--- a/ACE/ace/Global_Macros.h
+++ b/ACE/ace/Global_Macros.h
@@ -104,64 +104,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# define ACE_UNIMPLEMENTED_FUNC(f) f;
# endif /* ACE_NEEDS_FUNC_DEFINITIONS */
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
- // Easy way to designate that a class is used as a pseudo-namespace.
- // Insures that g++ "friendship" anamolies are properly handled.
- # define ACE_CLASS_IS_NAMESPACE(CLASSNAME) \
- private: \
- CLASSNAME (void); \
- CLASSNAME (const CLASSNAME&); \
- friend class ace_dewarn_gplusplus
-#endif /* ACE_LACKS_DEPRECATED_MACROS */
-
-// ----------------------------------------------------------------
-
-//FUZZ: disable check_for_exception_sepc
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
- #if defined (ACE_HAS_NO_THROW_SPEC)
- # define ACE_THROW_SPEC(X)
- #else
- # if defined (ACE_HAS_EXCEPTIONS)
- # if defined (ACE_WIN32) && defined (_MSC_VER) && \
- (_MSC_VER >= 1400) && (_MSC_VER <= 1500)
- # define ACE_THROW_SPEC(X) throw(...)
- # else
- # define ACE_THROW_SPEC(X) throw X
- # endif /* ACE_WIN32 && VC8 */
- # else /* ! ACE_HAS_EXCEPTIONS */
- # define ACE_THROW_SPEC(X)
- # endif /* ! ACE_HAS_EXCEPTIONS */
- #endif /*ACE_HAS_NO_THROW_SPEC*/
-#endif /* ACE_LACKS_DEPRECATED_MACROS */
-//FUZZ: enable check_for_exception_sepc
-
-// ----------------------------------------------------------------
-
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
- /**
- * This macro is deprecated
- */
- #define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME
-#endif /* ACE_LACKS_DEPRECATED_MACROS */
-
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
- /**
- * @name CORBA namespace macros.
- *
- * CORBA namespace macros.
- *
- * @deprecated These macros were formerly used by TAO but are now
- * deprecated, and only remain to retain some backward
- * compatibility. They will be removed in a future ACE
- * release.
- */
- //@{
- #define ACE_CORBA_1(NAME) CORBA::NAME
- #define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME
- #define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME
- //@}
-#endif /* ACE_LACKS_DEPRECATED_MACROS */
-
// ----------------------------------------------------------------
// Convenient macro for testing for deadlock, as well as for detecting