[parrot/parrot] 589863: Fix some merge issues with gci_api_getclass branch...

[noreply at github.com]

Branch: refs/heads/embed_api2
Home:   https://github.com/parrot/parrot

Commit: 58986353569343f828d2561a9528d6066586703a
    https://github.com/parrot/parrot/commit/58986353569343f828d2561a9528d6066586703a
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-18 (Sat, 18 Dec 2010)

Changed paths:
  M include/parrot/api.h
  M src/embed/api.c
  M src/embed/pmc.c
  M t/src/embed/pmc.t

Log Message:
-----------
Fix some merge issues with gci_api_getclass branch. I had some look-alike functions in here to what has been merged. I kept one of mine and kept one of his.


Commit: c3c31aa0dabc2be00f26277bb2a3e99eabc8bd1c
    https://github.com/parrot/parrot/commit/c3c31aa0dabc2be00f26277bb2a3e99eabc8bd1c
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-18 (Sat, 18 Dec 2010)

Changed paths:
  M src/embed/pmc.c
  M t/src/embed/pmc.t

Log Message:
-----------
fix t/src/embed/pmc.t to pass again. needs updating


Commit: 9dcc07c51337159167f2c039384603c03d10481e
    https://github.com/parrot/parrot/commit/9dcc07c51337159167f2c039384603c03d10481e
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-18 (Sat, 18 Dec 2010)

Changed paths:
  M include/parrot/api.h
  M src/embed/pmc.c
  M t/src/embed/pmc.t

Log Message:
-----------
Add Parrot_api_pmc_box_integer. Update one of the new tests to use it


Commit: dc35afe1fa24deb9317043a3e1938d8aba23720c
    https://github.com/parrot/parrot/commit/dc35afe1fa24deb9317043a3e1938d8aba23720c
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-18 (Sat, 18 Dec 2010)

Changed paths:
  M t/src/embed/pmc.t

Log Message:
-----------
update the 4th test in pmc.t to use all API functions