summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix closing parens and whitespaceriverace-case2046Steve Huston2016-11-031-6/+6
|
* Add missing close parensSteve Huston2016-11-031-2/+2
|
* Output build timing markers if make variable 'timed' is setSteve Huston2016-11-021-0/+6
|
* Merge pull request #323 from jwillemsen/masterJohnny Willemsen2016-11-0110-119/+58
|\ | | | | Layout changes and fixed some typos
| * Layout changesJohnny Willemsen2016-10-3110-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/masterJohnny Willemsen2016-10-311-10/+14
|\ \ | |/ | | Attempt to test FACE configuration
| * Ability to disable TAO as part of one matrixJohnny Willemsen2016-10-311-11/+13
| | | | | | | | * .travis.yml:
| * Attempt to test FACE configurationJohnny Willemsen2016-10-311-0/+2
| | | | | | | | * .travis.yml:
* | Merge pull request #318 from DOCGroup/revert-176-masterJohnny Willemsen2016-10-3163-303/+171
|\ \ | | | | | | Revert "some (bundled) minor changes (take 2)"
| * | Revert "some (bundled) minor changes (take 2)"revert-176-masterJohnny Willemsen2016-10-3163-303/+171
|/ /
* | Merge pull request #176 from esohns/masterJohnny Willemsen2016-10-3163-171/+303
|\ \ | | | | | | some (bundled) minor changes (take 2)
| * | updated NEWSErik Sohns2016-10-301-0/+22
| | |
| * | removed now-obsolete template instantiation left over from an earlier commitErik Sohns2016-10-241-3/+0
| | |
| * | repaired integration build failureErik Sohns2016-10-232-3/+4
| | |
| * | Merge branch 'master' of https://github.com/DOCGroup/ACE_TAOErik Sohns2016-10-23177-1019/+1788
| |\ \
| * \ \ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAOErik Sohns2016-07-144458-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 delayErik Sohns2016-05-301-1/+1
| | | | |
| * | | | added support for CancelIoEx() (Win32) (update passes travis-ci build)Erik Sohns2015-12-131-1/+1
| | | | |
| * | | | repaired include strategy for ace/Synch.h (prerequisite to solving template ↵Erik Sohns2015-12-046-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 Sohns2015-12-041-1/+1
| | | | |
| * | | | fixed an issue with (exported) template specializations (Win32)Erik Sohns2015-12-041-1/+0
| | | | |
| * | | | fixed an issue with (exported) template specializations (Win32)Erik Sohns2015-12-042-4/+9
| | | | |
| * | | | fix potential memory leak when using the Win32 Proactor (part2a)Erik Sohns2015-12-041-4/+0
| | | | |
| * | | | Merge branch 'master' of github.com:esohns/ATCDErik Sohns2015-12-040-0/+0
| |\ \ \ \
| | * | | | fixed an issue with (exported) template specializations (Win32)Erik Sohns2015-12-043-6/+21
| | | | | |
| * | | | | fixed an issue with (exported) template specializations (Win32)Erik Sohns2015-12-044-9/+21
| |/ / / /
| * | | | fixed an issue with (exported) template specializations (Win32) (part3)Erik Sohns2015-12-033-9/+0
| | | | |
| * | | | fix potential memory leak when using the Win32 Proactor (part2a)Erik Sohns2015-12-031-0/+10
| | | | |
| * | | | Merge branch 'master' of github.com:esohns/ATCDErik Sohns2015-12-030-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # ACE/ace/Condition_Recursive_Thread_Mutex.h
| | * | | | fixed an issue with (exported) template specializations (Win32) (part2)Erik Sohns2015-12-033-15/+12
| | | | | |
| * | | | | fixed an issue with (exported) template specializations (Win32) (part2)Erik Sohns2015-12-033-14/+17
| |/ / / /
| * | | | repaired include strategy for ace/Synch.h (prerequisite to solving template ↵Erik Sohns2015-12-0345-138/+176
| | | | | | | | | | | | | | | | | | | | instantiation issues on Win32)
| * | | | fix potential memory leak when using the Win32 Proactor (part1)Erik Sohns2015-12-021-0/+6
| | | | |
| * | | | fixed an issue with (exported) template specializations (Win32)Erik Sohns2015-12-0210-21/+53
| | | | |
| * | | | added support for CancelIoEx() (Win32)Erik Sohns2015-12-011-0/+5
| | | | |
| * | | | fix problem with std io when using ACE_OSTREAM_TYPEErik Sohns2015-12-011-0/+4
| | | | |
| * | | | improved solaris 11 supportErik Sohns2015-12-012-0/+11
| | | | |
* | | | | Merge pull request #317 from jwillemsen/masterJohnny Willemsen2016-10-2716-28/+28
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | Fixed typos in comment
| * | | Fixed typos in commentJohnny Willemsen2016-10-2716-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/masterJohnny Willemsen2016-10-171-8/+10
|\ \ \ \ | |/ / / | | | | Changed indentation of generated array code to reduce its size
| * | | TAO Array specializations should appear between core versioning macrosJohnny Willemsen2016-10-171-0/+6
| | | | | | | | | | | | | | | | * TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp:
| * | | Changed indentation of generated array code to reduce its sizeJohnny Willemsen2016-10-171-8/+4
| | | | | | | | | | | | | | | | * TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp:
* | | | Merge pull request #314 from jwillemsen/masterJohnny Willemsen2016-10-112-42/+42
|\ \ \ \ | |/ / / | | | | Talk about micro instead of a beta release
| * | | Talk about micro instead of a beta releaseJohnny Willemsen2016-10-112-42/+42
| | | | | | | | | | | | | | | | | | | | * ACE/bin/make_release.py: * ACE/docs/bczar/bczar.html:
* | | | Merge pull request #313 from jwillemsen/masterJohnny Willemsen2016-10-112-21/+2
|\ \ \ \ | |/ / / | | | | Simplify release script
| * | | Removed signature and mailid, not used anymoreJohnny Willemsen2016-10-112-21/+2
| | | | | | | | | | | | | | | | | | | | * ACE/bin/make_release.py: * ACE/docs/bczar/bczar.html:
* | | | Merge pull request #312 from jwillemsen/masterJohnny Willemsen2016-10-106-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.2Johnny Willemsen2016-10-106-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_1Johnny Willemsen2016-10-1061-66/+826
| | |
* | | Merge pull request #311 from jwillemsen/masterJohnny Willemsen2016-10-064-164/+0
|\ \ \ | | | | | | | | Removed the bug fix only release concept, all micro releases the last…