File tree Expand file tree Collapse file tree 6 files changed +14
-8
lines changed
src/include/firebase/internal
firestore/src/include/firebase/firestore Expand file tree Collapse file tree 6 files changed +14
-8
lines changed Original file line number Diff line number Diff line change @@ -212,6 +212,7 @@ set(internal_HDRS
212
212
src/include/firebase/future.h
213
213
src/include/firebase/internal/common.h
214
214
src/include/firebase/internal/future_impl.h
215
+ src/include/firebase/internal/type_traits.h
215
216
src/include/firebase/log.h
216
217
src/include/firebase/util.h
217
218
src/include/firebase/variant.h
@@ -294,7 +295,6 @@ add_library(firebase_app STATIC
294
295
${app_platform_HDRS}
295
296
${FIREBASE_GEN_FILE_DIR} /app/google_services_generated.h
296
297
memory/atomic.h
297
- meta/type_traits.h
298
298
meta/move.h
299
299
memory/unique_ptr.h
300
300
memory/shared_ptr.h )
Original file line number Diff line number Diff line change 21
21
#include " app/memory/atomic.h"
22
22
#include " app/memory/unique_ptr.h"
23
23
#include " app/meta/move.h"
24
- #include " app/meta /type_traits.h"
24
+ #include " app/src/include/firebase/internal /type_traits.h"
25
25
26
26
#if !defined(FIREBASE_NAMESPACE)
27
27
#define FIREBASE_NAMESPACE firebase
Original file line number Diff line number Diff line change 18
18
#define FIREBASE_APP_CLIENT_CPP_MEMORY_UNIQUE_PTR_H_
19
19
20
20
#include " app/meta/move.h"
21
- #include " app/meta /type_traits.h"
21
+ #include " app/src/include/firebase/internal /type_traits.h"
22
22
23
23
#if !defined(FIREBASE_NAMESPACE)
24
24
#define FIREBASE_NAMESPACE firebase
Original file line number Diff line number Diff line change 17
17
#ifndef FIREBASE_APP_CLIENT_CPP_META_MOVE_H_
18
18
#define FIREBASE_APP_CLIENT_CPP_META_MOVE_H_
19
19
20
- #include " app/meta /type_traits.h"
20
+ #include " app/src/include/firebase/internal /type_traits.h"
21
21
22
22
#if !defined(FIREBASE_NAMESPACE)
23
23
#define FIREBASE_NAMESPACE firebase
Original file line number Diff line number Diff line change 14
14
* limitations under the License.
15
15
*/
16
16
17
- #ifndef FIREBASE_APP_CLIENT_CPP_META_TYPE_TRAITS_H_
18
- #define FIREBASE_APP_CLIENT_CPP_META_TYPE_TRAITS_H_
17
+ #ifndef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_TYPE_TRAITS_H_
18
+ #define FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_TYPE_TRAITS_H_
19
19
20
20
#include < cstdlib>
21
21
#include < type_traits>
24
24
#define FIREBASE_NAMESPACE firebase
25
25
#endif
26
26
27
+ // Doxygen breaks trying to parse this file, and since it is internal logic,
28
+ // it doesn't need to be included in the generated documentation.
29
+ #ifndef DOXYGEN
30
+
27
31
namespace FIREBASE_NAMESPACE {
28
32
29
33
template <typename T>
@@ -120,4 +124,6 @@ struct is_integer {
120
124
// NOLINTNEXTLINE - allow namespace overridden
121
125
} // namespace FIREBASE_NAMESPACE
122
126
123
- #endif // FIREBASE_APP_CLIENT_CPP_META_TYPE_TRAITS_H_
127
+ #endif // DOXYGEN
128
+
129
+ #endif // FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_TYPE_TRAITS_H_
Original file line number Diff line number Diff line change 23
23
#include < string>
24
24
#include < vector>
25
25
26
- #include " app/meta /type_traits.h"
26
+ #include " firebase/internal /type_traits.h"
27
27
#include " firebase/firestore/map_field_value.h"
28
28
29
29
namespace firebase {
You can’t perform that action at this time.
0 commit comments