code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo...
[blender-staging.git] / source / gameengine / Ketsji / KX_TimeCategoryLogger.h
index f01e405d3dfeaa9e26e78332ace667e7826bd123..d167d0addfe62eda9dd94a2399433606bce6efcd 100644 (file)
@@ -52,7 +52,7 @@ public:
 
        /**
         * Constructor.
-        * @param maxNumMesasurements Maximum number of measurements stored (> 1).
+        * \param maxNumMesasurements Maximum number of measurements stored (> 1).
         */
        KX_TimeCategoryLogger(unsigned int maxNumMeasurements = 10);
 
@@ -73,40 +73,40 @@ public:
 
        /**
         * Adds a category.
-        * @param category      The new category.
+        * \param category      The new category.
         */
        virtual void AddCategory(TimeCategory tc);
 
        /**
         * Starts logging in current measurement for the given category.
-        * @param tc                                    The category to log to.
-        * @param now                                   The current time.
-        * @param endOtherCategories    Whether to stop logging to other categories.
+        * \param tc                                    The category to log to.
+        * \param now                                   The current time.
+        * \param endOtherCategories    Whether to stop logging to other categories.
         */
        virtual void StartLog(TimeCategory tc, double now, bool endOtherCategories = true);
 
        /**
         * End logging in current measurement for the given category.
-        * @param tc    The category to log to.
-        * @param now   The current time.
+        * \param tc    The category to log to.
+        * \param now   The current time.
         */
        virtual void EndLog(TimeCategory tc, double now);
 
        /**
         * End logging in current measurement for all categories.
-        * @param now   The current time.
+        * \param now   The current time.
         */
        virtual void EndLog(double now);
 
        /**
         * Logs time in next measurement.
-        * @param now   The current time.
+        * \param now   The current time.
         */
        virtual void NextMeasurement(double now);
 
        /**
         * Returns average of all but the current measurement time.
-        * @return The average of all but the current measurement.
+        * \return The average of all but the current measurement.
         */
        virtual double GetAverage(TimeCategory tc);
 
@@ -129,11 +129,8 @@ protected:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeCategoryLogger"); }
-       void operator delete( void *mem ) { MEM_freeN(mem); }
+       MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_TimeCategoryLogger")
 #endif
 };
 
-#endif // __KX_TIMECATEGORYLOGGER_H__
-
+#endif  /* __KX_TIMECATEGORYLOGGER_H__ */