diff options
| author | jacob1 <jfu614@gmail.com> | 2012-09-04 00:09:53 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-06 23:52:56 (GMT) |
| commit | f8f70a3f770b6cbc1e9c182572317c0968af718b (patch) | |
| tree | 03e94654817ce2c944bcc75f484313331e2daf9d /src/simulation/Simulation.h | |
| parent | 58fa3dd539ad0ee7ebb44ec68515bdc22956c095 (diff) | |
| download | powder-f8f70a3f770b6cbc1e9c182572317c0968af718b.zip powder-f8f70a3f770b6cbc1e9c182572317c0968af718b.tar.gz | |
Visual studio compatibility
This removes some inlines when using visual studio to compile, uisng TPT_NO_INLINE. It also fixes many other problems visual studio has with the code
Diffstat (limited to 'src/simulation/Simulation.h')
| -rw-r--r-- | src/simulation/Simulation.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h index c2b9002..ebf590d 100644 --- a/src/simulation/Simulation.h +++ b/src/simulation/Simulation.h @@ -156,7 +156,7 @@ public: 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); - inline int parts_avg(int ci, int ni, int t); + 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); void update_particles_i(int start, int inc); @@ -196,8 +196,8 @@ public: int GetParticleType(std::string type); void *transform_save(void *odata, int *size, matrix2d transform, vector2d translate); - inline void orbitalparts_get(int block1, int block2, int resblock1[], int resblock2[]); - inline void orbitalparts_set(int *block1, int *block2, int resblock1[], int resblock2[]); + 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); |
