Skip to content

Commit b4e0722

Browse files
fix compilation error on ubuntu.
1 parent 409d6db commit b4e0722

File tree

2 files changed

+5
-51
lines changed

2 files changed

+5
-51
lines changed

.github/workflows/actions.yml

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -314,52 +314,6 @@ jobs:
314314
run: |
315315
./testall.sh
316316
317-
build-macos13:
318-
runs-on: macos-13
319-
steps:
320-
- uses: actions/checkout@main
321-
- name: Homebrew
322-
run: |
323-
which pkg-config || brew install pkg-config
324-
brew install qt6 jq mongo-c-driver@1 gflags glog lz4 yarn
325-
- name: configure for debug
326-
run: |
327-
export PKG_CONFIG_PATH=$(echo "$(find -L "$(brew --prefix)/opt" -type d \( -path "*/lib/pkgconfig" -o -path "*/share/pkgconfig" \) 2>/dev/null)" | sort -u | paste -sd ":" -):$PKG_CONFIG_PATH
328-
./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-glog --enable-shared-lz4 --enable-debug
329-
- name: build for debug
330-
run: |
331-
make -j4 -C src
332-
sudo make -C src install
333-
make -j4 -C tools
334-
sudo make -C tools install
335-
- name: configure
336-
run: |
337-
export PKG_CONFIG_PATH=$(echo "$(find -L "$(brew --prefix)/opt" -type d \( -path "*/lib/pkgconfig" -o -path "*/share/pkgconfig" \) 2>/dev/null)" | sort -u | paste -sd ":" -):$PKG_CONFIG_PATH
338-
./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-glog --enable-shared-lz4
339-
- name: build
340-
run: |
341-
make -j4 -C src
342-
sudo make -C src install
343-
make -j4 -C tools
344-
sudo make -C tools install
345-
- name: version
346-
run: |
347-
treefrog -v
348-
tspawn --show-drivers
349-
- name: brew install for test
350-
run: |
351-
brew install redis memcached
352-
brew services start redis
353-
brew services start memcached
354-
- name: testall.sh
355-
working-directory: src/test
356-
run: |
357-
./testall.sh
358-
- name: releasetest
359-
working-directory: tools/test
360-
run: |
361-
./testall.sh
362-
363317
build-windows-qt68-msvc2022:
364318
runs-on: windows-latest
365319
steps:

src/tsystemglobal.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ class QSqlError;
1212

1313
namespace std {
1414
template<>
15-
struct std::formatter<QByteArray, char> : std::formatter<std::string, char> {
16-
auto format(const QByteArray &ba, std::format_context &ctx) const {
17-
return std::formatter<std::string, char>::format(ba.toStdString(), ctx);
15+
struct formatter<QByteArray, char> : formatter<string, char> {
16+
auto format(const QByteArray &ba, format_context &ctx) const {
17+
return formatter<string, char>::format(ba.toStdString(), ctx);
1818
}
1919
};
2020

2121
template<>
22-
struct formatter<QString, char> : formatter<std::string, char> {
22+
struct formatter<QString, char> : formatter<string, char> {
2323
auto format(const QString &str, format_context &ctx) const {
24-
return std::formatter<std::string, char>::format(str.toStdString(), ctx);
24+
return formatter<string, char>::format(str.toStdString(), ctx);
2525
}
2626
};
2727
}

0 commit comments

Comments
 (0)