From 4bf358d29c48e69b9b21f5728e09a2534ae67ac2 Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt Date: Fri, 4 Jan 2019 18:56:49 +0100 Subject: glibmmconfig.h.in: Remove unused configuration constants These configuration variables have been removed: GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 GLIBMM_MEMBER_FUNCTIONS_MEMBER_TEMPLATES GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC GLIBMM_CAN_USE_THREAD_LOCAL GLIBMM_HAVE_NAMESPACE_STD GLIBMM_COMPILER_SUN_FORTE GLIBMM_EXCEPTIONS_ENABLED GLIBMM_PROPERTIES_ENABLED GLIBMM_VFUNCS_ENABLED GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED and this preprocessor macro: GLIBMM_USING_STD(Symbol) The corresponding M4 macros in build/ and their calls in configure.ac have also been removed. Fixes #22 --- glib/glibmmconfig.h.in | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'glib/glibmmconfig.h.in') diff --git a/glib/glibmmconfig.h.in b/glib/glibmmconfig.h.in index e5639cb7..56e7a42e 100644 --- a/glib/glibmmconfig.h.in +++ b/glib/glibmmconfig.h.in @@ -32,42 +32,20 @@ type. */ #undef GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION -/* Define if the compiler honors namespaces inside extern "C" blocks. */ -#undef GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC - -/* Defined when the SUN Forte C++ compiler is being used. */ -#undef GLIBMM_COMPILER_SUN_FORTE - /* Defined when the --enable-debug-refcounting configure argument was given */ #undef GLIBMM_DEBUG_REFCOUNTING -/* This is always set. This is only for backwards compatibility. */ -#undef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED - /* Define to omit deprecated API from the library. */ #undef GLIBMM_DISABLE_DEPRECATED -/* This is always set. This is only for backwards compatibility. */ -#undef GLIBMM_EXCEPTIONS_ENABLED - -/* This is always set. This is only for backwards compatibility. */ -#undef GLIBMM_VFUNCS_ENABLED - /* Defined if a static member variable may be initialized inline to std::string::npos */ #undef GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS -/* Defined when time_t is not equivalent to gint32, meaning that it can be - used for a method overload */ -#undef GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 - /* Define if the compiler disambiguates template specializations for const and non-const types. */ #undef GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS -/* Defined when the libstdc++ declares the std-namespace */ -#undef GLIBMM_HAVE_NAMESPACE_STD - /* Defined if std::iterator_traits<> is standard-conforming */ #undef GLIBMM_HAVE_STD_ITERATOR_TRAITS @@ -83,18 +61,12 @@ /* Major version number of glibmm. */ #undef GLIBMM_MAJOR_VERSION -/* Define if C++ member functions may refer to member templates. */ -#undef GLIBMM_MEMBER_FUNCTIONS_MEMBER_TEMPLATES - /* Micro version number of glibmm. */ #undef GLIBMM_MICRO_VERSION /* Minor version number of glibmm. */ #undef GLIBMM_MINOR_VERSION -/* This is always set. This is only for backwards compatibility. */ -#undef GLIBMM_PROPERTIES_ENABLED - /* Define if glibmm is built as a static library */ #undef GLIBMM_STATIC_LIB @@ -106,14 +78,8 @@ # define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 2 # define GLIBMM_HAVE_WIDE_STREAM 1 # define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1 -# define GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 1 # define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1 # define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1 -# define GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1 -# define GLIBMM_PROPERTIES_ENABLED 1 -# define GLIBMM_VFUNCS_ENABLED 1 -# define GLIBMM_EXCEPTIONS_ENABLED 1 -# define GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED 1 # pragma warning (disable: 4786 4355 4800 4181) #if (_MSC_VER < 1900) @@ -135,10 +101,6 @@ #endif /* _MSC_VER < 1900 */ #endif /* GLIBMM_MSC */ -/* Dummy macro definition for compatibility with old code that expects - * it to be defined. Remove after grace period. */ -#define GLIBMM_USING_STD(Symbol) - /* Enable DLL-specific stuff only when not building a static library */ #if !defined(__CYGWIN__) && defined(__MINGW32__) && !defined(GLIBMM_STATIC_LIB) # define GLIBMM_DLL 1 -- cgit v1.2.1