From d2a32f9a18ebbf65bea798f558364571c91a9d79 Mon Sep 17 00:00:00 2001
From: Evan Martin <martine@danga.com>
Date: Thu, 3 Aug 2017 16:12:21 -0700
Subject: [PATCH] fix(compilation): compile under typescript 2.4 (#2780)

TypeScript 2.4 is more strict about assignability with generics,
and in some cases (when calling a generic function) it will infer
that the generic parameter is <{}> rather than the <T> that rxjs
typically wants.

Fix this by explicitly passing <T> in the cases where compilation
fails.
---
 src/observable/FromObservable.ts | 2 +-
 src/operator/catch.ts            | 2 +-
 src/operator/defaultIfEmpty.ts   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/observable/FromObservable.ts b/src/observable/FromObservable.ts
index f1de29590b..5585d20ce5 100644
--- a/src/observable/FromObservable.ts
+++ b/src/observable/FromObservable.ts
@@ -91,7 +91,7 @@ export class FromObservable<T> extends Observable<T> {
         return new FromObservable<T>(ish, scheduler);
       } else if (isArray(ish)) {
         return new ArrayObservable<T>(ish, scheduler);
-      } else if (isPromise(ish)) {
+      } else if (isPromise<T>(ish)) {
         return new PromiseObservable<T>(ish, scheduler);
       } else if (typeof ish[Symbol_iterator] === 'function' || typeof ish === 'string') {
         return new IteratorObservable<T>(ish, scheduler);
diff --git a/src/operator/catch.ts b/src/operator/catch.ts
index 1a2f470783..c244f07ebf 100644
--- a/src/operator/catch.ts
+++ b/src/operator/catch.ts
@@ -66,7 +66,7 @@ import { subscribeToResult } from '../util/subscribeToResult';
  */
 export function _catch<T, R>(this: Observable<T>, selector: (err: any, caught: Observable<T>) => ObservableInput<R>): Observable<T | R> {
   const operator = new CatchOperator(selector);
-  const caught = this.lift(operator);
+  const caught = this.lift<T>(operator);
   return (operator.caught = caught);
 }
 
diff --git a/src/operator/defaultIfEmpty.ts b/src/operator/defaultIfEmpty.ts
index cb33ff6b4e..a28aad1271 100644
--- a/src/operator/defaultIfEmpty.ts
+++ b/src/operator/defaultIfEmpty.ts
@@ -38,7 +38,7 @@ export function defaultIfEmpty<T, R>(this: Observable<T>, defaultValue?: R): Obs
  * @owner Observable
  */
 export function defaultIfEmpty<T, R>(this: Observable<T>, defaultValue: R = null): Observable<T | R> {
-  return this.lift(new DefaultIfEmptyOperator(defaultValue));
+  return this.lift<T>(new DefaultIfEmptyOperator(defaultValue));
 }
 
 class DefaultIfEmptyOperator<T, R> implements Operator<T, T | R> {