BridJ: stricter matching of int vs. pointer in C++ demangler: int can now never match ptr, and long needs `@Ptr` annotation (issue #482)