Program: gdcm
Module: $RCSfile: gdcmMacro.h,v $
Language: C++
- Date: $Date: 2005/11/28 15:20:34 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2006/05/23 14:16:08 $
+ Version: $Revision: 1.6 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMMACRO_H
//-----------------------------------------------------------------------------
-#define gdcmTypeMacro(type) \
- private : \
+#define gdcmTypeMacro(type) \
+ private : \
type(type &); /* Not implemented */ \
type &operator=(type &) /* Not implemented */
-#define gdcmNewMacro(type) \
- public : \
+#define gdcmNewMacro(type) \
+ public : \
static type *New() {return new type(); } /* Not implemented */
//-----------------------------------------------------------------------------
//
// Define GDCM_LEGACY macro to mark legacy methods where they are
// declared in their class.
-//
-// WARNING : Don't try to use it with 'inline' methods !
+//
+// WARNING : Don't try to use it with 'inline' methods !
//
//Example usage:
//
// // @deprecated Replaced by MyOtherMethod() as of gdcm 2.0.
-// GDCM_LEGACY(void MyMethod());
+// GDCM_LEGACY(void MyMethod())
#if defined(GDCM_LEGACY_REMOVE)
// Remove legacy methods completely.
# define GDCM_LEGACY(method)
-#elif defined(GDCM_LEGACY_SILENT) || defined(SWIG)
+#elif defined(GDCM_LEGACY_SILENT)
// Provide legacy methods with no warnings.
-# define GDCM_LEGACY(method) method
+# define GDCM_LEGACY(method) method;
#else
// Setup compile-time warnings for uses of deprecated methods if
// possible on this compiler.
#if defined(__APPLE__) && (__GNUC__ == 3) && (__GNUC_MINOR__ == 3)
// Seems like there is a bug in APPLE gcc for deprecated attribute and ctor
// This is fixed in g++ 4.0 (Tiger)
-# define GDCM_LEGACY(method) method
+# define GDCM_LEGACY(method) method;
#else
-# define GDCM_LEGACY(method) method __attribute__((deprecated))
+# define GDCM_LEGACY(method) method __attribute__((deprecated));
#endif
# elif defined(_MSC_VER) && _MSC_VER >= 1300
-# define GDCM_LEGACY(method) __declspec(deprecated) method
+# define GDCM_LEGACY(method) __declspec(deprecated) method;
# else
-# define GDCM_LEGACY(method) method
+# define GDCM_LEGACY(method) method;
# endif
#endif