MacOS X targets for Scons, Fix some inlines for clang

1 files changed, 21 insertions, 21 deletions

diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h
index ebf590d..83e5629 100644
--- a/src/simulation/Simulation.h
+++ b/src/simulation/Simulation.h
@@ -129,33 +129,33 @@ public:
 	Snapshot * CreateSnapshot();
 	void Restore(const Snapshot & snap);
 
-	inline int is_blocking(int t, int x, int y);
-	inline int is_boundary(int pt, int x, int y);
-	inline int find_next_boundary(int pt, int *x, int *y, int dm, int *em);
-	inline int pn_junction_sprk(int x, int y, int pt);
-	inline void photoelectric_effect(int nx, int ny);
-	inline unsigned direction_to_map(float dx, float dy, int t);
-	inline int do_move(int i, int x, int y, float nxf, float nyf);
-	inline int try_move(int i, int x, int y, int nx, int ny);
-	inline int eval_move(int pt, int nx, int ny, unsigned *rr);
+	TPT_NO_INLINE int is_blocking(int t, int x, int y);
+	TPT_NO_INLINE int is_boundary(int pt, int x, int y);
+	TPT_NO_INLINE int find_next_boundary(int pt, int *x, int *y, int dm, int *em);
+	TPT_NO_INLINE int pn_junction_sprk(int x, int y, int pt);
+	TPT_NO_INLINE void photoelectric_effect(int nx, int ny);
+	TPT_NO_INLINE unsigned direction_to_map(float dx, float dy, int t);
+	TPT_NO_INLINE int do_move(int i, int x, int y, float nxf, float nyf);
+	TPT_NO_INLINE int try_move(int i, int x, int y, int nx, int ny);
+	TPT_NO_INLINE int eval_move(int pt, int nx, int ny, unsigned *rr);
 	void init_can_move();
 	void create_cherenkov_photon(int pp);
 	void create_gain_photon(int pp);
-	inline void kill_part(int i);
+	TPT_NO_INLINE void kill_part(int i);
 	int flood_prop(int x, int y, size_t propoffset, void * propvalue, StructProperty::PropertyType proptype);
 	int flood_prop_2(int x, int y, size_t propoffset, void * propvalue, StructProperty::PropertyType proptype, int parttype, char * bitmap);
 	int flood_water(int x, int y, int i, int originaly, int check);
-	inline void detach(int i);
-	inline void part_change_type(int i, int x, int y, int t);
-	inline int create_part_add_props(int p, int x, int y, int tv, int rx, int ry);
+	TPT_NO_INLINE void detach(int i);
+	TPT_NO_INLINE void part_change_type(int i, int x, int y, int t);
+	TPT_NO_INLINE int create_part_add_props(int p, int x, int y, int tv, int rx, int ry);
 	//int InCurrentBrush(int i, int j, int rx, int ry);
 	//int get_brush_flags();
-	inline int create_part(int p, int x, int y, int t);
-	inline void delete_part(int x, int y, int flags);
+	TPT_NO_INLINE int create_part(int p, int x, int y, int t);
+	TPT_NO_INLINE void delete_part(int x, int y, int flags);
 	void get_sign_pos(int i, int *x0, int *y0, int *w, int *h);
-	inline int is_wire(int x, int y);
-	inline int is_wire_off(int x, int y);
-	inline void set_emap(int x, int y);
+	TPT_NO_INLINE int is_wire(int x, int y);
+	TPT_NO_INLINE int is_wire_off(int x, int y);
+	TPT_NO_INLINE void set_emap(int x, int y);
 	TPT_NO_INLINE int parts_avg(int ci, int ni, int t);
 	void create_arc(int sx, int sy, int dx, int dy, int midpoints, int variance, int type, int flags);
 	int nearest_part(int ci, int t, int max_d);
@@ -198,9 +198,9 @@ public:
 	void *transform_save(void *odata, int *size, matrix2d transform, vector2d translate);
 	TPT_NO_INLINE void orbitalparts_get(int block1, int block2, int resblock1[], int resblock2[]);
 	TPT_NO_INLINE void orbitalparts_set(int *block1, int *block2, int resblock1[], int resblock2[]);
-	inline int get_wavelength_bin(int *wm);
-	inline int get_normal(int pt, int x, int y, float dx, float dy, float *nx, float *ny);
-	inline int get_normal_interp(int pt, float x0, float y0, float dx, float dy, float *nx, float *ny);
+	TPT_NO_INLINE int get_wavelength_bin(int *wm);
+	TPT_NO_INLINE int get_normal(int pt, int x, int y, float dx, float dy, float *nx, float *ny);
+	TPT_NO_INLINE int get_normal_interp(int pt, float x0, float y0, float dx, float dy, float *nx, float *ny);
 	void clear_sim();
 	void UpdateParticles();
 	Simulation();