Skip to content

Commit

Permalink
Merge branch 'main' into chiphogg/complex-conversion#228
Browse files Browse the repository at this point in the history
  • Loading branch information
chiphogg committed Sep 19, 2024
2 parents 709b40a + 5cbc0e6 commit 8b6bd79
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 31 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/clang-format-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@

name: clang-format-lint

on:
push:
branches:
- main
pull_request:
# Temporarily disabled. See #292
# on:
# push:
# branches:
# - main
# pull_request:

jobs:
lint-clang-format:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

name: "MSVC x64 19.29"
name: "MSVC 2019 x64"

on:
push:
Expand All @@ -21,7 +21,7 @@ on:
pull_request:

jobs:
build-and-test-msvc-19-29:
build-and-test-msvc-2019:
uses: ./.github/workflows/single-file-build-and-test.yml
with:
windows_version: windows-2019
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

name: "MSVC x64 19.35"
name: "MSVC 2022 x64"

on:
push:
Expand All @@ -21,7 +21,7 @@ on:
pull_request:

jobs:
build-and-test-msvc-19-35:
build-and-test-msvc-2022:
uses: ./.github/workflows/single-file-build-and-test.yml
with:
windows_version: windows-2022
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ https://github.com/aurora-opensource/au/actions/workflows/clang14-ubuntu.yml) [!
https://github.com/aurora-opensource/au/actions/workflows/clang11-ubuntu.yml/badge.svg?branch=main&event=push)](
https://github.com/aurora-opensource/au/actions/workflows/clang11-ubuntu.yml) [![gcc10-ubuntu](
https://github.com/aurora-opensource/au/actions/workflows/gcc10-ubuntu.yml/badge.svg?branch=main&event=push)](
https://github.com/aurora-opensource/au/actions/workflows/gcc10-ubuntu.yml) [![MSVC x64 19.29](
https://github.com/aurora-opensource/au/actions/workflows/msvc-x64-19-29-30151.yml/badge.svg?branch=main&event=push)](
https://github.com/aurora-opensource/au/actions/workflows/msvc-x64-19-29-30151.yml) [![MSVC x64 19.35](
https://github.com/aurora-opensource/au/actions/workflows/msvc-x64-19-35-32217-1.yml/badge.svg?branch=main&event=push)](
https://github.com/aurora-opensource/au/actions/workflows/msvc-x64-19-35-32217-1.yml)
https://github.com/aurora-opensource/au/actions/workflows/gcc10-ubuntu.yml) [![MSVC 2019 x64](
https://github.com/aurora-opensource/au/actions/workflows/msvc-2019-x64.yml/badge.svg?branch=main&event=push)](
https://github.com/aurora-opensource/au/actions/workflows/msvc-2019-x64.yml) [![MSVC 2022 x64](
https://github.com/aurora-opensource/au/actions/workflows/msvc-2022-x64.yml/badge.svg?branch=main&event=push)](
https://github.com/aurora-opensource/au/actions/workflows/msvc-2022-x64.yml)

# Au: A C++14-compatible units library, by Aurora

Expand All @@ -26,7 +26,7 @@ In short: if your C++ programs handle physical quantities, Au will make you fast
effective at your job. You'll find everything you need in our [full documentation
website](https://aurora-opensource.github.io/au).

> _Try it out on [Compiler Explorer ("godbolt")](https://godbolt.org/z/KrvfhP4M3)!_
> _Try it out on [Compiler Explorer ("godbolt")](https://godbolt.org/z/G6r315G9n)!_
## Why Au?

Expand Down
4 changes: 2 additions & 2 deletions docs/supported-compilers.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,5 @@ Here are the configurations that have Best Effort Support status.

| Platform | Compiler | Status |
|----------|----------|--------|
| Windows Server 2019 | MSVC x64 19.29 | [![MSVC x64 19.29]( https://github.com/aurora-opensource/au/actions/workflows/msvc-x64-19-29-30151.yml/badge.svg?branch=main&event=push)]( https://github.com/aurora-opensource/au/actions/workflows/msvc-x64-19-29-30151.yml) |
| Windows Server 2022 | MSVC x64 19.35 | [![MSVC x64 19.35]( https://github.com/aurora-opensource/au/actions/workflows/msvc-x64-19-35-32217-1.yml/badge.svg?branch=main&event=push)]( https://github.com/aurora-opensource/au/actions/workflows/msvc-x64-19-35-32217-1.yml) |
| Windows Server 2019 | MSVC 2019 x64 | [![MSVC 2019 x64]( https://github.com/aurora-opensource/au/actions/workflows/msvc-2019-x64.yml/badge.svg?branch=main&event=push)]( https://github.com/aurora-opensource/au/actions/workflows/msvc-2019-x64.yml) |
| Windows Server 2022 | MSVC 2022 x64 | [![MSVC 2022 x64]( https://github.com/aurora-opensource/au/actions/workflows/msvc-2022-x64.yml/badge.svg?branch=main&event=push)]( https://github.com/aurora-opensource/au/actions/workflows/msvc-2022-x64.yml) |
28 changes: 14 additions & 14 deletions docs/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ It's the "classic" error the units library aims to prevent.
| ^~~~~~~~
```

**Compiler error (MSVC x64 19.29)**
**Compiler error (MSVC 2019 x64)**
```
error_examples.cc(32): error C2248: 'au::Quantity<au::Seconds,double>::Quantity': cannot access private member declared in class 'au::Quantity<au::Seconds,double>'
D:\a\au\au\au.hh(3202): note: see declaration of 'au::Quantity<au::Seconds,double>::Quantity'
Expand All @@ -142,7 +142,7 @@ It's the "classic" error the units library aims to prevent.
D:\a\au\au\au.hh(3269): note: see declaration of 'au::Quantity<au::Meters,double>'
```

**Compiler error (MSVC x64 19.35)**
**Compiler error (MSVC 2022 x64)**
```
error_examples.cc(32): error C2248: 'au::Quantity<au::Seconds,double>::Quantity': cannot access private member declared in class 'au::Quantity<au::Seconds,double>'
D:\a\au\au\au.hh(3202): note: see declaration of 'au::Quantity<au::Seconds,double>::Quantity'
Expand Down Expand Up @@ -274,7 +274,7 @@ operation (at least in this format).
./au/quantity.hh:169:13: error: static assertion failed: Dangerous conversion for integer Rep! See: https://aurora-opensource.github.io/au/main/troubleshooting/#dangerous-conversion
```

**Compiler error (MSVC x64 19.29)**
**Compiler error (MSVC 2019 x64)**
```
D:\a\au\au\au.hh(2952): error C2338: Dangerous conversion for integer Rep! See: https://aurora-opensource.github.io/au/main/troubleshooting/#dangerous-conversion
D:\a\au\au\au.hh(2989): note: see reference to function template instantiation 'auto au::Quantity<au::Inches,int>::as<NewUnit,void>(NewUnit) const' being compiled
Expand All @@ -285,7 +285,7 @@ operation (at least in this format).
error_examples.cc(45): note: see reference to function template instantiation 'auto au::Quantity<au::Inches,int>::as<au::Feet>(au::QuantityMaker<au::Feet>) const' being compiled
```

**Compiler error (MSVC x64 19.35)**
**Compiler error (MSVC 2022 x64)**
```
D:\a\au\au\au.hh(2952): error C2338: static_assert failed: 'Dangerous conversion for integer Rep! See: https://aurora-opensource.github.io/au/main/troubleshooting/#dangerous-conversion'
D:\a\au\au\au.hh(2989): note: see reference to function template instantiation 'auto au::Quantity<au::Inches,int>::as<NewUnit,void>(NewUnit) const' being compiled
Expand Down Expand Up @@ -390,7 +390,7 @@ dimension. Then, figure out how to fix your expression so it has the right dime
./au/quantity.hh:348:43: required from here
```

**Compiler error (MSVC x64 19.29)**
**Compiler error (MSVC 2019 x64)**
```
C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\include\type_traits(1164): error C2794: 'type': is not a member of any direct or indirect base class of 'std::common_type<T,U>'
with
Expand Down Expand Up @@ -463,7 +463,7 @@ dimension. Then, figure out how to fix your expression so it has the right dime
D:\a\au\au\au.hh(3370): note: 'U=void'
```

**Compiler error (MSVC x64 19.35)**
**Compiler error (MSVC 2022 x64)**
```
C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.36.32532\include\type_traits(1227): error C2794: 'type': is not a member of any direct or indirect base class of 'std::common_type<T,U>'
with
Expand Down Expand Up @@ -612,7 +612,7 @@ floating point types.
| ^~~~~~~~~~~~~~~~~~~~~~
```

**Compiler error (MSVC x64 19.29)**
**Compiler error (MSVC 2019 x64)**
```
D:\a\au\au\au.hh(3198): error C2338: Integer division forbidden: use integer_quotient() if you really want it
D:\a\au\au\au.hh(3131): note: see reference to function template instantiation 'void au::Quantity<au::Meters,int>::warn_if_integer_division<OtherRep>(void)' being compiled
Expand All @@ -633,7 +633,7 @@ floating point types.
]
```

**Compiler error (MSVC x64 19.35)**
**Compiler error (MSVC 2022 x64)**
```
D:\a\au\au\au.hh(3198): error C2338: static_assert failed: 'Integer division forbidden: use integer_quotient() if you really want it'
D:\a\au\au\au.hh(3131): note: see reference to function template instantiation 'void au::Quantity<au::Meters,int>::warn_if_integer_division<OtherRep>(void)' being compiled
Expand Down Expand Up @@ -738,7 +738,7 @@ use a smaller target unit.
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```

**Compiler error (MSVC x64 19.29)**
**Compiler error (MSVC 2019 x64)**
```
D:\a\au\au\au.hh(4562): error C2338: Dangerous inversion risking truncation to 0; must supply explicit Rep if truly desired
D:\a\au\au\au.hh(4577): note: see reference to function template instantiation 'auto au::inverse_in<TargetUnits,au::Hertz,int>(TargetUnits,au::Quantity<au::Hertz,int>)' being compiled
Expand All @@ -753,7 +753,7 @@ use a smaller target unit.
]
```

**Compiler error (MSVC x64 19.35)**
**Compiler error (MSVC 2022 x64)**
```
D:\a\au\au\au.hh(4562): error C2338: static_assert failed: 'Dangerous inversion risking truncation to 0; must supply explicit Rep if truly desired'
D:\a\au\au\au.hh(4577): note: see reference to function template instantiation 'auto au::inverse_in<TargetUnits,au::Hertz,int>(TargetUnits,au::Quantity<au::Hertz,int>)' being compiled
Expand Down Expand Up @@ -840,7 +840,7 @@ casting automatically when possible.
au/error_examples.cc:82:10: note: deduced conflicting types for parameter 'auto' ('au::Quantity<au::Hertz, double>' and 'au::Quantity<au::Pow<au::Seconds, -1>, double>')
```

**Compiler error (MSVC x64 19.29)**
**Compiler error (MSVC 2019 x64)**
```
error_examples.cc(80): error C3535: cannot deduce type for 'auto &&' from 'initializer list'
error_examples.cc(80): error C2440: 'initializing': cannot convert from 'initializer list' to 'std::initializer_list<int> &&'
Expand All @@ -854,7 +854,7 @@ casting automatically when possible.
]
```

**Compiler error (MSVC x64 19.35)**
**Compiler error (MSVC 2022 x64)**
```
error_examples.cc(80): error C3535: cannot deduce type for 'auto &&' from 'initializer list'
error_examples.cc(80): error C2440: 'initializing': cannot convert from 'initializer list' to 'std::initializer_list<int> &&'
Expand Down Expand Up @@ -1095,7 +1095,7 @@ ordering!
| ^~~~~
```

**Compiler error (MSVC x64 19.29)**
**Compiler error (MSVC 2019 x64)**
```
D:\a\au\au\au.hh(1037): error C2338: Broken strict total ordering: distinct input types compare equal
D:\a\au\au\au.hh(1068): note: see reference to class template instantiation 'au::LexicographicTotalOrdering<A,B>' being compiled
Expand Down Expand Up @@ -1184,7 +1184,7 @@ ordering!
D:\a\au\au\au.hh(2334): error C2338: Elements must be listed in ascending order
```

**Compiler error (MSVC x64 19.35)**
**Compiler error (MSVC 2022 x64)**
```
D:\a\au\au\au.hh(1037): error C2338: static_assert failed: 'Broken strict total ordering: distinct input types compare equal'
D:\a\au\au\au.hh(1053): note: see reference to class template instantiation 'au::LexicographicTotalOrdering<A,B>' being compiled
Expand Down

0 comments on commit 8b6bd79

Please sign in to comment.