diff options
author | rsgowman <rgowman@google.com> | 2018-06-04 13:02:31 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-04 13:02:31 -0400 |
commit | ce61f4e0e654e7a16dad023e1b8df32449d5a00f (patch) | |
tree | 669ca1d7416d738901ab879be92b28621c95b3a1 /Firestore/core/src/firebase/firestore/remote | |
parent | bb546e19885ae084823e0315e93564a44c0a8257 (diff) |
Rename nanopb generated headers from foo.pb.h to foo.nanopb.h (#1371)
This avoids a collision with the libprotobuf generated files.
Also removes the "well-known" cpp protos, relying on libprotobuf to supply these instead.
Diffstat (limited to 'Firestore/core/src/firebase/firestore/remote')
-rw-r--r-- | Firestore/core/src/firebase/firestore/remote/serializer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Firestore/core/src/firebase/firestore/remote/serializer.cc b/Firestore/core/src/firebase/firestore/remote/serializer.cc index 03fbb1a..0839efc 100644 --- a/Firestore/core/src/firebase/firestore/remote/serializer.cc +++ b/Firestore/core/src/firebase/firestore/remote/serializer.cc @@ -24,8 +24,8 @@ #include <string> #include <utility> -#include "Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.h" -#include "Firestore/Protos/nanopb/google/firestore/v1beta1/firestore.pb.h" +#include "Firestore/Protos/nanopb/google/firestore/v1beta1/document.nanopb.h" +#include "Firestore/Protos/nanopb/google/firestore/v1beta1/firestore.nanopb.h" #include "Firestore/core/include/firebase/firestore/firestore_errors.h" #include "Firestore/core/include/firebase/firestore/timestamp.h" #include "Firestore/core/src/firebase/firestore/model/document.h" |