History

Fix some issues when building on mac

elinor fung committed 9 years ago

Commit 34cadb21 parent db76c0c12 files · +47 −44Browse files

Showing the changes to src/vm/vm_memory.cpp (1 of 12 files). Show all

Unified · Split

src/vm/vm_memory.cpp+15−14
@@ -7,6 +7,7 @@ · 6 unmodified lines
77 #include <memory>
88 #include <atomic>
99 #include <bitset>
10+#include <cstdlib>
1011 #include <mutex>
1112 #include <limits>
1213 #include <vector>
@@ -355,98 +356,98 @@ namespace · 342 unmodified lines
355356 }
356357
357358 template<>
358−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<byte_t>()
359+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<byte_t>()
359360 {
360361 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::byte, hidden_type_desc::deleter };
361362 return t;
362363 }
363364
364365 template<>
365−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<short_word_t>()
366+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<short_word_t>()
366367 {
367368 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::short_word, hidden_type_desc::deleter };
368369 return t;
369370 }
370371
371372 template<>
372−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<word_t>()
373+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<word_t>()
373374 {
374375 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::word, hidden_type_desc::deleter };
375376 return t;
376377 }
377378
378379 template<>
379−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<short_real_t>()
380+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<short_real_t>()
380381 {
381382 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::short_real, hidden_type_desc::deleter };
382383 return t;
383384 }
384385
385386 template<>
386−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<real_t>()
387+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<real_t>()
387388 {
388389 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::real, hidden_type_desc::deleter };
389390 return t;
390391 }
391392
392393 template<>
393−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<big_t>()
394+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<big_t>()
394395 {
395396 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::big, hidden_type_desc::deleter };
396397 return t;
397398 }
398399
399400 template<>
400−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<pointer_t>()
401+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<pointer_t>()
401402 {
402403 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::pointer, hidden_type_desc::deleter };
403404 return t;
404405 }
405406
406407 template<>
407−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_array_t>()
408+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_array_t>()
408409 {
409410 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::vm_array, hidden_type_desc::deleter };
410411 return t;
411412 }
412413
413414 template<>
414−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_list_t>()
415+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_list_t>()
415416 {
416417 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::vm_list, hidden_type_desc::deleter };
417418 return t;
418419 }
419420
420421 template<>
421−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_channel_t>()
422+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_channel_t>()
422423 {
423424 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::vm_channel, hidden_type_desc::deleter };
424425 return t;
425426 }
426427
427428 template<>
428−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_string_t>()
429+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_string_t>()
429430 {
430431 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::vm_string, hidden_type_desc::deleter };
431432 return t;
432433 }
433434
434435 template<>
435−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_module_ref_t>()
436+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_module_ref_t>()
436437 {
437438 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::vm_module_ref, hidden_type_desc::deleter };
438439 return t;
439440 }
440441
441442 template<>
442−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_stack_t>()
443+std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_stack_t>()
443444 {
444445 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::vm_stack, hidden_type_desc::deleter };
445446 return t;
446447 }
447448
448449 template<>
449−static std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_thread_t>()
450+ std::shared_ptr<const type_descriptor_t> intrinsic_type_desc::type<vm_thread_t>()
450451 {
451452 static std::shared_ptr<const type_descriptor_t> t = { &hidden_type_desc::vm_thread, hidden_type_desc::deleter };
452453 return t;