Skip to content

Commit

Permalink
latest from coda-oss (mdaus#527)
Browse files Browse the repository at this point in the history
* latest from coda-oss

* Squashed 'externals/coda-oss/' changes from 67d6362..d06dc6534d

d06dc6534d mem::AutoPtr for C++17 (mdaus#615)
83443602a6 mem::AutoPtr class to aid C++17 transition (mdaus#614)
f10fa2009c Release 2022-11-04 (mdaus#613)
a32e697044 remove exception specifications (mdaus#609)
084f19126a utilities to find files/directories for unittests (mdaus#608)
a3cedada96 Merge branch 'master'
fde6c864fa Merge pull request mdaus#607 from mdaus/bugfix/change-order-of-config-header-install
c8a0044010 Install the cmake-configured header after installing the xercesc source tree. Otherwise, the original config will persist in the install
dda2c9acda Merge pull request mdaus#606 from mdaus/fix-xerces-config
004a00f09b Bump zlib version for conan builds
207f4dbb9f Fix Xerces config issue and install its config.h
b842417671 Add support for debug optimizations.
0f6cda57dc Use enhanced debug information with gcc/gdb.
5047dce1a9 Work around GCC avx support bug.
001ab18751 Rebuild the waf self-extractor with a fix for the FIPS error.
5a7f64fca2 Revert "Rebuild the waf self-extractor with a fix for the FIPS problem."
9f6f775f8f Rebuild the waf self-extractor with a fix for the FIPS problem.
af7229bd83 utilities to find files from a build (mdaus#605)
264ae49dd7 be sure downstream projects build w/C++14 (mdaus#604)
7a7b13cbd5 "hello world" for HDF5 (mdaus#602)
33cff0ff43 more C++14
963e8ff40c Revert "add HDF5 source code (mdaus#603)"
7b5e71a006 add HDF5 source code (mdaus#603)
ec7bb2e520 add HDF5 source code (mdaus#603)
ec26f703e7 build in NITRO and SIX (mdaus#601)
f4361a9730 make it easier to write cli unit-tests (mdaus#600)
34b6fdeee1 tweak toString() to reduce specialization (mdaus#599)
5907b3ed60 remove C++11 workarounds (mdaus#598)
caed59480d Release 2022-08-30_cpp14 (mdaus#597)
2630d41e08 get rid of merge conflict
652bce3854 Merge branch 'master'
6f41c09d71 Release 2022-08-30 (mdaus#596)
838c323d6a Merge branch 'master'
f916680126 Added handler accessor to MinidomParser for inheriting modules (mdaus#594)
72d29e9c27 get unittests working when "nested" in other projects (mdaus#595)
f8f18fea5f Actually look at unit test results when using waf (mdaus#593)
4189c429e8 Merge branch 'master'
cda679ceee more overloads to take a string length (mdaus#592)
b95a32bc4c by default, Uri()s aren't validated (mdaus#591)
903ee7ffff Merge branch 'master'
173930a6f2 fix a UTF-8 conversion bug (mdaus#590)
a1c0a1eea6 Merge branch 'master'
c5c221a832 CODA code inherits from xml.lite classes :-( (mdaus#589)
1bfe5fc402 Merge branch 'master'
a4c6294c30 use EncodedStringView instead of _bstr_t (mdaus#588)
6c2df8bb62 "main" is now C++14 (not C++20)
2ce4161080 Squashed commit of the following:
3a0f7fd14d Merge branch 'master'
83c982f0cf remove work-arounds to write non-UTF-8 XML (mdaus#586)
142fd7185e Merge branch 'master'
ebf6db1762 <bit> is part of C++20
d3aa8aa5ce std::u8string is in C++20, not C++17
03654933c4 changes to math.linear from coda (mdaus#587)
d442e5be0f Merge branch 'master'
5a2f8e52f1 release 2022-08-02 (mdaus#585)
e5516aba29 tweak names to match utf8:: conventions (mdaus#584)
32f08a9e40 Squashed commit of the following:
ee15ba3172 Merge branch 'master'
3083ec7915 move most platform-specific code to EncodedStringView (mdaus#583)
bede753547 fix unit-test with C++20
61a8033f62 consistent use of coda_oss:: and std::
5d3bf9eb83 Merge branch 'master'
36371410c0 EncodedString tweaks for XML processing (mdaus#582)
cf2016205c remove any vestiges of Expat and libXML (mdaus#580)
33538aa0fc update for newer Intel compiler
ed65e4ccc5 Add two patch candidates to fix FIPS problems in waf.
34c40bd397 Merge branch 'master'
a731ebf8e8 release 2022-06-29 (mdaus#579)
a9b9d2a9fa Merge branch 'master'
59387bd87b update "ReleaseNotes.md" for recent changes (mdaus#578)
24a3f01afe Merge branch 'master'
e4f940854a remove "boost" and "serialize" (mdaus#577)
80b70537e9 update to zlib-1.2.12 (mdaus#576)
f92811a53b Merge branch 'master'
202084bacb Remove some compiler warnings (mdaus#575)
414c25c551 build with C++20 in VS
1a99a29da3 Merge branch 'master'
c61232224b build most code with Visual Studio (mdaus#574)
5cca863d7e Merge branch 'master'
6e4d952bea some unit-tests need argc/argv (mdaus#573)
36e051d7b6 Add run1D method to GenerationThreadPool (mdaus#572)
6d4776235e Merge branch 'master'
0a08b8e4e9 build "coda-oss-lite" as a VS2022 project (mdaus#571)
6677cc38e3 simplify creation of encodes string (mdaus#570)
ba62c610c1 Add the 'universal_newlines=True' flag to python Popen calls.
984e4a96ce Fix a bug in waf platform detection.
8f1173f4a6 fix build errors
f21af35b0b Merge branch 'master'
d2aca8d4b5 release 2022-05-03 (mdaus#569)
ff55fed596 can't replace all TEST_ASSERT macros with functions (mdaus#568)
4db8ada411 restore changes clobbered with merge from "master"
a1f36e1839 Merge branch 'master'
89a636a fix copy/assignment in EncodedString (mdaus#567)
c3fe91d latest tweaks to build with C++17 (mdaus#566)
a59a51b be sure we use a 64-bit time_t (mdaus#565)
1f79fb3 Poly2D::atY() bugfix (mdaus#564)
ac53076 Testing to see if windows-2019 works with github actions (mdaus#563)
8d0726b Fix a bug in waf platform detection.
80fe8e9f8a Merge branch 'master'
c662b5a Update ReleaseNotes.md
ef4a3bb Release 2022-02-22 (aka 2/22/22) (mdaus#562)
33b0f3f6eb Merge branch 'master'
8bd0c8cf4a Merge branch 'main' of github.com:mdaus/coda-oss
0a0e6cf use char16_t on Linux (mdaus#560)
7e41b4b5e4 Merge branch 'feature/use-cpp11-code'
fe65bfd fix units for ICC, sys::filesystem (mdaus#559)
fc99e4b3e6 recreate from "master"
510317c07a use std::filesystem to "implement" sys::filesystem
895f6c77cd always implement sys::filesystem
0d83ae22fc "units" changes from master
b58173b781 latest from "master" (not quite)
793e3442c8 Squashed commit of the following:
91a729f5a2 re-create from "master"
def9791 update to GSL 4.0.0 (mdaus#558)
fe365e5 fix XML validation for UTF-8 (mdaus#557)
502e582 support conversion to std::wstring (mdaus#556)
e694225 Delete codeql-analysis.yml
45bc6a9 Create codeql-analysis.yml
87d9a7e remove CodeQL
eab5ecb Update build_unittest.yml
8ab12d4 Delete codeql-analysis.yml
9e54209 try running CodeQL as part of build-linux-cmake
de0c506 Create codeql-analysis.yml
0496087 tweaks to build in "coda" (mdaus#554)
0ba2423 replace sys::U8string with coda_oss::u8string (mdaus#553)
bcee655 add EncodedString class (mdaus#552)
c2eecd3 simplify implementation of EncodedStringView (mdaus#551)
c1320ef fix 'typename' for other compilers (mdaus#550)
ac3b939 tweaks to make "main" build easier (mdaus#549)
78da741 remove sys/Optional.h (mdaus#548)
f31730a put our std work-arounds in one place (mdaus#547)
9b7bb57 Add an EncodedStringView class (mdaus#545)
c0e1da5 another batch of tweaks to cleanup compiler warnings, etc. (mdaus#546)
0f3bfd9 added missing "virtual", support unique_ptr (mdaus#544)
ca32f99 Add option to specify curl installation location. (mdaus#501)
2df9c1a allow std::filesystem::path to be used for validation (mdaus#543)
2891435 add SinCos for units::Angle (mdaus#542)
e430edd Delete log4j as 1) it's old, 2) coda-oss doesn't use it, and 3) remove any questions about security vulnerability (mdaus#541)
bb11134 xml.lite tweaks (mdaus#540)
955b33e Release 2021_12_13 (mdaus#539)
d73d74d xml.lite tweaks (mdaus#537)
3a90e25 use more C++11 functionality (mdaus#538)
9ca2a0e remove more compiler warnings (mdaus#536)
0ec9da1 be sure == and != are in-sync (mdaus#535)
9084be3 fix size_t compiler warnings (mdaus#534)
abd6469 fix ICC errors (mdaus#533)
09cb36f update version number before cutting a new release (mdaus#532)
c29e4d2 fix ICC warnings/errors from high-side (mdaus#531)
91f8f1c simplify our std:: implementations (mdaus#530)
7c633c7 Further reduce use of std::auto_ptr (mdaus#529)
d858837 Provide support for creating simple version numbers (mdaus#528)
b035825 Merge pull request mdaus#527 from mdaus/fix-crypt-h-clash
ffed3d6 Disable encryption support in minizip build and remove crypt.h header
ee2b2bf Merge pull request mdaus#525 from mdaus/swig-fix
3c02ff2 Fix config-python prefix issue
6149053 Add new config-python module for SWIG compatibility workarounds
30acf5b mt::transform_async(), mem::SharedPtr, math::SinCos() (mdaus#526)
21efd6a Implement better workaround for lack of SWIG support for "final"
60837a6 Revert unneeded changes
0bc994d Fix SWIG path issue for waf build
070f4e9 Update SWIG generated files
f8472b0 Fix SWIG path issues and warnings
e10707f Set minimum SWIG version to 4.0.1
b8cdba5 Fix waf SWIG build issue
2bd0ee3 Enable SWIG in Github waf build
f2b0011 Try fixing SWIG compile issue again
afafabc Fix SWIG compile issue on Linux due to missing macro
7c8d4a8 Add SWIG to the CI flow
4023d72 Regenerate SWIG bindings
1d8c701 Add some compile definitions needed by SWIG for CMake build
e5cc585 Remove some functions which return unique_ptr from SWIG bindings (incompatible).
965a291 Remove "final" specifier from structs bound in SWIG (incompatible)
f1bec56 Merge branch 'master' of https://github.com/mdaus/coda-oss
c01c4d7 do in-line initialization (mdaus#524)
fb7230e Update CMakeLists.txt
5dfb056 tweaks for C++17 (mdaus#523)
1a7d3ab Merge pull request mdaus#515 from mdaus/security-and-conan-updates
d13885d make it easier to create a new Element with the right encoding (mdaus#522)
3fb09e7 Merge pull request mdaus#359 from mdaus/parseArgUpdate
0d546a8 Tweak some ArgumentParser tests for the ignoreUnknownArguments option
14bd1f2 Merge remote-tracking branch 'origin/master' into parseArgUpdate
cf398c0 tweak code for C++11/C++17 (mdaus#521)
2d0322b reduce use of std::auto_ptr (mdaus#520)
853320e reduce use of deprecated C++98 code (mdaus#519)
4752ba2 Replace some warning pragmas with macros
3268555 Merge remote-tracking branch 'origin/master' into security-and-conan-updates
f0350c0 Merge pull request mdaus#518 from mdaus/bugfix/python3.9-related
fc01df0 fix typos in gcc macros
9d356f3 fix gcc impl
8124da7 remove unreachable code
d034b3a clobber warnings from numpy innards
9941a40 macros to disable warnings around system headers
8a725bb Merge pull request mdaus#516 from mdaus/mbraswell-enablecpp17-windows
2e7b816 Fixed pragma stuff on gcc
9775bb0 Fixed pragma stuff on gcc
680d3cc Merge branch 'master' of https://github.com/mdaus/coda-oss
8ffd6ed forgot to add "units" to CMakeFiles.txt
0683567 Remove Auto_ptr flag and make disable warnings cross_platform compatible
d62efec Merge branch 'master' of https://github.com/mdaus/coda-oss into mbraswell-enablecpp17-windows
d04042e Merge pull request mdaus#517 from mdaus/develop/compiler-warning-helpers
cf5cd16 Fix macro usage on gcc
a88bbcd Macros to narrowly target disabling warnings
c0d5cdf Formatting Changes
be019b4 Formatting Changes
2eb04dc Fixed compiler warnings and added option to compile cpp17 with waf on windows
5d9f27f Refactor coda-oss conan recipe
ce66457 Disable warning for MSVC2017 and earlier
ecfefbf Merge remote-tracking branch 'origin/master' into security-and-conan-updates
8b14798 Merge pull request mdaus#514 from mdaus/develop/fix-unused-symbol-errors
1d9a4ec Add conan option to use std::regex instead of pcre
6dd5d44 add required include
4c0ae77 add required include
1873cee parameterize build (somewhat)
c9ef567 fix Release compile error
e6b47e9 fix compiler error
eff205b helper macro to fix unusual targets
342098a Fix CMake build for modules without include files
5625706 Enable cpp17 option for windows builds
98e12b1 Use consistent line endings for *.in template files
d01fea0 Configure coda_add_module to install more file extension types
30823f6 Delete stray file
ac7760b Load dependency targets when loading coda-oss for conan build
14781ca Implement conan build for openjpeg and pcre2 dependencies
9d955ef Exclude unsupported XML backend wrappers from CMake build to remove warnings
1e8c9b2 Merge remote-tracking branch 'origin/master' into security-and-conan-updates
772d804 Implement conan build for libjpeg dependency
98b653d Implement conan build for xerces-c dependency
11323e8 Implement conan build for zlib dependency
d0e6bf2 Improve conan test_package
a03e129 Fix uninitialized member variable warning in mt::AbstractTiedThreadPool
c7bb47b Remove member variable duplicated in derived class io::ToggleOutputStream
0838ac2 Use consistent line endings for conan recipes and CMake files.
2768e5f Update libjpeg to v9d
d75f55b Update zlib to 1.2.11
ca2f84c Fix warning in GSL for MSVC 2015 and earlier
1babd19 Fix warning in thread tests for MSVC
2f17632 Fix warning in except module for Visual Studio 2015 and earlier
a485bf6 Fix BIGENDIAN redefinition warning
59543e4 Disable warning in dbi for MSVC 2017 and earlier
b4b2128 Fix warnings in numpyutils for MSVC 2017 and earlier
2b179b6 Fix integer overflow issue
898151a Hook up simple "units" (mdaus#513)
4d6beee Merge pull request mdaus#511 from mdaus/develop/horizontal-improved-numerical-precision
c1878b2 Fix for numerical precision issues surrounding horizontal lines
7d1442c Merge pull request mdaus#510 from mbraswell/fix-testnumelements-build
58fc85f Whitespace change to trigger workflow
ab74026 Fix wscript to successfully build test_num_elements
323283c Merge pull request mdaus#509 from mbraswell/develop-mbraswell-cpp17
16a5502 Added option to enable cpp17
b0625cf tweak debug stuff (mdaus#508)
8455494 fix RowCol casting (mdaus#507)
01fbb5f Get std::u8string working right with C++20 (mdaus#506)
df9413e more "noexcept" for fewer code-analysis diagnostics (mdaus#505)
e6219f9 reduce compiler warnings/code-analysis diagnostics (mdaus#504)
4c9ea0e tweaks for VS2019 16.10 (mdaus#503)
0d8ea07 reduce compiler warnings (mdaus#502)
625b8b5 reduce compiler warnings (mdaus#500)
3795758 get rid of more compiler warnings/code-analysis diagnostics (mdaus#499)
427f91b reduce compiler-warnings and code-analysis diagnostics (mdaus#498)
c82dd9e cleanup compiler and code-analysis diagnistics (mdaus#496)
b5105b5 reduce compiler warnings (mdaus#495)
e0099cc Develop/compiler optimizations (mdaus#494)
0eeb3f9 tweaks to python wrappers made in "nitro" (mdaus#492)
5f91f70 fix printf() format string (mdaus#491)
55b855a Delete codeql-analysis.yml
603c192 Update codeql-analysis.yml
f306979 Update codeql-analysis.yml
4a1f78f Create codeql-analysis.yml
3c80a65 add back coda_oss::filesystem::path (mdaus#490)
eaea659 tweak how std:: features are exposed (mdaus#489)
0492f0d simplify code exposing std:: routines (#488)
e5f3d77 remove code-analysis diagnostics (mdaus#485)
5be599e make HOME and USERPROFILE the same (mdaus#484)
62b22ae cleanup more compiler warnings (mdaus#483)
c32ec7d add unit-tests for env-var editing (mdaus#482)
311aea4 allow an environment-variable to be "edited" during expansion (mdaus#481)
bbcab13 static_assert is C++11, don't use it when checking for C++11 (mdaus#480)
068562f fix glitches in expandEnviromentVariables() (mdaus#479)
30ed1d9 produce a new Path::expandEnviromentVariables() function (mdaus#478)
074a873 remove compiler warnings (mdaus#477)
e29f654 latest C++17 tweaks (mdaus#476)
c4e681b tweak code when wchar_t is a built-in type (mdaus#474)
8449ac2 wchar_t might not be a built-in type on old systems (mdaus#473)
a62bdb3 add operator= to sys::Optional (mdaus#472)
8e310a7 use compiler-provided macros to determine features (mdaus#470)
88405c8 "constexpr" can be hard to get right with older compilers; don't even try (mdaus#471)
b195ab3 need at least VS2017 to use the real GSL (mdaus#469)
2978f91 tweaks to build with older compilers (mdaus#468)
7235b89 The (old) version of SWIG we're using doesn't like certain C++11 features. (mdaus#464)
cccde7f only look in the Win1252->UTF-8 map as a last resort (mdaus#467)
3db0974 get rid of more compiler warnings (mdaus#465)
5e0d2e8 get rid of "char8_t" compiler warning (mdaus#463)
d710bc6 make getValue() easier to use (mdaus#462)
f5a9284 make getElement*() be consistent for both 0 and >1 (mdaus#461)
88be6db consistently add C++14/17/20 library features (mdaus#459)
59c3a7e use coda_oss:: as a drop-in replacement for std:: (mdaus#458)
35de452 use sys::Filesystem::path rather than std::string (mdaus#457)
cace666 make sys::Filesystem::path better conform to std::filesystem::path (mdaus#456)
f395edc remove ambiguous overloads w/C++17 (mdaus#455)
eac4371 use newly added sys::Optional<> to manage "encoding" (mdaus#454)
243ef5e don't derive from std::iterator (mdaus#453)
a48b011 Arguments should be "const&" to prevent C4866 (mdaus#452)
878bff9 provide std::span (mdaus#451)
81727c4 remove newly added a new pure virtual as that's a breaking change (mdaus#450)
93cf0f0 main -> master (mdaus#449)
5af37a7 be sure code compiles with C++17 (mdaus#448)
82b5aec build with C++17 (#407)
6ffb888 reduce compiler warnings (mdaus#439)
9137dda GSL (Guideline Support Library) from https://github.com/Microsoft/GSL (mdaus#423)
bc5552c update to xerces-c-3.2.3 (mdaus#409)
6fe09e1 update to openjpeg-2.3.1 (mdaus#417)
6405c0c reduce differences in #407 (mdaus#438)
2987bbf tweak how std::filesystem is enabled (mdaus#437)
8fd3c2f tweak how std::endian is enabled (mdaus#436)
138372c more straight-forward reduction of std::auto_ptr (mdaus#435)
f13c7ce straight-forward reduction of std::auto_ptr (mdaus#434)
d243b08 add mem::auto_ptr for transition to C++17 (mdaus#432)
54ed521 allow clients to specify custom toType and toString (mdaus#431)
7f90aab remove trailing underscore from macro (#429)
999e490 with C++11, several sys typedefs are the same on both Windows & *nix (#427)
6f075b1 add sys::Byte (mdaus#426)
92221bd allow except::Throwable to derive from std::exception (mdaus#421)
a8f52d0 reduce compiler warnings (mdaus#424)
63ea20a #including <bit> w/C++17 generates warnings (mdaus#408)
10ef060 reduce compiler warnings (mdaus#405)
cf233fd forgot Conf.cpp changes for sys::Endian (mdaus#403)
cc53b18 fix several compiler warnings/code-analysis diagnostics (mdaus#404)
1db3751 implmeent sys::Endian from C++20 (mdaus#402)
f042cd6 support std::filesystem if desired (mdaus#400)
4895a9f WIN32 is old, but existing code might still use it; _WIN32 is better (mdaus#398)
e2a62f8 make it easier to use xml.lite (mdaus#396)
1059b7d allow for explicit use of a UTF-8 string (mdaus#395)
27de8b8 Optionally record how std::string is encoded when manipulating XML (mdaus#378)
e0018ce implement some <filesystem>-like routines until we can use C++17 (mdaus#388)
cafb236 Merge pull request mdaus#363 from mdaus/feature/fix-compiler-warnings
6a78bec use the existing sys::ubyte rather than making our own pre-C++17 std::byte
14c9fc4 fix a couple of G++ compiler warnings via static_cast<>
e596a60 std::numeric_limits<T>::epsilon() can be "constexpr"
78b0f6b another try at removing the compiler warning from tiff::split()
8e1de21 fixed typo; added a few nots about why we're not using strncpy()
fed3ba8 retore previous tiff::split() code as the change got rid of the compiler warning but wasn't portable
98a5896 get rid of g++ strncpy() warning
798f847 don't use memset(0) with C++ objects
7f697d0 casting result of system() to void doesn't get rid of compiler warning
d55a849 remove new g++ compiler warnings in WSL
d0aaa29 Merge pull request mdaus#361 from mdaus/feature/fix-compiler-warnings
cc62e86 fix compiler warnings
d45c1f9 Updates based on peer review comments which include changing ostream to pointer, adding a couple of more tests, and updating all auto_ptr to unique_ptr in unit test.
fb12ba1 Update ArgumentParser to use a stream as an argument if the ignore unknown argument flag is set to true.
536d2b0 Added ability to ignore unknown arguments in the ArgumentParser.
27288f4 Merge pull request #358 from mdaus/conan-options
fd5e1ee Expose additional CMake options in conan recipe
c972161 Remove unneeded CMake function

git-subtree-dir: externals/coda-oss
git-subtree-split: d06dc6534d713ecce71db9986d8db3bb5f7a213f

* Squashed 'externals/coda-oss/' changes from d06dc6534d..8241dfe7e6

8241dfe7e6 remove last vestiges of std::auto_ptr (mdaus#616)

git-subtree-dir: externals/coda-oss
git-subtree-split: 8241dfe7e68d566d9b7ca1ccf572279f41cf6848

* Squashed 'externals/coda-oss/' changes from 8241dfe7e6..ab45464820

ab45464820 remove C++17 workarounds (#618)
3d5daf702e unittests for creating XML from scratch (mdaus#617)

git-subtree-dir: externals/coda-oss
git-subtree-split: ab454648207b2923020bea7614a49def65f1108f

* copy_externals.csh utility script

* latest from coda-oss

* Squashed 'externals/coda-oss/' changes from ab45464820..61aa5e4303

61aa5e4303 Squashed commit of the following:
6557ee34cd Yet another attempt at finding test files for unittests (#621)
501add035a -march=native for fastest optimization level (#620)
f1dd0a5b4f overloads to make creating XML documents easier (#619)

git-subtree-dir: externals/coda-oss
git-subtree-split: 61aa5e430345711abf61b4f46a67df88fe6c465d

* Squashed 'externals/coda-oss/' changes from 61aa5e430..566597043

566597043 Conan versioning, hdf5, and pcre2 fixes (#622)

git-subtree-dir: externals/coda-oss
git-subtree-split: 56659704390d9cd8a19931676454f498b245e027

* remove .git/ right away

* latest from coda-oss

* Squashed 'externals/coda-oss/' changes from 566597043..59d2f678e

59d2f678e Release 2022-12-14 (#628)
1e8244291 new --with-optz=fastest-possible option (#627)
6ae81142d new --optz=faster option for WAF builds (#626)
11206c179 sym-links don't work on Windows filesystems
edd3e8fb9 overloads to make simplify routine XML processing (#625)
dfece6106 use sym-links rather than copying files (#624)
22f1f0776 build hdf5.lite with WAF (#623)

git-subtree-dir: externals/coda-oss
git-subtree-split: 59d2f678e3035988a90dcc2887c3870417104904

* trying to fix build error on github

* latest from coda-oss

* Squashed 'externals/coda-oss/' changes from 59d2f678e..c53304a90

c53304a90 using std::auto_ptr can cause 'deprecated' warnings
418130d4d trying to fix build error on github

git-subtree-dir: externals/coda-oss
git-subtree-split: c53304a907986d7e59cbc3848c9a9523cba0e721

* latest from coda-oss

* Squashed 'externals/coda-oss/' changes from c53304a90..1384b8a5e

1384b8a5e Merge pull request #629 from mdaus/zlib-update
ebbd57247 ZIP APIs use std::string in this branch
9cc19fe82 ZIP unittests
b8d25d364 Update zlib to 1.2.13

git-subtree-dir: externals/coda-oss
git-subtree-split: 1384b8a5e260c4a7418904508b1ab671950d8e45

* copy_externals

* Squashed 'externals/coda-oss/' changes from 1384b8a5e..1582c6ac9

1582c6ac9 further progress on implementing hdf5::lite (#631)
0622af1fe rename "11" exception classes to "Ex" (#630)

git-subtree-dir: externals/coda-oss
git-subtree-split: 1582c6ac9e9f26ee4dbaa7018e6c98ab92ca88ec

* remove eXecute bit from CPP files

* Squashed 'externals/coda-oss/' changes from 1582c6ac9..986307c9c

986307c9c Merge branch 'master'
e1b0fa349 commit (but not build) HDF5 source code (#634)
3fd5ddae5 Merge branch 'main' into develop/remove-cpp11-workarounds
37d7ec76e restore C++14 workarounds for older compilers (#632)
244dfdb3d Merge branch 'develop/main' into develop/remove-cpp11-workarounds
714ca4ed7 restore C++14 workarounds for older compilers
640f2247c Delete hdf5-hdf5-1_13_2.tar.gz
eb365cbfb Merge branch 'master' into develop/remove-cpp11-workarounds
57b938eeb don't need __INTEL_COMPILER work-around with C++14
65779f3b1 build C code with -std=gnu99
94dc9280f C++14 work-arounds for an old version of the Intel compiler
3744d05e2 slam-in "main"
82b2fd63b restore some C++14 work-arounds for old compilers that only have partial C++14 support
94f6950a2 Merge branch 'main' into develop/remove-cpp11-workarounds
1ac97fe48 add HDF5 source code (not built) (mdaus#612)
8ab982820 Squashed commit of the following:
31781a14a remove C++17 work-arounds
c15f6930c Revert "<filesystem> is in C++17"
0fe38c16f restore recent buld.py changes
0c75411ee <filesystem> is in C++17
bbbcd562a remove C++11 work-arounds
c1e15e9d9 Merge branch 'main' into main-cpp17
bea818fb0 must use C++17 in this branch
91653a096 another place where C++17 is set
7d555f2be back to C++17
b1969d996 merge main
0792c77bf Merge branch 'main' into develop/remove-cpp11-workarounds
e49f273c1 Merge branch 'main' into develop/remove-cpp11-workarounds
240b61044 allow sys::Mutex references, instead of pointers, to be passed to sys::ConditionVar
9500d6f4b Merge branch 'main' into develop/remove-cpp11-workarounds
f1529942f std::make_unique instead of new
be9b6a71c Squashed commit of the following:
62a2ec4e1 Revert "remove our GSL work-around for C++11"
1db082c21 Revert "try the current "main" of GSL"
44b70edde try the current "main" of GSL
4edbf6bad Revert ""There is no warning 4814""
bcd7458be "There is no warning 4814"
c185bf3f1 starting working on MutexCpp11
313bdd1d9 AtomicCounter* files have been removed
c1c448051 remove our GSL work-around for C++11
37ae1193e remove our mem::SharedPtr, it's now always std::shared_ptr
71f3c1299 remove no-longer-used NSPR code
8e77cb210 removed no-longer-used Irix and Solaris files
fabef6966 use std::atomic for all AtomicCounter implementations
ace5b6d5a TEST_FAIL -> TEST_FAIL_MSG
30076c1d1 turns out there was already a TEST_FAIL macro
d73ee16fb need "::" to find global test
ba01c48df remove C++11 workarounds for C++14 features
cbd4a31ae Squashed commit of the following:
b21c203b8 Squashed commit of the following:
5b542c60f Squashed commit of the following:
cb0cf94ff ByteStream.cpp is now warning-free
f5daa37fc cast to DWORD; "const" correctness
bfaf644ff #pragma-away compiler warnings from standard headers
72d202dbe Merge branch 'master' into develop/reduce-compiler-warnings
b076580cd trying to fix GCC compiler warning
1687dc7fc Merge branch 'master' into develop/reduce-compiler-warnings
2c5db86db Merge branch 'master' into develop/reduce-compiler-warnings
6f76c2e3e Update CMakeLists.txt
c3ca4a538 do in-line initialization
8e6733618 remove G++ compiler warning
a0eff51cf Merge branch 'master' into develop/reduce-compiler-warnings
af19d88a6 Merge branch 'master' into develop/reduce-compiler-warnings
ba31cbaa9 use "void*" to avoid reinterpret_cast<>
08da1f8a1 Merge branch 'master' into develop/reduce-compiler-warnings
d1d453a2e Merge branch 'master' into develop/reduce-compiler-warnings
f5074a996 CODA_OSS_NDEBUG is extra gunk and not used; omit for now.
22de48858 don't even bother compiling our own versions of localtime_s() and gmtime_s() if we're not going to use them (compiler warning about "unused static funtion.")
0c92eba58 tweak NDEBUG/CODA_OSS_NDEBUG; update comments
544604775 Don't need to expose our own versions of localtime_s() and gmtime_s()
a050796c1 Merge branch 'develop/reduce-compiler-warnings' of github.com:mdaus/coda-oss into develop/reduce-compiler-warnings
fed604617 older compilers want std::string() as argument to std::logic_error()
cf2c502a6 do more debug & release builds on GitHub
d4aa99256 build some debug targets on Gitlab
368245258 tweak CODA_OSS_DEBUG again for G++
24ba64f71 tweak how CODA_OSS_DEBUG is set
9680e8f0e add check for _GLIBCXX_DEBUG
943218f83 Merge branch 'master' into develop/reduce-compiler-warnings
01c68e705 %#@*@%)*%@ fix RowCol::cast() again! :-(
b8472b457 oops ... gsl::narrow<> should be gsl::narrow_cast<> so that int/double conversion doesn't throw
109255ca8 "final" breaks SWIG; wrap RowCol use of gsl::narrow
e51e4c2ad no need to create local just to return
e546f2510 Merge branch 'master' into develop/reduce-compiler-warnings
d1391f989 use template for to_std_string() overloading
566942680 fix std::char8_t when building with C++20
cf604b1ab fix C++17 build errors
48a0fbedb get rid of coda_oss namespace; use CODA_OSS_cpp17 instead
9706a4336 remove code-analysis diagnostics
50592e4f8 G++ complains about an unneeded call to std::move()
9c7643c3f Merge branch 'master' into develop/reduce-compiler-warnings
ecfe1f8a7 more "noexcept"
b7ac50fb9 Merge branch 'master' into develop/reduce-compiler-warnings
eaecf46ed tweak CODA_OSS_cplusplus from "main"
5773b1ec1 trying to get C++17 WAF build working on Windows
a048a00a1 unique names for waf & CMake
7a5a0d5b2 do a better job of setting CODA_OSS_DEBUG
4355aae92 Merge branch 'master' into develop/reduce-compiler-warnings
1fd8cede2 cleanup for VS 2019 16.10
4dffa1394 explicitly =delete copy/assignment
df8f8920a Merge branch 'master' into develop/reduce-compiler-warnings
42b4e99b6 remove code-analysis diagnostics
70ce322c9 reduce compiler warnings/code-analysis diagnostics when building six
20eac2f49 Merge branch 'master' into develop/reduce-compiler-warnings
ff3ded56d get rid of more compiler warnings/code-analysis diagnostics
669dd51ff Merge branch 'master' into develop/reduce-compiler-warnings
623b65ab9 Merge branch 'master' into develop/reduce-compiler-warnings
11c75df53 fix release build errors
66f048b92 turn on more compiler warnings where possible
eb615e315 consolidate calls to mem::make::unique
a6f5eb690 reduce use of explicit new
84d5e1b01 use mem::make::unique instead of explicit new
019d726ea = default for default constructors
86ab5d8f3 use std::unique_ptr and "const noexcept"
b071972d7 another batch of =default for default constructors
98276da94 more =default for default .ctor()s
ceb7bc596 do default constructors with =default
7bed51750 more code-analysis cleanup
f9c04b117 "noexcept" code-analysis warnings
6586ae390 need gsl::make_span from gsl/span_ext
722089774 remove gsl/mem dependency cycle
d741a0761 use gsl::narrow<> instead of static_cast
99eb4b36e get rid of signed/unsigned mismatch compiler warning
814450522 remove more code-analysis diagnostics
c8441b309 Merge branch 'master' into develop/reduce-compiler-warnings
e6d70a9ff last of "const" from code-analysis
b8445814a mark a few more things as "const" per code-analysis
d18544ec7 don't need to create temporary std::strings
ee7faa979 still more code-analysis cleanup
5cd6f864d cleanup more code-analysis diagnostics
492fb0a86 one more compiler warning about implicitly deleted copy/assignment
b8f782c88 remove compiler warnings about implicitly deleted copy/assignment/move
14d1d1cb8 #pragma-away warnings from GSL
86c40ea6c assert() to prevent some code-analysis diagnostics
7204517a9 make copy/assignment explicit
3ce824079 reduce code-analysis diagnostics
01e367a56 Merge branch 'master' into develop/reduce-compiler-warnings
03f3ddde9 proper printf format
877d7dc93 Merge branch 'master' into develop/reduce-compiler-warnings
5a4a3d575 code-analysis doesn't like C-style casts
a3fdae416 code-analysis doesn't like NULL
6309baedc Merge branch 'master' into develop/reduce-compiler-warnings
d1194a2fe Merge branch 'master' into develop/reduce-compiler-warnings
535b4757d Merge branch 'develop/reduce-compiler-warnings' of github.com:mdaus/coda-oss into develop/reduce-compiler-warnings
a60b95d60 "constexpr" can be hard to get right with older C++11 compilers; don't even try
c07b5303e Merge branch 'master' into develop/reduce-compiler-warnings
04306bbee need at least VS2017 to use the real GSL
796ad820b Merge branch 'master' into develop/reduce-compiler-warnings
16c240cd6 Merge branch 'master' into develop/reduce-compiler-warnings
e07e89f0c turn on "warnings as errors" for CMAKE builds
5c019f891 complex "constexpr" functions not available with our version of g++
4ab074a58 fix a few more compiler warnings ... nearing the end! :-)
dea7ea41b And still more compiler warnings ... almost done 🤞🏻
fbe3bbb20 remove assorted compiler warnings
e60b7fd3c Merge branch 'master' into develop/reduce-compiler-warnings
e9df212c6 Arguments should be "const&" to prevent C4866
94e75cbed Merge branch 'master' into develop/reduce-compiler-warnings
d3130414a Merge branch 'master' into develop/reduce-compiler-warnings
9a5e71f31 Merge branch 'master' into develop/reduce-compiler-warnings
bd27c0232 Merge branch 'master' into develop/reduce-compiler-warnings
c053362d2 remove still more compiler warnings
9f133b85a remove some more compiler warnings
0883c729c Merge branch 'master' into develop/reduce-compiler-warnings
f4b766880 avoid comparision between signed/unsigned to prevent compiler warning
1e6564a6e eliminate more compiler warnings
85a7b8ad0 remove a few compiler warnings
09c82049f Merge branch 'master' into develop/reduce-compiler-warnings
31f1662 Merge branch 'master' into develop/reduce-compiler-warnings
a313562 Merge branch 'feature/fix-compiler-warnings' into develop/reduce-compiler-warnings
8547cdd eliminiate GCC warnings from Filesystem.h
b5044b2 fix several compiler warnings/code-analysis diagnostics
9d2f90b GetEnvironmentVariable() and getenv() aren't quite the same
6faa366 remove more compiler warnings

git-subtree-dir: externals/coda-oss
git-subtree-split: 986307c9c05f6b341e78245d220115fabe5b2fdb

* latest from coda-oss

* Squashed 'externals/coda-oss/' changes from 986307c9c..b44709a95

b44709a95 added ComplexSpansView utility (#635)

git-subtree-dir: externals/coda-oss
git-subtree-split: b44709a950f710ff790aae6f9f8eb9f6ec6b0df8

* latest from coda-oss

* Squashed 'externals/coda-oss/' changes from b44709a95..e460970a7

e460970a7 increase GCC warnings (#640)
91284249b provide ComplexView iterator support (#639)
453b7ec68 try to get std::make_unique working with old Intel compiler (#638)
5736cfd4d is_trivially_copyable for old Intel compiler (#637)
7c2aea38f use H5 SDK naming conventions (#636)
fc3008b8d use 'modern' C pre-processor

git-subtree-dir: externals/coda-oss
git-subtree-split: e460970a7c5b3e6a51b0c74dcabeb70fbf4f0f59

* latest from coda-oss

* Squashed 'externals/coda-oss/' changes from e460970a7..b04ccca17

b04ccca17 remove more C++11 work-arounds (#641)

git-subtree-dir: externals/coda-oss
git-subtree-split: b04ccca17493e538130c350208da59be42eb6bc7
  • Loading branch information
J. Daniel Smith authored Jan 23, 2023
1 parent c71acc4 commit 4ccdf5b
Show file tree
Hide file tree
Showing 102 changed files with 4,652 additions and 637 deletions.
5 changes: 0 additions & 5 deletions externals/coda-oss/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ if (${CMAKE_PROJECT_NAME} STREQUAL coda-oss)
string(REGEX REPLACE "/W[0-4]" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
add_compile_options(/std:c++14)
elseif (UNIX)
add_compile_options(
-Wno-deprecated
-Wno-unused-value
-Wno-unused-but-set-variable
)
add_compile_options(-std=c++14)
endif()

Expand Down
16 changes: 12 additions & 4 deletions externals/coda-oss/UnitTest/UnitTest.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -64,10 +64,13 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<TreatWarningAsError>true</TreatWarningAsError>
<ControlFlowGuard>Guard</ControlFlowGuard>
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<ConformanceMode>true</ConformanceMode>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<TranslateIncludes>true</TranslateIncludes>
<UseStandardPreprocessor>true</UseStandardPreprocessor>
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<ConformanceMode>true</ConformanceMode>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -88,6 +91,11 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ControlFlowGuard>Guard</ControlFlowGuard>
<TranslateIncludes>true</TranslateIncludes>
<UseStandardPreprocessor>true</UseStandardPreprocessor>
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<ConformanceMode>true</ConformanceMode>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down
4 changes: 4 additions & 0 deletions externals/coda-oss/UnitTest/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
// add headers that you want to pre-compile here

#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#pragma warning(push)
#pragma warning(disable: 5105) // macro expansion producing '...' has undefined behavior
#include <WinSock.h>
#include <windows.h>
#include <comdef.h>
#pragma warning(pop)
#undef min
#undef max

Expand Down Expand Up @@ -108,6 +111,7 @@
#include <logging/ExceptionLogger.h>
#include <import/logging.h>
#include <import/re.h>
#include "io/StringStream.h"

#include "TestCase.h"

Expand Down
11 changes: 8 additions & 3 deletions externals/coda-oss/modules/c++/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@ set(CXX_STANDARD_REQUIRED true)

# turn on warnings as errors
if (MSVC)
add_compile_options(/WX)
add_compile_options(/W4)
add_compile_options(/WX /W4)
elseif (UNIX)
add_compile_options(-Werror)
# still building with older GCC :-(
#add_compile_options(-Werror)
add_compile_options(-Wall)
#add_compile_options(-Wpedantic -Wextra)
add_compile_options(-Wno-deprecated-copy)
add_compile_options(-Wno-expansion-to-defined -Wno-type-limits)
add_compile_options(-Wno-unused-parameter)
endif()

# add an interface library for unittests
Expand Down
17 changes: 13 additions & 4 deletions externals/coda-oss/modules/c++/coda-oss-lite.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,8 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<RunCodeAnalysis>true</RunCodeAnalysis>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
Expand All @@ -446,16 +448,20 @@
<WarningLevel>EnableAllWarnings</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions);CODA_OSS_EXPORTS;CODA_OSS_DLL;MT_DEFAULT_PINNING=0;RE_ENABLE_STD_REGEX=1</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>cli\include\;coda_oss\include;config\include\;except\include\;gsl\include\;io\include\;logging\include\;math\include\;math.linear\include\;math.poly\include\;mem\include\;mt\include\;plugin\include\;polygon\include\;re\include\;sio.lite\include\;std\include\;str\include\;sys\include\;tiff\include;types\include\;units\include\</AdditionalIncludeDirectories>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ControlFlowGuard>Guard</ControlFlowGuard>
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<TranslateIncludes>true</TranslateIncludes>
<UseStandardPreprocessor>true</UseStandardPreprocessor>
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<ConformanceMode>true</ConformanceMode>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<EnablePREfast>true</EnablePREfast>
</ClCompile>
<Link>
<SubSystem>
Expand All @@ -470,15 +476,18 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions);CODA_OSS_EXPORTS;CODA_OSS_DLL;MT_DEFAULT_PINNING=0;RE_ENABLE_STD_REGEX=1</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>cli\include\;coda_oss\include;config\include\;except\include\;gsl\include\;io\include\;logging\include\;math\include\;math.linear\include\;math.poly\include\;mem\include\;mt\include\;plugin\include\;polygon\include\;re\include\;sio.lite\include\;std\include\;str\include\;sys\include\;tiff\include;types\include\;units\include\</AdditionalIncludeDirectories>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ControlFlowGuard>Guard</ControlFlowGuard>
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<TranslateIncludes>true</TranslateIncludes>
<UseStandardPreprocessor>true</UseStandardPreprocessor>
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<ConformanceMode>true</ConformanceMode>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ namespace coda_oss
template <typename T>
struct is_trivially_copyable final
{
static_assert(CODA_OSS_cplusplus < 201402L, "C++14 must have is_trivially_copyable.");
// This old Intel compiler has enough C++14 for our needs; see CPlusPlus.h
#if !(defined(__INTEL_COMPILER) && (__INTEL_COMPILER_BUILD_DATE <= 20151021))
static_assert(CODA_OSS_cplusplus < 201402L, "C++14 must have is_trivially_copyable.");
#endif
static constexpr bool value = __has_trivial_copy(T);
};
#else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,16 @@
#endif

namespace version { namespace except {
#if _MSC_VER
#pragma warning(push)
#pragma warning(disable: 5264) // '...': '...' variable is not used
#endif // _MSC_VER

constexpr auto backtrace = CODA_OSS_except_Backtrace;

#if _MSC_VER
#pragma warning(pop)
#endif // _MSC_VER
} }

namespace except
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ using Error11 = ErrorEx; // keep old name around for other projects
* \class InvalidDerivedTypeError
* \brief Represents an invalid derived type error.
*/
DECLARE_ERROR(InvalidDerivedType)
DECLARE_ERROR(InvalidDerivedType);

}

Expand Down
32 changes: 16 additions & 16 deletions externals/coda-oss/modules/c++/except/include/except/Exception.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@
_Name##Exception_(const except::ThrowableEx& t, const except::Context& c) : _Base(t, c){} \
CODA_OSS_except_Exception_suppress_26447_BEGIN_ \
std::string getType() const noexcept override { return #_Name #Exception_; } \
CODA_OSS_except_Exception_suppress_26447_END_ };
CODA_OSS_except_Exception_suppress_26447_END_ };
#define DECLARE_EXTENDED_EXCEPTION(_Name, _Base) DECLARE_EXTENDED_EXCEPTION_(_Name, Exception, _Base)
#define DECLARE_EXTENDED_EXCEPTIONEX(_Name, _Base) DECLARE_EXTENDED_EXCEPTION_(_Name, ExceptionEx, _Base)

// Need to keep this around for existing code
#define DECLARE_EXCEPTION(_Name) \
DECLARE_EXTENDED_EXCEPTION(_Name, except::Exception) \
DECLARE_EXTENDED_EXCEPTION(_Name, except::Exception); \
DECLARE_EXTENDED_EXCEPTIONEX(_Name, except::ExceptionEx)

namespace except
Expand Down Expand Up @@ -172,37 +172,37 @@ using Exception11 = ExceptionEx; // keep old name around for other projects
* \class IOException
* \brief Throwable related to IO problems.
*/
DECLARE_EXCEPTION(IO)
DECLARE_EXCEPTION(IO);

/*!
* \class FileNotFoundException
* \brief Throwable related to a file not found.
*/
DECLARE_EXTENDED_EXCEPTION(FileNotFound, except::IOException)
DECLARE_EXTENDED_EXCEPTION(FileNotFound, except::IOException);

/*!
* \class BadCastException
* \brief Exception for bad casting operations
*/
DECLARE_EXCEPTION(BadCast)
DECLARE_EXCEPTION(BadCast);

/*!
* \class InvalidFormatException
* \brief Throwable related to an invalid file format.
*/
DECLARE_EXCEPTION(InvalidFormat)
DECLARE_EXCEPTION(InvalidFormat);

/*!
* \class IndexOutOfRangeException
* \brief Throwable related to an index being out of range.
*/
DECLARE_EXCEPTION(IndexOutOfRange)
DECLARE_EXCEPTION(IndexOutOfRange);

/*!
* \class OutOfMemoryException
* \brief Throwable related to memory allocation problems.
*/
DECLARE_EXCEPTION(OutOfMemory)
DECLARE_EXCEPTION(OutOfMemory);

/*!
* \class NullPointerReference
Expand All @@ -211,51 +211,51 @@ DECLARE_EXCEPTION(OutOfMemory)
* This class is currently treated as an exception, meaning that its
* behavior is not necessarily fatal.
*/
DECLARE_EXCEPTION(NullPointerReference)
DECLARE_EXCEPTION(NullPointerReference);
//! For backwards-compatibility
typedef NullPointerReferenceException NullPointerReference;

/*!
* \class NoSuchKeyException
* \brief Throwable related to unknown keys.
*/
DECLARE_EXCEPTION(NoSuchKey)
DECLARE_EXCEPTION(NoSuchKey);

/*!
* \class NoSuchReferenceException
* \brief Throwable related to unknown references.
*/
DECLARE_EXCEPTION(NoSuchReference)
DECLARE_EXCEPTION(NoSuchReference);

/*!
* \class KeyAlreadyExistsException
* \brief Throwable related to duplicate keys.
*/
DECLARE_EXCEPTION(KeyAlreadyExists)
DECLARE_EXCEPTION(KeyAlreadyExists);

/*!
* \class NotImplementedException
* \brief Throwable related to code not being implemented yet.
*/
DECLARE_EXCEPTION(NotImplemented)
DECLARE_EXCEPTION(NotImplemented);

/*!
* \class InvalidArgumentException
* \brief Throwable related to an invalid argument being passed.
*/
DECLARE_EXCEPTION(InvalidArgument)
DECLARE_EXCEPTION(InvalidArgument);

/*!
* \class SerializationException
* \brief Throwable related to failing to serialize/deserialize data.
*/
DECLARE_EXTENDED_EXCEPTION(Serialization, except::IOException)
DECLARE_EXTENDED_EXCEPTION(Serialization, except::IOException);

/*!
* \class ParseException
* \brief Throwable related to failing to parse data.
*/
DECLARE_EXTENDED_EXCEPTION(Parse, except::IOException)
DECLARE_EXTENDED_EXCEPTION(Parse, except::IOException);

}

Expand Down
2 changes: 1 addition & 1 deletion externals/coda-oss/modules/c++/except/tests/Gen2Test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
using std::endl; using std::cout;
using namespace except;

DECLARE_EXCEPTION(DivideByZero)
DECLARE_EXCEPTION(DivideByZero);
typedef DivideByZeroException DivideByZero;

double Divide(double x, double y);
Expand Down
3 changes: 3 additions & 0 deletions externals/coda-oss/modules/c++/framework.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@

#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#define NOMINMAX // no min()/max() macros
#pragma warning(push)
#pragma warning(disable: 5105) // macro expansion producing '...' has undefined behavior
#include <windows.h>
#include <Winsock2.h>
#include <comdef.h>
#pragma warning(pop)
#pragma comment(lib, "Ws2_32")
#pragma warning(pop)
2 changes: 1 addition & 1 deletion externals/coda-oss/modules/c++/hdf5.lite/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set(MODULE_NAME hdf5.lite)

if(CODA_ENABLE_HDF5)
set(MODULE_DEPS str-c++ except-c++ types-c++ io-c++ logging-c++ str-c++ coda_oss-c++ config-c++ gsl-c++)
set(MODULE_DEPS except-c++ types-c++ io-c++ coda_oss-c++)
list(APPEND MODULE_DEPS hdf5-c++)

coda_add_module(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ namespace lite
*/
CODA_OSS_DECLARE_EXCEPTION(HDF5);

CODA_OSS_DECLARE_EXTENDED_EXCEPTION(DataSet, hdf5::lite::HDF5Exception)
CODA_OSS_DECLARE_EXTENDED_EXCEPTION(DataSpace, hdf5::lite::HDF5Exception)
CODA_OSS_DECLARE_EXTENDED_EXCEPTION(DataType, hdf5::lite::HDF5Exception)
CODA_OSS_DECLARE_EXTENDED_EXCEPTION(DataSet, hdf5::lite::HDF5Exception);
CODA_OSS_DECLARE_EXTENDED_EXCEPTION(DataSpace, hdf5::lite::HDF5Exception);
CODA_OSS_DECLARE_EXTENDED_EXCEPTION(DataType, hdf5::lite::HDF5Exception);

}
}
Expand Down
Loading

0 comments on commit 4ccdf5b

Please sign in to comment.