Skip to content
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.

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

update externals #411

Merged
merged 151 commits into from
Jan 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
25c99e0
add contact details
Jul 20, 2020
05c5da2
update .gitignore
Aug 11, 2020
11b7a17
not sure what to do with CMakeSettings.json
Aug 11, 2020
6b1badc
Merge branch 'master' into develop/jdsmith
Aug 11, 2020
447f29a
Create CMakeSettings.json
Aug 11, 2020
89b7807
new/updated "docs" directory
Aug 11, 2020
f0e51d4
update externals/nitro with latest from nitro repo
Aug 11, 2020
a1d4038
use in32_t, etc. instead of nitf::Int32_t
Aug 11, 2020
aac9d2c
Merge branch 'feature/use_standard_C_types' into develop/jdsmith
Aug 11, 2020
52001ee
Merge branch 'feature/update_nitro' into develop/jdsmith
Aug 11, 2020
c36469f
Revert "Merge branch 'feature/update_nitro' into develop/jdsmith"
Aug 11, 2020
b42f93e
Revert "Merge branch 'feature/use_standard_C_types' into develop/jdsm…
Aug 11, 2020
e212252
use in32_t, etc. instead of nitf::Int32_t
Aug 11, 2020
7eb2813
update externals/nitro with latest from nitro repo
Aug 11, 2020
0a75cff
Revert "update externals/nitro with latest from nitro repo"
Aug 11, 2020
66e7669
update nitro/nrt
Aug 11, 2020
554c974
update "nitro"
Aug 11, 2020
60a45b8
nitf::Int8 -> int8_t
Aug 11, 2020
ce6044b
updates from coda-oss and nitro
Aug 31, 2020
acc353e
update externals/nitro with latest from "main"
Sep 16, 2020
b36a809
update externals/coda-oss with latest from "main"
Sep 16, 2020
e6fe2f1
Merge branch 'develop/master' into develop/main
Sep 16, 2020
cbb9b90
don't want "docs" directory in externals/nitro
Sep 16, 2020
130e3cd
fix bad merge
Sep 16, 2020
f121bad
ignore CMake-generated files
Sep 16, 2020
ce51201
std::auto_ptr -> std::unique_ptr
Sep 16, 2020
c95e858
need std::auto_ptr<> overloads for pre-generated Python wrapper code
Sep 16, 2020
914710c
provide std::auto_ptr "overloads" so that existing Python wrapper cod…
Sep 19, 2020
916f62a
impelement std::auto_ptr "overrides"
Sep 19, 2020
8cd8a70
latest from nitro:main
Sep 22, 2020
533878c
Merge pull request #349 from ngageoint/develop/main
Sep 22, 2020
d0d9f24
update externals/nitro
Oct 5, 2020
a85c00b
update coda-oss
Oct 5, 2020
75868bb
Merge pull request #354 from ngageoint/develop/main
Oct 5, 2020
4388277
Create codeql-analysis.yml
Oct 6, 2020
3f13025
Merge commit 'd216783a2d5ae168a34bc41da70c5c0004648c4a' into main
Oct 6, 2020
d13fd97
update coda-oss with latest from "main"
Oct 13, 2020
7b79bdf
Merge branch 'main' into develop/jdsmith
Oct 13, 2020
1fc1444
update nitro with latest from "main"
Oct 13, 2020
b6617ec
Merge pull request #356 from ngageoint/develop/jdsmith
Oct 13, 2020
571196e
Revert "Create codeql-analysis.yml"
Oct 13, 2020
8730781
fix nitf::Field to get rid of compiler errors
Oct 13, 2020
790ab26
build externals/coda-oss by itself
Oct 13, 2020
7e99996
Merge pull request #357 from ngageoint/develop/jdsmith
Oct 13, 2020
54b2d6f
build with Visual Studio 2019 (#358)
Oct 14, 2020
165fb1d
use c++11 (#359)
Oct 17, 2020
67ee284
get rid of hard-coded paths with <filesystem> (#360)
Oct 17, 2020
bb1dbe6
can't have "check_valid_six" as a directory for *ix build
Oct 17, 2020
e8636f4
build crop_sicd
Oct 17, 2020
52207d7
build crop_sicd in Visual Studio (#361)
Oct 17, 2020
d16b60d
Merge branch 'main' of github.com:ngageoint/six-library into main
Oct 20, 2020
495d74a
update coda-oss with latest from "main"
Oct 20, 2020
92af349
update coda-oss with latest from "main" (#362)
Oct 20, 2020
c7ff931
coda-oss updates to make TextEncoding part of the OutputStream
Oct 21, 2020
2be4824
updates from coda-oss to make TextEncoding part of the OutputStream
Oct 21, 2020
97ecde9
fix StringStream() .ctor()
Oct 21, 2020
39344b1
Merge branch 'main' into develop/update_externals
Oct 21, 2020
cdb0893
one more coda-oss update
Oct 21, 2020
fe9dfff
latest from coda-oss "main" (#364)
Oct 21, 2020
1edffff
latest from "main" on coda-oss: xml.lite updates for UTF-8
Oct 26, 2020
f996fa8
Merge branch 'main' into develop/update_externals
Oct 26, 2020
8ff2451
restore changes lost in merge
Oct 26, 2020
21a550c
update coda-oss (#365)
Oct 26, 2020
18613b5
Merge branch 'main' into develop/update_externals
Oct 26, 2020
d3423b3
latest from coda-oss
Oct 26, 2020
404dadc
another update to coda-oss (#366)
Oct 26, 2020
f71c7ed
Merge branch 'main' into develop/update_externals
Oct 26, 2020
313a601
latest from coda-oss
Oct 26, 2020
5c48090
Develop/update externals (#367)
Oct 26, 2020
f332607
latest from coda-oss
Nov 2, 2020
3a042b6
latest from coda-oss (#368)
Nov 2, 2020
70d253c
Merge branch 'main' into develop/update_externals
Nov 3, 2020
29d743f
latest from "main" on coda-oss
Nov 3, 2020
950668d
latest from coda-oss (#369)
Nov 3, 2020
f014cf4
use Filesystem.h from coda-oss instead of <filesystem>
Nov 3, 2020
90e42da
use sys::Filesystem
Nov 4, 2020
5c4bfb6
Merge branch 'develop/update_externals' into main
Nov 4, 2020
3c07e72
update "nitro" and "coda-oss" (#370)
Nov 9, 2020
f9283e8
preserve utf8 in XML text (#363)
Nov 9, 2020
ce28071
use .tar, not .tar.gz
Nov 9, 2020
79aa44f
add another unit-test (#371)
Nov 30, 2020
4538574
remove some compiler warnings (#372)
Dec 1, 2020
f1b6d22
update externals (#373)
Dec 1, 2020
b03c979
use c++11 features (#374)
Dec 2, 2020
48deaeb
latest "nitro" (#375)
Dec 5, 2020
10df67a
latest from "coda-oss" (#376)
Dec 5, 2020
d038e0e
more use of C++11 (#377)
Dec 5, 2020
ef45d66
fix build errors from recent changes (#378)
Dec 5, 2020
37f1620
NULL -> nullptr (#379)
Dec 5, 2020
e2084e8
latest from coda-oss (#381)
Dec 5, 2020
12f6f27
latest from develop/jdsmith (#382)
Dec 5, 2020
a2d5396
latest from "nitro" (#383)
Dec 5, 2020
514403d
latest from develop/jdsmith (#385)
Dec 8, 2020
f990e77
latest from "nitro" (#387)
Dec 19, 2020
6ba3ffd
latest changes from develop/jdsmith (#386)
Dec 19, 2020
f217f23
update externals (#388)
Dec 19, 2020
433e819
reduce use of toString() (#389)
Dec 22, 2020
21e2b67
latest from coda-oss (#390)
Dec 29, 2020
825a667
latest from coda-oss and nitro (#391)
Dec 30, 2020
f283be3
update coda-oss with latest from https://github.com/mdaus/coda-oss
Jan 9, 2021
ae630e6
update externals/nitro/docs
Jan 9, 2021
0b99300
latest from "nitro"
Jan 9, 2021
db45e1e
Revert "latest from "nitro""
Jan 11, 2021
e89da71
latest from nitro/master
Jan 11, 2021
3adb502
ignore build/ directory
Jan 11, 2021
89522fe
Revert "latest from nitro/master"
Jan 11, 2021
e82f28c
update externals/nitro/docs
Jan 11, 2021
8fe3028
update "c", "java", "mex", and "python" directories -- but not "c++"
Jan 11, 2021
b3c1dbd
update other nitro top-level files ... everything except modules/c++
Jan 11, 2021
a398eef
VCXPROJ files from nitro
Jan 11, 2021
7a9b240
several changes from nitro/c++ ... hoping this builds.
Jan 11, 2021
a688092
fix build error on Linux
Jan 11, 2021
84db123
more changes from nitro/modules/c++
Jan 11, 2021
7aba3b8
fix IOStreamWriter ctor
Jan 11, 2021
d9a5c2f
more changes from nitro/modules/c++
Jan 11, 2021
5e5870f
paths are wrong when in "externals"
Jan 11, 2021
7b8ca70
remove externals/nitro/docs
Jan 11, 2021
92d5bb5
Merge branch 'develop/update_externals' of github.com:ngageoint/six-l…
Jan 11, 2021
e6a58a2
slam in "main"
Jan 12, 2021
65026c2
latest from coda-oss/main
Jan 12, 2021
99a0a01
adjust coda-oss for our usage
Jan 12, 2021
4e6a752
latest from nitro/main
Jan 12, 2021
1bd0cb3
std::span removed from "nitro"
Jan 12, 2021
fa19905
need to redo C++17
Jan 12, 2021
120ee00
fix missing #include file
Jan 13, 2021
da30b96
remove "nitro" files not needed in externals/nitro
Jan 13, 2021
dd710d5
paths are wrong in "externals"
Jan 13, 2021
e69391b
Revert "remove "nitro" files not needed in externals/nitro"
Jan 13, 2021
436986f
Revert "Revert "remove "nitro" files not needed in externals/nitro""
Jan 13, 2021
ebe9550
slam in externals as merging creates too many conflicts
Jan 13, 2021
4e23991
Merge branch 'develop/update_externals' into main
Jan 13, 2021
6de2fa0
merge brought back a deleted #include
Jan 13, 2021
1073b39
add back "java" and "mex"
Jan 16, 2021
6fca258
lates from coda-oss/main
Jan 16, 2021
1083ac1
latest from "nitro"
Jan 16, 2021
e21d4fc
paths are wrong in "externals"
Jan 16, 2021
9e21803
need to redo C++17 support
Jan 16, 2021
c10f233
std::span -> gsl::span
Jan 16, 2021
f897082
Merge branch 'master' into develop/update_externals
Jan 19, 2021
fa0a138
Revert "std::span -> gsl::span"
Jan 19, 2021
b856b54
latest from coda-oss and nitro
Jan 19, 2021
70a3e72
these are the correct files from "master"
Jan 19, 2021
8242847
gsl::span -> std::span
Jan 19, 2021
0ec8633
get #includes right for PCH
Jan 19, 2021
460a96b
didn't want this change
Jan 19, 2021
671a89a
trigger build on GitHub
Jan 19, 2021
0ecff95
remove files that shouldn't have been committed
Jan 19, 2021
f99597a
Merge branch 'master' into develop/update_externals
Jan 26, 2021
4b40305
latest from coda-oss:master
Jan 27, 2021
f204751
latest from nitro::master
Jan 27, 2021
bc1744e
adjust to API changes in coda-oss/xml.lite
Jan 27, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ class TwoD
TwoD<_T> power(size_t toThe) const;

template<typename _TT>
friend std::ostream& operator << (std::ostream& out, const TwoD<_TT> p);
friend std::ostream& operator << (std::ostream& out, const TwoD<_TT>& p);

/*!
* serialize out to a boost stream
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ TwoD<_T>::operator/(double cv) const

template<typename _T>
std::ostream&
operator << (std::ostream& out, const TwoD<_T> p)
operator << (std::ostream& out, const TwoD<_T>& p)
{
for (size_t i = 0 ; i < p.mCoef.size() ; i++)
{
Expand Down
25 changes: 20 additions & 5 deletions externals/coda-oss/modules/c++/str/include/str/utf8.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
*
*/

#ifndef __STR_UTF8_H__
#define __STR_UTF8_H__
#ifndef CODA_OSS_str_utf8_h_INCLUDED_
#define CODA_OSS_str_utf8_h_INCLUDED_
#pragma once

#include <stdint.h>
Expand Down Expand Up @@ -667,15 +667,31 @@ u32bit_iterator utf8to32(octet_iterator start,
return result;
}

// warning C4996: '...': warning STL4015: The std::iterator class template (used as a base class to provide typedefs)
// is deprecated in C++17. (The <iterator> header is NOT deprecated.) The C++ Standard has never required
// user-defined iterators to derive from std::iterator. To fix this warning, stop deriving from std::iterator and
// start providing publicly accessible typedefs named iterator_category, value_type, difference_type, pointer, and reference.
// Note that value_type is required to be non-const, even for constant iterators. You can define
// _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING or
// _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received this warning.
//
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0174r2.html#2.1

// The iterator class
template <typename octet_iterator>
class iterator : public std::iterator<std::bidirectional_iterator_tag, uint32_t>
class iterator
{
octet_iterator it;
octet_iterator range_start;
octet_iterator range_end;

public:
using iterator_category = std::bidirectional_iterator_tag;
using value_type = uint32_t;
using difference_type = ptrdiff_t;
using pointer = value_type*;
using reference = value_type&;

iterator()
{
}
Expand Down Expand Up @@ -738,5 +754,4 @@ class iterator : public std::iterator<std::bidirectional_iterator_tag, uint32_t>
//*************************************************************************
//*************************************************************************

#endif

#endif // CODA_OSS_str_utf8_h_INCLUDED_
Loading