Changeset 358 for bdm/user_info.h

Timestamp:

06/08/09 15:22:12 (15 years ago)

Author:

smidl

Message:

compilation fixes for Linux

Files:

• bdm/user_info.h (modified) (3 diffs)

bdm/user_info.h

@@ -16 +16 @@
 using namespace libconfig;
 
-#define UIREGISTER(class_name) template<> Particular_UI<class_name>& Particular_UI<class_name>::ui = Particular_UI<class_name>(#class_name)
+#ifdef BDMLIB 
+#define UIREGISTER(class_name) template<> const Particular_UI<class_name>& Particular_UI<class_name>::ui = Particular_UI<class_name>(#class_name) 
+#else
+#define UIREGISTER(class_name)
+#endif
 
 #define ASSERT_UITYPE(S,Type) it_assert_debug(S.getType()==Setting::Type, string("Wrong setting type, see input path \"")+string(S.getPath())+string("\""))
@@ -314 +318 @@
 template<typename T> class Particular_UI : private UI
 {
-        // to permit acces to the Particular_UI<T>::ui to the UI class
-        friend UI;
+        public:
 
         //! default constructor, which is intentionally declared as private
@@ -324 +327 @@
         //! the only instance of this class (each type T has its own instance)
         //! which is used as a factory for processing related UI
-        static Particular_UI<T>& ui;    
+        static const Particular_UI<T>& ui;      
 
         bdmroot* new_instance() const