Skip to content

Commit 9e4545c

Browse files
committed
Move type_traits header to be public internal
A Firestore header depends on this, so it needs to be publicly available. PiperOrigin-RevId: 312709779
1 parent 05a284c commit 9e4545c

File tree

6 files changed

+14
-8
lines changed

6 files changed

+14
-8
lines changed

app/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ set(internal_HDRS
212212
src/include/firebase/future.h
213213
src/include/firebase/internal/common.h
214214
src/include/firebase/internal/future_impl.h
215+
src/include/firebase/internal/type_traits.h
215216
src/include/firebase/log.h
216217
src/include/firebase/util.h
217218
src/include/firebase/variant.h
@@ -294,7 +295,6 @@ add_library(firebase_app STATIC
294295
${app_platform_HDRS}
295296
${FIREBASE_GEN_FILE_DIR}/app/google_services_generated.h
296297
memory/atomic.h
297-
meta/type_traits.h
298298
meta/move.h
299299
memory/unique_ptr.h
300300
memory/shared_ptr.h)

app/memory/shared_ptr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "app/memory/atomic.h"
2222
#include "app/memory/unique_ptr.h"
2323
#include "app/meta/move.h"
24-
#include "app/meta/type_traits.h"
24+
#include "app/src/include/firebase/internal/type_traits.h"
2525

2626
#if !defined(FIREBASE_NAMESPACE)
2727
#define FIREBASE_NAMESPACE firebase

app/memory/unique_ptr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#define FIREBASE_APP_CLIENT_CPP_MEMORY_UNIQUE_PTR_H_
1919

2020
#include "app/meta/move.h"
21-
#include "app/meta/type_traits.h"
21+
#include "app/src/include/firebase/internal/type_traits.h"
2222

2323
#if !defined(FIREBASE_NAMESPACE)
2424
#define FIREBASE_NAMESPACE firebase

app/meta/move.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef FIREBASE_APP_CLIENT_CPP_META_MOVE_H_
1818
#define FIREBASE_APP_CLIENT_CPP_META_MOVE_H_
1919

20-
#include "app/meta/type_traits.h"
20+
#include "app/src/include/firebase/internal/type_traits.h"
2121

2222
#if !defined(FIREBASE_NAMESPACE)
2323
#define FIREBASE_NAMESPACE firebase

app/meta/type_traits.h renamed to app/src/include/firebase/internal/type_traits.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

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_
1919

2020
#include <cstdlib>
2121
#include <type_traits>
@@ -24,6 +24,10 @@
2424
#define FIREBASE_NAMESPACE firebase
2525
#endif
2626

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+
2731
namespace FIREBASE_NAMESPACE {
2832

2933
template <typename T>
@@ -120,4 +124,6 @@ struct is_integer {
120124
// NOLINTNEXTLINE - allow namespace overridden
121125
} // namespace FIREBASE_NAMESPACE
122126

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_

firestore/src/include/firebase/firestore/field_value.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <string>
2424
#include <vector>
2525

26-
#include "app/meta/type_traits.h"
26+
#include "firebase/internal/type_traits.h"
2727
#include "firebase/firestore/map_field_value.h"
2828

2929
namespace firebase {

0 commit comments

Comments
 (0)