Changeset 6521

Show
Ignore:
Timestamp:
16/03/10 12:59:52 (2 years ago)
Author:
westram
Message:
  • added COMPILE_ASSERT
  • assert correct pointersizes for PT-server
Location:
branches/stable_5.0
Files:
1 added
3 modified

Legend:

Unmodified
Added
Removed

  • branches/stable_5.0/PROBE/Makefile

    r5968 r6521  
    5151PT_buildtree.o: $(ARBHOME)/INCLUDE/PT_server.h 
    5252PT_buildtree.o: $(ARBHOME)/INCLUDE/PT_server_prototypes.h 
     53PT_buildtree.o: $(ARBHOME)/INCLUDE/static_assert.h 
    5354 
    5455PT_etc.o: probe.h 
    … …  
    7980PT_family.o: $(ARBHOME)/INCLUDE/PT_server.h 
    8081PT_family.o: $(ARBHOME)/INCLUDE/PT_server_prototypes.h 
     82PT_family.o: $(ARBHOME)/INCLUDE/static_assert.h 
    8183PT_family.o: $(ARBHOME)/INCLUDE/struct_man.h 
    8284 
    … …  
    9395PT_findEx.o: $(ARBHOME)/INCLUDE/PT_server.h 
    9496PT_findEx.o: $(ARBHOME)/INCLUDE/PT_server_prototypes.h 
     97PT_findEx.o: $(ARBHOME)/INCLUDE/static_assert.h 
    9598 
    9699PT_io.o: probe.h 
    … …  
    141144PT_match.o: $(ARBHOME)/INCLUDE/PT_server.h 
    142145PT_match.o: $(ARBHOME)/INCLUDE/PT_server_prototypes.h 
     146PT_match.o: $(ARBHOME)/INCLUDE/static_assert.h 
    143147PT_match.o: $(ARBHOME)/INCLUDE/struct_man.h 
    144148 
    … …  
    158162PT_new_design.o: $(ARBHOME)/INCLUDE/PT_server.h 
    159163PT_new_design.o: $(ARBHOME)/INCLUDE/PT_server_prototypes.h 
     164PT_new_design.o: $(ARBHOME)/INCLUDE/static_assert.h 
    160165PT_new_design.o: $(ARBHOME)/INCLUDE/struct_man.h 
    161166 
    … …  
    170175PT_prefixtree.o: $(ARBHOME)/INCLUDE/PT_com.h 
    171176PT_prefixtree.o: $(ARBHOME)/INCLUDE/PT_server.h 
     177PT_prefixtree.o: $(ARBHOME)/INCLUDE/static_assert.h 
    172178 
    173179PT_secundaer.o: probe.h 

  • branches/stable_5.0/PROBE/probe_tree.hxx

    r5919 r6521  
    44#include <bits/wordsize.h> 
    55#endif // DARWIN 
     6 
     7#ifndef STATIC_ASSERT_H 
     8#include <static_assert.h> 
     9#endif 
    610 
    711#define PTM_magic             0xf4 
    … …  
    226230#ifdef ARB_64 
    227231 
     232COMPILE_ASSERT(sizeof(void*) == sizeof(unsigned long)); 
     233 
    228234# define PT_READ_PNTR(ptr,my_int_i)                                     \ 
    229235    do {                                                                \ 
    … …  
    240246#else 
    241247/* not ARB_64 */ 
     248 
     249COMPILE_ASSERT(sizeof(void*) == sizeof(unsigned int)); 
    242250 
    243251# define PT_READ_PNTR(ptr,my_int_i)  PT_READ_INT(ptr, my_int_i) 

  • branches/stable_5.0/SOURCE_TOOLS/generate_all_links.sh

    r6023 r6521  
    124124symlink ../TEMPLATES/perf_timer.h INCLUDE/perf_timer.h && 
    125125symlink ../TEMPLATES/smartptr.h INCLUDE/smartptr.h && 
     126symlink ../TEMPLATES/static_assert.h INCLUDE/static_assert.h && 
    126127 
    127128symlink_maybe_no_target ../TEMPLATES/arb_build.h INCLUDE/arb_build.h &&