THRIFT-5589 Haxe compiler/runtime fixes
Client: hx
Patch: Jens Geyer
diff --git a/lib/haxe/test/src/MultiplexTest.hx b/lib/haxe/test/src/MultiplexTest.hx
index 3818b66..3e2786d 100644
--- a/lib/haxe/test/src/MultiplexTest.hx
+++ b/lib/haxe/test/src/MultiplexTest.hx
@@ -43,12 +43,12 @@
import Error;
-class BenchmarkServiceHandler implements BenchmarkService
+class BenchmarkServiceHandler implements BenchmarkService_service
{
public function new() {
}
- public function fibonacci(n : haxe.Int32) : haxe.Int32 {
+ public function fibonacci(n : haxe.Int32) : haxe.Int32 {
trace('Benchmark.fibonacci($n)');
var next : Int;
var prev = 0;
@@ -60,12 +60,12 @@
result = next;
--n;
}
- return result;
+ return result;
}
}
-class AggrServiceHandler implements Aggr
+class AggrServiceHandler implements Aggr_service
{
private var values : List<haxe.Int32> = new List<haxe.Int32>();
@@ -91,7 +91,7 @@
private inline static var NAME_AGGR : String = "Aggr";
- public static override function Run(server : Bool) : Void {
+ public static function Run(server : Bool) : Void {
if ( server) {
RunMultiplexServer();
} else {
@@ -102,13 +102,13 @@
// run the multiplex server
- public static override function RunMultiplexServer() : Void {
+ public static function RunMultiplexServer() : Void {
try
{
- var benchHandler : BenchmarkService = new BenchmarkServiceHandler();
+ var benchHandler : BenchmarkService_service = new BenchmarkServiceHandler();
var benchProcessor : TProcessor = new BenchmarkServiceProcessor( benchHandler);
- var aggrHandler : Aggr = new AggrServiceHandler();
+ var aggrHandler : Aggr_service = new AggrServiceHandler();
var aggrProcessor : TProcessor = new AggrProcessor( aggrHandler);
var multiplex : TMultiplexedProcessor = new TMultiplexedProcessor();
@@ -137,7 +137,7 @@
// run multiplex client against multiplex server
- public static override function RunMultiplexClient() : Void {
+ public static function RunMultiplexClient() : Void {
try
{
var trans : TTransport;
@@ -187,7 +187,7 @@
// run non-multiplex client against multiplex server to test default fallback
- public static override function RunDefaultClient() : Void {
+ public static function RunDefaultClient() : Void {
try
{
var trans : TTransport;