Skip to content

GH-49719: [C++] Rename vendored date header guards #49778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kou merged 2 commits into from
Apr 19, 2026
Merged

GH-49719: [C++] Rename vendored date header guards #49778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
588916a
GH-49719: [C++] Rename vendored date header guards
hrishikeshh-shinde Apr 16, 2026
645181c
stricter regex and unify sed commands
hrishikeshh-shinde Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cpp/src/arrow/vendored/datetime/date.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef DATE_H
#define DATE_H
#ifndef ARROW_VENDORED_DATE_H
#define ARROW_VENDORED_DATE_H

// The MIT License (MIT)
//
Expand Down Expand Up @@ -8242,4 +8242,4 @@ operator<<(std::basic_ostream<CharT, Traits>& os,
# pragma GCC diagnostic pop
#endif

#endif // DATE_H
#endif // ARROW_VENDORED_DATE_H
6 changes: 3 additions & 3 deletions cpp/src/arrow/vendored/datetime/ios.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.

#ifndef ios_hpp
#define ios_hpp
#ifndef ARROW_VENDORED_ios_hpp
#define ARROW_VENDORED_ios_hpp

#if __APPLE__
# include <TargetConditionals.h>
Expand All @@ -47,4 +47,4 @@
#else // !__APPLE__
# define TARGET_OS_IPHONE 0
#endif // !__APPLE__
#endif // ios_hpp
#endif // ARROW_VENDORED_ios_hpp
6 changes: 3 additions & 3 deletions cpp/src/arrow/vendored/datetime/tz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef TZ_H
#define TZ_H
#ifndef ARROW_VENDORED_TZ_H
#define ARROW_VENDORED_TZ_H

// The MIT License (MIT)
//
Expand Down Expand Up @@ -2805,4 +2805,4 @@ to_gps_time(const tai_time<Duration>& t)

} // namespace arrow_vendored::date

#endif // TZ_H
#endif // ARROW_VENDORED_TZ_H
6 changes: 3 additions & 3 deletions cpp/src/arrow/vendored/datetime/tz_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef TZ_PRIVATE_H
#define TZ_PRIVATE_H
#ifndef ARROW_VENDORED_TZ_PRIVATE_H
#define ARROW_VENDORED_TZ_PRIVATE_H

// The MIT License (MIT)
//
Expand Down Expand Up @@ -312,4 +312,4 @@ struct transition
#include "tz.h"
#endif

#endif // TZ_PRIVATE_H
#endif // ARROW_VENDORED_TZ_PRIVATE_H
3 changes: 3 additions & 0 deletions cpp/src/arrow/vendored/datetime/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ sed -i.bak -E \
-e 's/namespace date/namespace arrow_vendored::date/g' \
-e 's,include "date/,include ",g' \
*.{cpp,h,mm}
sed -i.bak -E \
-e 's/(#ifndef |#define |#endif *\/\/ )(DATE_H|ios_hpp|TZ_H|TZ_PRIVATE_H)/\1ARROW_VENDORED_\2/g' \
*.h
sed -i.bak -E \
-e "s/changeset [0-9a-f]+/changeset ${commit_id}/g" \
README.md
Expand Down
Loading