Changeset 535

Timestamp:

08/16/09 18:13:28 (15 years ago)

Author:

smidl

Message:

Changed UIREGISTER for templated classes to UIREGISTER2.

* it is now consistent with SHAREDPTR2
* it works even when two UIREGISTERS are on the same line in defferent files

Location:

library/bdm

Files:

• base/user_info.h (modified) (2 diffs)
• stat/exp_family.h (modified) (3 diffs)

library/bdm/base/user_info.h

@@ -551 +551 @@
 }
 
-#define CONCATENATE0( name, line ) name##line
-#define CONCATENATE( name, line ) CONCATENATE0( name, line )
-
 /*!
   \def UIREGISTER(class_name)
@@ -564 +561 @@
 */
 #ifndef BDMLIB
-#define UIREGISTER(class_name) static bdm::ParticularUI<class_name> CONCATENATE(registrator, __LINE__)(#class_name)
+#define UIREGISTER(class_name) static bdm::ParticularUI<class_name> UI##class_name(#class_name)
 #else
 #define UIREGISTER(class_name)
 #endif
 
+//! Instrumental macro for UIREGISTER2
+#define QUOTEME(x) #x
+
+/*!
+  \def UIREGISTER2(class_name,template_name)
+  \brief Variant of UIREGISTER for templated classes
+
+  Technical meann of registering UIREGISTER(class_name<template_name>).
+
+  \ref ui_page
+ */
+#ifndef BDMLIB
+#define UIREGISTER2(class_name, temp_name) static bdm::ParticularUI<class_name<temp_name> > UI##class_name##_##temp_name( QUOTEME(class_name<temp_name>) )
+#else
+#define UIREGISTER2(class_name,temp_name) 
+#endif
+
 #endif // #ifndef USER_INFO_H

library/bdm/stat/exp_family.h

@@ -164 +164 @@
 
 };
-UIREGISTER (enorm<chmat>);
+UIREGISTER2 (enorm, chmat);
 SHAREDPTR2 ( enorm, chmat );
-UIREGISTER (enorm<ldmat>);
+UIREGISTER2 (enorm, ldmat);
 SHAREDPTR2 ( enorm, ldmat );
-UIREGISTER (enorm<fsqmat>);
+UIREGISTER2 (enorm, fsqmat);
 SHAREDPTR2 ( enorm, fsqmat );
 
@@ -571 +571 @@
                 };
 };
-UIREGISTER (mlnorm<ldmat>);
+UIREGISTER2 (mlnorm,ldmat);
 SHAREDPTR2 ( mlnorm, ldmat );
-UIREGISTER (mlnorm<fsqmat>);
+UIREGISTER2 (mlnorm,fsqmat);
 SHAREDPTR2 ( mlnorm, fsqmat );
-UIREGISTER (mlnorm<chmat>);
+UIREGISTER2 (mlnorm, chmat);
 SHAREDPTR2 ( mlnorm, chmat );
 
@@ -635 +635 @@
 };
 
-UIREGISTER (mgnorm<chmat>);
+UIREGISTER2 (mgnorm, chmat);
 SHAREDPTR2 ( mgnorm, chmat );