Revision | 36 (tree) |
---|---|
Time | 2019-03-18 15:50:09 |
Author | systemfugen |
min, max関数をinline指定した
@@ -295,10 +295,11 @@ | ||
295 | 295 | ///Get the MGCL File validity. |
296 | 296 | extern MG_DLL_DECLR const char* File_validity(); |
297 | 297 | |
298 | -double MG_DLL_DECLR max(double a, double b); | |
299 | -double MG_DLL_DECLR min(double a, double b); | |
300 | -int MG_DLL_DECLR max(int a, int b); | |
301 | -int MG_DLL_DECLR min(int a, int b); | |
298 | +///グローバルmin/max関数 | |
299 | +inline double max(double a, double b){ return a >= b ? a : b; }; | |
300 | +inline double min(double a, double b){ return a <= b ? a : b; }; | |
301 | +inline int max(int a, int b){ return a >= b ? a : b; }; | |
302 | +inline int min(int a, int b){ return a <= b ? a : b; }; | |
302 | 303 | |
303 | 304 | ///Compute the difference of min and max of the three doubles a1, a2, and a3. |
304 | 305 | double MG_DLL_DECLR Max3(double a1, double a2, double a3); |