From 9fbbbcb2a25119a5966855498a5828bb430e7978 Mon Sep 17 00:00:00 2001 From: rsgowman Date: Fri, 20 Apr 2018 11:14:47 -0400 Subject: Fix build breakages under linux (gcc) (#1154) * fix multiline comments by subst /* ... */ for // * fix unreachable case in a switch statement --- .../src/firebase/firestore/immutable/llrb_node.h | 30 ++++++++++++---------- .../firestore/immutable/sorted_map_iterator.h | 1 + 2 files changed, 17 insertions(+), 14 deletions(-) (limited to 'Firestore/core') diff --git a/Firestore/core/src/firebase/firestore/immutable/llrb_node.h b/Firestore/core/src/firebase/firestore/immutable/llrb_node.h index 0294efe..3dc4030 100644 --- a/Firestore/core/src/firebase/firestore/immutable/llrb_node.h +++ b/Firestore/core/src/firebase/firestore/immutable/llrb_node.h @@ -273,13 +273,14 @@ void LlrbNode::FixUp() { } } -// Rotates left: -// -// X R -// / \ / \ -// L R => X RR -// / \ / \ -// RL RR L RL +/* Rotates left: + * + * X R + * / \ / \ + * L R => X RR + * / \ / \ + * RL RR L RL + */ template void LlrbNode::RotateLeft() { LlrbNode new_left{ @@ -291,13 +292,14 @@ void LlrbNode::RotateLeft() { set_right(right().right()); } -// Rotates right: -// -// X L -// / \ / \ -// L R => LL X -// / \ / \ -// LL LR LR R +/* Rotates right: + * + * X L + * / \ / \ + * L R => LL X + * / \ / \ + * LL LR LR R + */ template void LlrbNode::RotateRight() { LlrbNode new_right{ diff --git a/Firestore/core/src/firebase/firestore/immutable/sorted_map_iterator.h b/Firestore/core/src/firebase/firestore/immutable/sorted_map_iterator.h index 36f3967..a79f9f5 100644 --- a/Firestore/core/src/firebase/firestore/immutable/sorted_map_iterator.h +++ b/Firestore/core/src/firebase/firestore/immutable/sorted_map_iterator.h @@ -123,6 +123,7 @@ class SortedMapIterator { case Tag::Tree: return tree_iter_.get(); } + FIREBASE_UNREACHABLE(); } reference operator*() const { -- cgit v1.2.3