bits: -unused macros

Author: JamesMcClung

src/libpsc/bits.hxx

@@ -8,53 +8,6 @@ extern MPI_Comm psc_comm_world;
 extern int psc_world_rank;
 extern int psc_world_size;
 
-// FIXME, this is chosen globally and to match vpic, but could be
-// made dependent on actual MaterialList implementation
-enum
-{
-  MaterialIdMax = 32768
-};
-typedef int16_t MaterialId;
-
-// FIXME, this is chosen globally and to match vpic for now
-typedef int32_t SpeciesId; // Must be 32-bit wide for particle_injector_t
-
-// FIXME, get rid of this BOUNDARY macro
-#define BOUNDARY(i, j, k)                                                      \
-  (13 + (i) + 3 * (j) + 9 * (k)) /* FORTRAN -1:1,-1:1,-1:1 */
-
-// FIXME, get rid of
-#define VOXEL(x, y, z, nx, ny, nz) ((x) + ((nx) + 2) * ((y) + ((ny) + 2) * (z)))
-
-// FIXME, get rid of
-#define BEGIN_PRIMITIVE do
-#define END_PRIMITIVE while (0)
-
-// FIXME
-#ifndef ALIGNED
-#define ALIGNED(a)
-#endif
-
-// FIXME
-#ifndef RESTRICT
-#define RESTRICT __restrict
-#endif
-
-// FIXME
-#define DECLARE_ALIGNED_ARRAY(type, align, name, count)                        \
-  type name[(count)] __attribute__((aligned(align)))
-
-// FIXME
-#define POW2_CEIL(u, a) (((u) + (a) - 1) & (~((a) - 1)))
-
-// FIXME
-#ifndef LIKELY
-#define LIKELY(_c) __builtin_expect((_c), 1)
-#endif
-#ifndef UNLIKELY
-#define UNLIKELY(_c) __builtin_expect((_c), 0)
-#endif
-
 #ifndef mprintf
 #define mprintf(fmt...)                                                        \
   do {                                                                         \