...

[cpPlugins.git] / lib / cpPlugins / Config.h.in

diff --git a/lib/cpPlugins/Config.h.in b/lib/cpPlugins/Config.h.in
index c10ee8d0b8dff20054da7cc54b8f97523b42b972..4e58a1d334576b4d23ddd44844aac41787491f1b 100644 (file)
--- a/lib/cpPlugins/Config.h.in
+++ b/lib/cpPlugins/Config.h.in
@@ -70,19 +70,21 @@
  * Language related macros
  * =========================================================================
  */
-#if __cplusplus >= 201103L
-#  define cpPlugins_OVERRIDE override
-#  define cpPlugins_DELETE_FUNCTION =delete
-#  define cpPlugins_NULLPTR  nullptr
-#  define cpPlugins_NOEXCEPT noexcept
-#  define cpPlugins_HAS_CXX11_STATIC_ASSERT
-#  define cpPlugins_HAS_CXX11_RVREF
-#else // __cplusplus >= 201103L
-#  define cpPlugins_OVERRIDE
-#  define cpPlugins_DELETE_FUNCTION
-#  define cpPlugins_NULLPTR  NULL
-#  define cpPlugins_NOEXCEPT throw()
-#endif // __cplusplus >= 201103L
+/* TODO
+   #if __cplusplus >= 201103L
+   #  define override override
+   #  define cpPlugins_DELETE_FUNCTION =delete
+   #  define cpPlugins_NULLPTR  nullptr
+   #  define cpPlugins_NOEXCEPT noexcept
+   #  define cpPlugins_HAS_CXX11_STATIC_ASSERT
+   #  define cpPlugins_HAS_CXX11_RVREF
+   #else // __cplusplus >= 201103L
+   #  define override
+   #  define cpPlugins_DELETE_FUNCTION
+   #  define cpPlugins_NULLPTR  NULL
+   #  define cpPlugins_NOEXCEPT throw()
+   #endif // __cplusplus >= 201103L
+*/
 
 /*
  * =========================================================================
@@ -92,9 +94,9 @@
 
 #define cpPlugins_Id_Macro( _class, _category )                         \
   public:                                                               \
-  virtual const char* GetClassName( ) const cpPlugins_OVERRIDE          \
+  virtual const char* GetClassName( ) const override          \
   { return( #_class ); }                                                \
-  virtual const char* GetClassCategory( ) const cpPlugins_OVERRIDE      \
+  virtual const char* GetClassCategory( ) const override      \
   { return( #_category ); }
 
 #define cpPluginsObject( _cls, _scls, _cat )                            \
@@ -107,14 +109,14 @@
   itkNewMacro( Self );                                                  \
   itkTypeMacro( _cls, _scls );                                          \
   public:                                                               \
-  virtual const char* GetClassName( ) const cpPlugins_OVERRIDE          \
+  virtual const char* GetClassName( ) const override          \
   { return( #_cls ); }                                                  \
-  virtual const char* GetClassCategory( ) const cpPlugins_OVERRIDE      \
+  virtual const char* GetClassCategory( ) const override      \
   { return( #_cat ); }                                                  \
   protected:                                                            \
   _cls( );                                                              \
   virtual ~_cls( );                                                     \
-  virtual void _GenerateData( ) cpPlugins_OVERRIDE;                     \
+  virtual void _GenerateData( ) override;                     \
   private:                                                              \
   _cls( const Self& );                                                  \
   Self& operator=( const Self& )
@@ -122,7 +124,7 @@
 #define cpPlugins_Compatibility_Macro                           \
   virtual bool IsCompatible(                                    \
     const DataObject* other                                     \
-    ) const cpPlugins_OVERRIDE                                  \
+    ) const override                                  \
   {                                                             \
     return( dynamic_cast< const Self* >( other ) != NULL );     \
   }