diff options
| author |  rsgowman <rgowman@google.com> | 2018-04-20 11:14:47 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-20 11:14:47 -0400 |
| commit | 9fbbbcb2a25119a5966855498a5828bb430e7978 (patch) | |
| tree | ca61473247ad141fba02b71325a3e694a34b6d50 /Firestore/core | |
| parent | 58b0aefc66772977752d01e35927e9eab3ee775f (diff) | |
Fix build breakages under linux (gcc) (#1154)
* fix multiline comments by subst /* ... */ for //
* fix unreachable case in a switch statement
Diffstat (limited to 'Firestore/core')
| -rw-r--r-- | Firestore/core/src/firebase/firestore/immutable/llrb_node.h | 30 | ||||
| -rw-r--r-- | Firestore/core/src/firebase/firestore/immutable/sorted_map_iterator.h | 1 |
2 files changed, 17 insertions, 14 deletions
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<K, V>::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 <typename K, typename V> void LlrbNode<K, V>::RotateLeft() { LlrbNode new_left{ @@ -291,13 +292,14 @@ void LlrbNode<K, V>::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 <typename K, typename V> void LlrbNode<K, V>::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 { |