[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47494] branches/soc-2012-swiss_cheese/ source/blender/blenlib: Patch [#30962] Change inline math source files to header files
Jason Wilkins
Jason.A.Wilkins at gmail.com
Wed Jun 6 07:12:17 CEST 2012
Revision: 47494
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47494
Author: jwilkins
Date: 2012-06-06 05:12:00 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Patch [#30962] Change inline math source files to header files
Missed some files from last commit.
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_base.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_color.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_geom.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_inline.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_vector.h
Modified: branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_base.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_base.h 2012-06-06 03:24:02 UTC (rev 47493)
+++ branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_base.h 2012-06-06 05:12:00 UTC (rev 47494)
@@ -142,9 +142,7 @@
# define CLAMP(a, b, c) if ((a) < (b)) (a) = (b); else if ((a) > (c)) (a) = (c)
#endif
-#ifdef __BLI_MATH_INLINE_H__
-#include "intern/math_base_inline.c"
-#endif
+#include "intern/math_base_inline.h"
/******************************* Float ******************************/
Modified: branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_color.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_color.h 2012-06-06 03:24:02 UTC (rev 47493)
+++ branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_color.h 2012-06-06 05:12:00 UTC (rev 47494)
@@ -116,9 +116,7 @@
void lift_gamma_gain_to_asc_cdl(float *lift, float *gamma, float *gain, float *offset, float *slope, float *power);
-#ifdef __BLI_MATH_INLINE_H__
-#include "intern/math_color_inline.c"
-#endif
+#include "intern/math_color_inline.h"
#ifdef __cplusplus
}
Modified: branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_geom.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_geom.h 2012-06-06 03:24:02 UTC (rev 47493)
+++ branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_geom.h 2012-06-06 05:12:00 UTC (rev 47494)
@@ -36,9 +36,7 @@
#include "BLI_math_inline.h"
-#ifdef __BLI_MATH_INLINE_H__
-#include "intern/math_geom_inline.c"
-#endif
+#include "intern/math_geom_inline.h"
/********************************** Polygons *********************************/
Modified: branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_inline.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_inline.h 2012-06-06 03:24:02 UTC (rev 47493)
+++ branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_inline.h 2012-06-06 05:12:00 UTC (rev 47494)
@@ -35,24 +35,18 @@
#endif
/* add platform/compiler checks here if it is not supported */
-#define __BLI_MATH_INLINE_H__
-#ifdef __BLI_MATH_INLINE_H__
-# ifdef _MSC_VER
-# define MINLINE static __forceinline
-# define MALWAYS_INLINE MINLINE
+#ifdef _MSC_VER
+# define MINLINE static __forceinline
+# define MALWAYS_INLINE MINLINE
+#else
+# define MINLINE static inline
+# if (defined(__APPLE__) && defined(__ppc__))
+ /* static inline __attribute__ here breaks osx ppc gcc42 build */
+# define MALWAYS_INLINE static __attribute__((always_inline))
# else
-# define MINLINE static inline
-# if (defined(__APPLE__) && defined(__ppc__))
- /* static inline __attribute__ here breaks osx ppc gcc42 build */
-# define MALWAYS_INLINE static __attribute__((always_inline))
-# else
-# define MALWAYS_INLINE static inline __attribute__((always_inline))
-# endif
+# define MALWAYS_INLINE static inline __attribute__((always_inline))
# endif
-#else
-# define MINLINE
-# define MALWAYS_INLINE
#endif
#ifdef __cplusplus
Modified: branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_vector.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_vector.h 2012-06-06 03:24:02 UTC (rev 47493)
+++ branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_vector.h 2012-06-06 05:12:00 UTC (rev 47494)
@@ -36,9 +36,7 @@
#include "BLI_math_inline.h"
-#ifdef __BLI_MATH_INLINE_H__
-#include "intern/math_vector_inline.c"
-#endif
+#include "intern/math_vector_inline.h"
/************************************* Init ***********************************/
More information about the Bf-blender-cvs
mailing list