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

Sidd 1.1 merge #71

Merged
merged 6 commits into from
May 17, 2016
Merged

Sidd 1.1 merge #71

merged 6 commits into from
May 17, 2016

Conversation

JonathanMeans
Copy link
Contributor

Merge in updates to master branch, and fix the new tests so they work with 1.1. The tests do not cover anything SIDD1.1 specific.

@asylvest
Copy link
Contributor

Just one tweak to make... in test_create_sidd_from_mem.cpp's initData(): Pass string in by const ref

@JonathanMeans
Copy link
Contributor Author

Done

From: Adam Sylvester [mailto:[email protected]]
Sent: Tuesday, May 17, 2016 8:23 AM
To: ngageoint/six-library [email protected]
Cc: Jonathan Means [email protected]; Author [email protected]
Subject: Re: [ngageoint/six-library] Sidd 1.1 merge (#71)

Just one tweak to make... in test_create_sidd_from_mem.cpp's initData(): Pass string in by const ref


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHubhttp://cp.mcafee.com/d/avndygA721J5xNBxUsZtwTsSOMOe76zBZYS-epophd79EVdETuKYUqerCzBUSyyOyC-qen67Pozm6P9X3BvS50kGxHtendGEqTjBPuIEn8czD-LO8VYse78ZuVtd5d_Cm67C4jhPORQX8EGTssVkffGhBrwqrhdECXYyUqenAkmkXL6XCOsVHkiP2cFASO7bV0zF7WOxfai3OVYy4tymNpIY_1O86iFhLRRvxcKCyqehRQnTAPp2Hsbvg0bP3P2b9tBx7iUzm6P9X3BvS53BkdrFOUaEh4-8OCjr8sKroosKr1vF6y0QJM8Wh-IEjOAwYKv8x7oBziWq81yi21EwhV4Qga_4zVEwd5063AjhiroudHmRUYS3x

The information contained in this communication is confidential, is intended only for the use of the recipient(s) named above, and may be legally privileged. If the reader of this message is not the intended recipient, you are hereby notified that any dissemination, distribution, or copying of this communication is strictly prohibited. If you have received this communication in error, please re-send this communication to the sender and delete the original message or any copy of it from your computer system.

@asylvest asylvest merged commit 8b6923e into sidd_1.1 May 17, 2016
@asylvest asylvest deleted the sidd_1.1_merge branch May 17, 2016 12:31
JonathanMeans pushed a commit that referenced this pull request Feb 24, 2020
874c8ea Merge pull request #71 from mdaus/improve_scoped_ptrs
24ac795 Adding constructor and reset() overloadings that take in an auto_ptr
04c9f44 Merge pull request #69 from mdaus/warnings
2300393 Merge pull request #70 from mdaus/allow_new_connection_override
21e57d9 The open ssl connection factory needs to be able to override newConnection
0921ad7 Fix spacing in XMLException.h
87cc2f3 Resolve merge conflict
f844a6a Add errNo as optional param to XMLParseException::form()
0130294 Add errNo as optional param to XMLParseException::form()
13b405b Need argc and argv if openssl is defined
df1e50f Fixed typo
8cbd991 Merge pull request #68 from mdaus/warnings
99bae5d Using camel case
22319cf Fix line endings
0fb1690 Add params to main()
446809f Merge pull request #67 from mdaus/ssl_updates
c36a5d7 Add params to main()
9817776 Add params to main()
3a085de Add params to main()
ff40205 Add params to main()
cff7cd2 Add params to main()
f617268 Add params to main()
a09afcb Add params to main()
d071933 Add params to main()
b21b1a4 Add params to main()
e1abc1d Add params to main()
2ff7da7 Add params to main()
cda7a68 Add params to main()
cc3f947 Add params to main()
3209e79 Add params to main()
69edb25 Add params to main()
5d7809c Add params to main()
dcaf846 Add params to main()
85ab3ac Add params to main()
a0f8fa9 Add params to main()
c801bdf Merge branch 'warnings' of https://github.com/mdaus/coda-oss into warnings
e054d50 Fix line endings
c1bc7ba Add params to main()
d5f667e Add params to main()
75346c2 Add params to main()
bd69cdd Add args to main()
0b22af3 Add args to main()
0a1d557 Add args to main()
be2da67 Add args to main()
45db7bc Add args to main()
70e3b08 Add args to main()
cd2c5e9 Add args to main()
e13243f Add args to main()
8af0c56 Add args to main()
ff06a52 Add args to main()
47ed044 Add args to main()
abda57b Add args to main
f46d334 Remove C++11 features from ArgumentParser
be8b2a0 Moved defines to a config file
b8a24b9 Fix some warnings related to integral types
88deffa Remove most warnings about unreferenced formal params
651084e Updated net.ssl to find openssl libraries and use them

git-subtree-dir: externals/coda-oss
git-subtree-split: 874c8eaf677995019d529424eb4457d1d9deaf18
JonathanMeans pushed a commit that referenced this pull request Feb 24, 2020
b6d55dd Merge pull request #77 from mdaus/str_version
29f7131 Merge pull request #76 from mdaus/ExecUnixWork
73b40d5 Fixes some strangeness with non-string versions
3daa20c Fixing the broken subprocess. This was unable to call shell commands like cd, as it was before
2fd44ba Merge pull request #75 from mdaus/ByteStreamSegFault
8d57e50 update to address comment in the merge request
51abf18 calling this method with size of zero causes a segfault, because of the index on line 76. xml::lite is making this call with zero at some point. Though it seems strange it would make a zero sized call, I'm fixing it here because it is ultimately a valid value.
234a007 Merge branch 'fix_windows_net'
c21a4de Fixed a few other void* vs. char* Windows-specific issues
9bf173c Merge pull request #74 from mdaus/fix_windows_net
d6430cf sendto() on Windows wants const char*
8168c28 Merge pull request #73 from mdaus/add_net_speed_tests
a0dce2b Adding speed tests
5bc8f23 send/recv buffers can be void* and methods should just return size_t since we'll error out if < 0
8d67129 Merge pull request #72 from mdaus/swig_smart_ptr
9bb5ab9 Fixing typo 'tpe' to 'type' (makes no difference in generated files)
a0d58c0 Re-generating with Swig 3.0.7
797b128 Regenerated mem-python files
b12cf3a Swig ignores auto_ptr mem:: interface now
874c8ea Merge pull request #71 from mdaus/improve_scoped_ptrs
24ac795 Adding constructor and reset() overloadings that take in an auto_ptr
04c9f44 Merge pull request #69 from mdaus/warnings
2300393 Merge pull request #70 from mdaus/allow_new_connection_override
21e57d9 The open ssl connection factory needs to be able to override newConnection
0921ad7 Fix spacing in XMLException.h
87cc2f3 Resolve merge conflict
f844a6a Add errNo as optional param to XMLParseException::form()
0130294 Add errNo as optional param to XMLParseException::form()
13b405b Need argc and argv if openssl is defined
df1e50f Fixed typo
8cbd991 Merge pull request #68 from mdaus/warnings
99bae5d Using camel case
22319cf Fix line endings
0fb1690 Add params to main()
c36a5d7 Add params to main()
9817776 Add params to main()
3a085de Add params to main()
ff40205 Add params to main()
cff7cd2 Add params to main()
f617268 Add params to main()
a09afcb Add params to main()
d071933 Add params to main()
b21b1a4 Add params to main()
e1abc1d Add params to main()
2ff7da7 Add params to main()
cda7a68 Add params to main()
cc3f947 Add params to main()
3209e79 Add params to main()
69edb25 Add params to main()
5d7809c Add params to main()
dcaf846 Add params to main()
85ab3ac Add params to main()
a0f8fa9 Add params to main()
c801bdf Merge branch 'warnings' of https://github.com/mdaus/coda-oss into warnings
e054d50 Fix line endings
c1bc7ba Add params to main()
d5f667e Add params to main()
75346c2 Add params to main()
bd69cdd Add args to main()
0b22af3 Add args to main()
0a1d557 Add args to main()
be2da67 Add args to main()
45db7bc Add args to main()
70e3b08 Add args to main()
cd2c5e9 Add args to main()
e13243f Add args to main()
8af0c56 Add args to main()
ff06a52 Add args to main()
47ed044 Add args to main()
abda57b Add args to main
f46d334 Remove C++11 features from ArgumentParser
b8a24b9 Fix some warnings related to integral types
88deffa Remove most warnings about unreferenced formal params

git-subtree-dir: externals/coda-oss
git-subtree-split: b6d55dddd25e83df6f05b9dc432ba476fb163259
JDanielSmith pushed a commit that referenced this pull request Oct 13, 2020
874c8ea Merge pull request #71 from mdaus/improve_scoped_ptrs
24ac795 Adding constructor and reset() overloadings that take in an auto_ptr

git-subtree-dir: externals/coda-oss
git-subtree-split: 874c8eaf677995019d529424eb4457d1d9deaf18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants