[parrot/parrot] 6be2b4: remove the ASSERT_ARGS stuff, and other things tha...

[noreply at github.com]

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

Commit: 6be2b4aa79b3bb9ea5640a2dbac9dde9f9c00dfa
    https://github.com/parrot/parrot/commit/6be2b4aa79b3bb9ea5640a2dbac9dde9f9c00dfa
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-05 (Sun, 05 Dec 2010)

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

Log Message:
-----------
remove the ASSERT_ARGS stuff, and other things that are borking thebuild.


Commit: 73f662d65ef1081c7d3bbe341124db6dea75b8a8
    https://github.com/parrot/parrot/commit/73f662d65ef1081c7d3bbe341124db6dea75b8a8
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-05 (Sun, 05 Dec 2010)

Changed paths:
  M compilers/imcc/main.c
  M include/parrot/api.h
  M src/embed/api.c
  M src/embed/pmc.c
  M src/embed/strings.c
  M src/main.c

Log Message:
-----------
some fixes so libparrot builds with g++


Commit: 5a8f9555372db6f0a977969ba7daafda207efe1c
    https://github.com/parrot/parrot/commit/5a8f9555372db6f0a977969ba7daafda207efe1c
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-05 (Sun, 05 Dec 2010)

Changed paths:
  M lib/Parrot/Headerizer.pm
  M src/embed/api.c

Log Message:
-----------
fix conflict on comments