Skip to content

Commit 3cb4ec9

Browse files
pedroerpfacebook-github-bot
pedroerp
authored and
facebook-github-bot
committed
Move velox/external/date to vendored namespace (facebookincubator#8332)
Summary: Pull Request resolved: facebookincubator#8332 Moving velox/external/date symbols to a velox namespace to prevent them from clashing with other project that might also vendor or link the same code. Reviewed By: xiaoxmeng Differential Revision: D52649957 fbshipit-source-id: c9c15c30bf41a74166c311df03f14a0897594e4f
1 parent 96d7018 commit 3cb4ec9

File tree

7 files changed

+182
-5
lines changed

7 files changed

+182
-5
lines changed

‎velox/external/date/date.h

+7-1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@
8686
# pragma warning(disable : 4127)
8787
#endif
8888

89+
namespace facebook
90+
{
91+
namespace velox
92+
{
8993
namespace date
9094
{
9195

@@ -7933,7 +7937,9 @@ operator<<(std::basic_ostream<CharT, Traits>& os,
79337937
detail::get_units<CharT>(typename Period::type{});
79347938
}
79357939

7936-
} // namespace date
7940+
} // namespace date
7941+
} // namespace velox
7942+
} // namespace facebook
79377943

79387944
#ifdef _MSC_VER
79397945
# pragma warning(pop)

‎velox/external/date/ios.h

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,22 @@
3232
# if TARGET_OS_IPHONE
3333
# include <string>
3434

35+
namespace facebook
36+
{
37+
namespace velox
38+
{
3539
namespace date
3640
{
3741
namespace iOSUtils
3842
{
39-
43+
4044
std::string get_tzdata_path();
4145
std::string get_current_timezone();
42-
46+
4347
} // namespace iOSUtils
4448
} // namespace date
49+
} // namespace velox
50+
} // namespace facebook
4551

4652
# endif // TARGET_OS_IPHONE
4753
#else // !__APPLE__

‎velox/external/date/patches/add_namespacing-pr-8332.patch

+143
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
diff --git a/fbcode/velox/external/date/date.h b/fbcode/velox/external/date/date.h
2+
--- a/fbcode/velox/external/date/date.h
3+
+++ b/fbcode/velox/external/date/date.h
4+
@@ -86,6 +86,10 @@
5+
# pragma warning(disable : 4127)
6+
#endif
7+
8+
+namespace facebook
9+
+{
10+
+namespace velox
11+
+{
12+
namespace date
13+
{
14+
15+
@@ -7933,7 +7937,9 @@
16+
detail::get_units<CharT>(typename Period::type{});
17+
}
18+
19+
-} // namespace date
20+
+} // namespace date
21+
+} // namespace velox
22+
+} // namespace facebook
23+
24+
#ifdef _MSC_VER
25+
# pragma warning(pop)
26+
diff --git a/fbcode/velox/external/date/ios.h b/fbcode/velox/external/date/ios.h
27+
--- a/fbcode/velox/external/date/ios.h
28+
+++ b/fbcode/velox/external/date/ios.h
29+
@@ -32,16 +32,22 @@
30+
# if TARGET_OS_IPHONE
31+
# include <string>
32+
33+
+ namespace facebook
34+
+ {
35+
+ namespace velox
36+
+ {
37+
namespace date
38+
{
39+
namespace iOSUtils
40+
{
41+
-
42+
+
43+
std::string get_tzdata_path();
44+
std::string get_current_timezone();
45+
-
46+
+
47+
} // namespace iOSUtils
48+
} // namespace date
49+
+ } // namespace velox
50+
+ } // namespace facebook
51+
52+
# endif // TARGET_OS_IPHONE
53+
#else // !__APPLE__
54+
diff --git a/fbcode/velox/external/date/tz.cpp b/fbcode/velox/external/date/tz.cpp
55+
--- a/fbcode/velox/external/date/tz.cpp
56+
+++ b/fbcode/velox/external/date/tz.cpp
57+
@@ -268,6 +268,10 @@
58+
59+
#endif // !USE_OS_TZDB
60+
61+
+namespace facebook
62+
+{
63+
+namespace velox
64+
+{
65+
namespace date
66+
{
67+
// +---------------------+
68+
@@ -3860,6 +3864,8 @@
69+
}
70+
71+
} // namespace date
72+
+} // namespace velox
73+
+} // namespace facebook
74+
75+
#if defined(__GNUC__) && __GNUC__ < 5
76+
# pragma GCC diagnostic pop
77+
diff --git a/fbcode/velox/external/date/tz.h b/fbcode/velox/external/date/tz.h
78+
--- a/fbcode/velox/external/date/tz.h
79+
+++ b/fbcode/velox/external/date/tz.h
80+
@@ -143,6 +143,10 @@
81+
# endif
82+
#endif
83+
84+
+namespace facebook
85+
+{
86+
+namespace velox
87+
+{
88+
namespace date
89+
{
90+
91+
@@ -2790,5 +2794,7 @@
92+
#endif // !MISSING_LEAP_SECONDS
93+
94+
} // namespace date
95+
+} // namespace velox
96+
+} // namespace facebook
97+
98+
#endif // TZ_H
99+
diff --git a/fbcode/velox/external/date/tz_private.h b/fbcode/velox/external/date/tz_private.h
100+
--- a/fbcode/velox/external/date/tz_private.h
101+
+++ b/fbcode/velox/external/date/tz_private.h
102+
@@ -34,6 +34,12 @@
103+
#include <vector>
104+
#endif
105+
106+
+namespace facebook
107+
+{
108+
+
109+
+namespace velox
110+
+{
111+
+
112+
namespace date
113+
{
114+
115+
@@ -309,6 +315,10 @@
116+
117+
} // namespace date
118+
119+
+} // namespace velox
120+
+
121+
+} // namespace facebook
122+
+
123+
#if defined(_MSC_VER) && (_MSC_VER < 1900)
124+
#include "tz.h"
125+
#endif
126+
diff --git a/fbcode/velox/type/Timestamp.h b/fbcode/velox/type/Timestamp.h
127+
--- a/fbcode/velox/type/Timestamp.h
128+
+++ b/fbcode/velox/type/Timestamp.h
129+
@@ -24,12 +24,12 @@
130+
#include "velox/common/base/CheckedArithmetic.h"
131+
#include "velox/type/StringView.h"
132+
133+
+namespace facebook::velox {
134+
+
135+
namespace date {
136+
class time_zone;
137+
}
138+
139+
-namespace facebook::velox {
140+
-
141+
struct TimestampToStringOptions {
142+
enum class Precision : int8_t {
143+
kMilliseconds = 3, // 10^3 milliseconds are equal to one second.

‎velox/external/date/tz.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,10 @@ get_download_folder()
268268

269269
#endif // !USE_OS_TZDB
270270

271+
namespace facebook
272+
{
273+
namespace velox
274+
{
271275
namespace date
272276
{
273277
// +---------------------+
@@ -3860,6 +3864,8 @@ current_zone()
38603864
}
38613865

38623866
} // namespace date
3867+
} // namespace velox
3868+
} // namespace facebook
38633869

38643870
#if defined(__GNUC__) && __GNUC__ < 5
38653871
# pragma GCC diagnostic pop

‎velox/external/date/tz.h

+6
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ static_assert(HAS_REMOTE_API == 0 ? AUTO_DOWNLOAD == 0 : true,
143143
# endif
144144
#endif
145145

146+
namespace facebook
147+
{
148+
namespace velox
149+
{
146150
namespace date
147151
{
148152

@@ -2790,5 +2794,7 @@ to_gps_time(const tai_time<Duration>& t)
27902794
#endif // !MISSING_LEAP_SECONDS
27912795

27922796
} // namespace date
2797+
} // namespace velox
2798+
} // namespace facebook
27932799

27942800
#endif // TZ_H

‎velox/external/date/tz_private.h

+10
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
#include <vector>
3535
#endif
3636

37+
namespace facebook
38+
{
39+
40+
namespace velox
41+
{
42+
3743
namespace date
3844
{
3945

@@ -309,6 +315,10 @@ struct transition
309315

310316
} // namespace date
311317

318+
} // namespace velox
319+
320+
} // namespace facebook
321+
312322
#if defined(_MSC_VER) && (_MSC_VER < 1900)
313323
#include "tz.h"
314324
#endif

‎velox/type/Timestamp.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
#include "velox/common/base/CheckedArithmetic.h"
2525
#include "velox/type/StringView.h"
2626

27+
namespace facebook::velox {
28+
2729
namespace date {
2830
class time_zone;
2931
}
3032

31-
namespace facebook::velox {
32-
3333
struct TimestampToStringOptions {
3434
enum class Precision : int8_t {
3535
kMilliseconds = 3, // 10^3 milliseconds are equal to one second.

0 commit comments

Comments
 (0)