Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix closing parens and whitespaceriverace-case2046 | Steve Huston | 2016-11-03 | 1 | -6/+6 |
| | |||||
* | Add missing close parens | Steve Huston | 2016-11-03 | 1 | -2/+2 |
| | |||||
* | Output build timing markers if make variable 'timed' is set | Steve Huston | 2016-11-02 | 1 | -0/+6 |
| | |||||
* | Merge pull request #323 from jwillemsen/master | Johnny Willemsen | 2016-11-01 | 10 | -119/+58 |
|\ | | | | | Layout changes and fixed some typos | ||||
| * | Layout changes | Johnny Willemsen | 2016-10-31 | 10 | -119/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * ACE/ace/config-win32-common.h: * TAO/orbsvcs/orbsvcs/IFRService/Container_i.h: * TAO/tests/Bug_1551_Regression/client.cpp: * TAO/tests/Bug_2595_Regression/Hello.h: * TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h: * TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h: * TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h: * TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h: * TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h: * TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h: | ||||
* | | Merge pull request #320 from jwillemsen/master | Johnny Willemsen | 2016-10-31 | 1 | -10/+14 |
|\ \ | |/ | | | Attempt to test FACE configuration | ||||
| * | Ability to disable TAO as part of one matrix | Johnny Willemsen | 2016-10-31 | 1 | -11/+13 |
| | | | | | | | | * .travis.yml: | ||||
| * | Attempt to test FACE configuration | Johnny Willemsen | 2016-10-31 | 1 | -0/+2 |
| | | | | | | | | * .travis.yml: | ||||
* | | Merge pull request #318 from DOCGroup/revert-176-master | Johnny Willemsen | 2016-10-31 | 63 | -303/+171 |
|\ \ | | | | | | | Revert "some (bundled) minor changes (take 2)" | ||||
| * | | Revert "some (bundled) minor changes (take 2)"revert-176-master | Johnny Willemsen | 2016-10-31 | 63 | -303/+171 |
|/ / | |||||
* | | Merge pull request #176 from esohns/master | Johnny Willemsen | 2016-10-31 | 63 | -171/+303 |
|\ \ | | | | | | | some (bundled) minor changes (take 2) | ||||
| * | | updated NEWS | Erik Sohns | 2016-10-30 | 1 | -0/+22 |
| | | | |||||
| * | | removed now-obsolete template instantiation left over from an earlier commit | Erik Sohns | 2016-10-24 | 1 | -3/+0 |
| | | | |||||
| * | | repaired integration build failure | Erik Sohns | 2016-10-23 | 2 | -3/+4 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO | Erik Sohns | 2016-10-23 | 177 | -1019/+1788 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO | Erik Sohns | 2016-07-14 | 4458 | -893245/+7172 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # ACE/protocols/ace/HTBP/HTBP_Channel.cpp # ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp # ACE/protocols/ace/HTBP/HTBP_Session.cpp | ||||
| * | | | | reuse current timestamp to compute wait delay | Erik Sohns | 2016-05-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | added support for CancelIoEx() (Win32) (update passes travis-ci build) | Erik Sohns | 2015-12-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | repaired include strategy for ace/Synch.h (prerequisite to solving template ↵ | Erik Sohns | 2015-12-04 | 6 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instantiation issues on Win32) (update) this addresses complaints by the integration build system (#include ace/OS.h) | ||||
| * | | | | fixed an issue with (exported) template specializations (Win32) | Erik Sohns | 2015-12-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fixed an issue with (exported) template specializations (Win32) | Erik Sohns | 2015-12-04 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | fixed an issue with (exported) template specializations (Win32) | Erik Sohns | 2015-12-04 | 2 | -4/+9 |
| | | | | | |||||
| * | | | | fix potential memory leak when using the Win32 Proactor (part2a) | Erik Sohns | 2015-12-04 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Merge branch 'master' of github.com:esohns/ATCD | Erik Sohns | 2015-12-04 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * | | | | fixed an issue with (exported) template specializations (Win32) | Erik Sohns | 2015-12-04 | 3 | -6/+21 |
| | | | | | | |||||
| * | | | | | fixed an issue with (exported) template specializations (Win32) | Erik Sohns | 2015-12-04 | 4 | -9/+21 |
| |/ / / / | |||||
| * | | | | fixed an issue with (exported) template specializations (Win32) (part3) | Erik Sohns | 2015-12-03 | 3 | -9/+0 |
| | | | | | |||||
| * | | | | fix potential memory leak when using the Win32 Proactor (part2a) | Erik Sohns | 2015-12-03 | 1 | -0/+10 |
| | | | | | |||||
| * | | | | Merge branch 'master' of github.com:esohns/ATCD | Erik Sohns | 2015-12-03 | 0 | -0/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # ACE/ace/Condition_Recursive_Thread_Mutex.h | ||||
| | * | | | | fixed an issue with (exported) template specializations (Win32) (part2) | Erik Sohns | 2015-12-03 | 3 | -15/+12 |
| | | | | | | |||||
| * | | | | | fixed an issue with (exported) template specializations (Win32) (part2) | Erik Sohns | 2015-12-03 | 3 | -14/+17 |
| |/ / / / | |||||
| * | | | | repaired include strategy for ace/Synch.h (prerequisite to solving template ↵ | Erik Sohns | 2015-12-03 | 45 | -138/+176 |
| | | | | | | | | | | | | | | | | | | | | instantiation issues on Win32) | ||||
| * | | | | fix potential memory leak when using the Win32 Proactor (part1) | Erik Sohns | 2015-12-02 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | fixed an issue with (exported) template specializations (Win32) | Erik Sohns | 2015-12-02 | 10 | -21/+53 |
| | | | | | |||||
| * | | | | added support for CancelIoEx() (Win32) | Erik Sohns | 2015-12-01 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | fix problem with std io when using ACE_OSTREAM_TYPE | Erik Sohns | 2015-12-01 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | improved solaris 11 support | Erik Sohns | 2015-12-01 | 2 | -0/+11 |
| | | | | | |||||
* | | | | | Merge pull request #317 from jwillemsen/master | Johnny Willemsen | 2016-10-27 | 16 | -28/+28 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | Fixed typos in comment | ||||
| * | | | Fixed typos in comment | Johnny Willemsen | 2016-10-27 | 16 | -28/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ACE/ace/Asynch_IO.h: * ACE/ace/CDR_Stream.h: * ACE/ace/Hash_Map_Manager_T.h: * ACE/ace/Hash_Multi_Map_Manager_T.h: * ACE/ace/Malloc_T.cpp: * ACE/ace/Map_Manager.h: * ACE/ace/POSIX_Asynch_IO.h: * ACE/ace/SSL/SSL_Context.h: * ACE/websvcs/lib/URL_Addr.h: * TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h: * TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h: * TAO/orbsvcs/tests/Notify/Basic/Events.h: * TAO/orbsvcs/tests/Notify/Basic/Simple.h: * TAO/orbsvcs/tests/Notify/Basic/Updates.h: * TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h: * TAO/tao/CDR.h: | ||||
* | | | | Merge pull request #315 from jwillemsen/master | Johnny Willemsen | 2016-10-17 | 1 | -8/+10 |
|\ \ \ \ | |/ / / | | | | | Changed indentation of generated array code to reduce its size | ||||
| * | | | TAO Array specializations should appear between core versioning macros | Johnny Willemsen | 2016-10-17 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | * TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp: | ||||
| * | | | Changed indentation of generated array code to reduce its size | Johnny Willemsen | 2016-10-17 | 1 | -8/+4 |
| | | | | | | | | | | | | | | | | * TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp: | ||||
* | | | | Merge pull request #314 from jwillemsen/master | Johnny Willemsen | 2016-10-11 | 2 | -42/+42 |
|\ \ \ \ | |/ / / | | | | | Talk about micro instead of a beta release | ||||
| * | | | Talk about micro instead of a beta release | Johnny Willemsen | 2016-10-11 | 2 | -42/+42 |
| | | | | | | | | | | | | | | | | | | | | * ACE/bin/make_release.py: * ACE/docs/bczar/bczar.html: | ||||
* | | | | Merge pull request #313 from jwillemsen/master | Johnny Willemsen | 2016-10-11 | 2 | -21/+2 |
|\ \ \ \ | |/ / / | | | | | Simplify release script | ||||
| * | | | Removed signature and mailid, not used anymore | Johnny Willemsen | 2016-10-11 | 2 | -21/+2 |
| | | | | | | | | | | | | | | | | | | | | * ACE/bin/make_release.py: * ACE/docs/bczar/bczar.html: | ||||
* | | | | Merge pull request #312 from jwillemsen/master | Johnny Willemsen | 2016-10-10 | 6 | -35/+41 |
|\ \ \ \ | |/ / / | | | | | Make x.4.1 public and make initial changes for x.4.2 | ||||
| * | | | Make x.4.1 public and make initial changes for x.4.2 | Johnny Willemsen | 2016-10-10 | 6 | -35/+41 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * ACE/NEWS: * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: * ACE/docs/Download.html: * ACE/docs/bczar/bczar.html: * ACE/etc/index.html: * TAO/NEWS: | ||||
* | | | ACE+TAO-6_4_1ACE+TAO-6_4_1 | Johnny Willemsen | 2016-10-10 | 61 | -66/+826 |
| | | | |||||
* | | | Merge pull request #311 from jwillemsen/master | Johnny Willemsen | 2016-10-06 | 4 | -164/+0 |
|\ \ \ | | | | | | | | | Removed the bug fix only release concept, all micro releases the last… |