| Commit message (Collapse) | Author | Age |
|
|
|
|
| |
Remove extra newlines from the end of files and add newlines to files
which are missing one.
|
|\ |
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
README.md
android/build.gradle
android/gradle.properties
android/gradle/wrapper/gradle-wrapper.properties
config/Make.common.rules
config/PropertyNames.xml
cpp/BuildInstructionsLinux.md
cpp/BuildInstructionsOSX.md
cpp/BuildInstructionsWinRT.md
cpp/BuildInstructionsWindows.md
cpp/config/Make.rules
cpp/config/Make.rules.mak
cpp/include/IceUtil/Config.h
cpp/include/Slice/PythonUtil.h
cpp/include/Slice/RubyUtil.h
cpp/include/Slice/Util.h
cpp/src/Ice/DynamicLibrary.cpp
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
cpp/src/Ice/winrt/StreamEndpointI.cpp
cpp/src/IceGrid/IceGridDB.cpp
cpp/src/IceGrid/Util.cpp
cpp/src/IceUtil/FileUtil.cpp
cpp/src/IceUtil/FileUtil.h
cpp/src/Makefile
cpp/src/Slice/Util.cpp
cpp/src/slice2cs/Gen.cpp
cpp/src/slice2freeze/Main.cpp
cpp/src/slice2freezej/Main.cpp
cpp/src/slice2html/Makefile
cpp/src/slice2html/Makefile.mak
cpp/src/slice2java/Main.cpp
cpp/test/Ice/exceptions/AllTests.cpp
cpp/test/Ice/facets/AllTests.cpp
cpp/test/Ice/info/AllTests.cpp
cpp/test/Ice/location/AllTests.cpp
cpp/test/Ice/properties/run.py
cpp/test/Ice/timeout/AllTests.cpp
cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
cpp/test/IceStorm/stress/run.py
cpp/test/TestSuite/10.0/Package.appxmanifest
cpp/test/TestSuite/10.0/TestSuite.vcxproj
cpp/test/TestSuite/10.0/TestSuite.vcxproj.filters
cpp/test/TestSuite/10.0/TestSuite_TemporaryKey.pfx
cpp/test/TestSuite/8.0/TestSuite.vcxproj
cpp/test/TestSuite/8.0/TestSuite_TemporaryKey.pfx
csharp/BuildInstructions.md
csharp/src/Ice/PropertyNames.cs
csharp/src/IceLocatorDiscovery/PluginI.cs
java/BuildInstructions.md
java/Makefile
java/Makefile.mak
java/src/Glacier2/src/main/java/Glacier2/Application.java
java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java
java/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
java/src/Ice/src/main/java/Ice/Object.java
java/src/Ice/src/main/java/Ice/ObjectImpl.java
java/src/Ice/src/main/java/IceInternal/PropertyNames.java
java/src/Ice/src/main/java/IceSSL/Plugin.java
java/src/Ice/src/main/java/IceSSL/PluginFactory.java
java/src/Ice/src/main/java/IceUtil/Cache.java
java/src/IceGridGUI/build.gradle
java/src/IceGridGUI/src/main/java/IceGridGUI/SimpleInternalFrame.java
java/src/IceGridGUI/src/main/java/IceGridGUI/Utils.java
java/test/build.gradle
java/test/ejb/README.md
js/src/Ice/PropertyNames.js
js/src/Ice/browser/TimerUtil.js
js/src/Ice/browser/WSTransceiver.js
js/test/Common/TestCases.json
js/test/Common/Worker.js
objective-c/include/objc/Ice/Config.h
objective-c/src/Ice/CommunicatorI.mm
php/BuildInstructionsLinuxOSX.md
php/BuildInstructionsWindows.md
php/config/Make.rules.mak.php
php/src/php7/IcePHP.rc
python/BuildInstructionsLinuxOSX.md
python/BuildInstructionsWindows.md
python/Makefile
python/modules/IcePy/Slice.cpp
python/test/Slice/import/run.py
ruby/BuildInstructionsLinuxOSX.md
ruby/BuildInstructionsWindows.md
ruby/config/Make.rules
ruby/src/IceRuby/Slice.cpp
scripts/TestController.py
scripts/TestUtil.py
slice/Ice/Communicator.ice
slice/Ice/Instrumentation.ice
slice/IceLocatorDiscovery/IceLocatorDiscovery.ice
|
| | |
|
| | |
|
|\| |
|
| | |
|
| | |
|
| | |
|
| | |
|
|/ |
|
|
|
|
| |
core, minor test suite fixes
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
On windows with VS, pragma comment is now defined when building only when
ICE_BUILDING_<component-name> is not defined. ICE_BUILDING_<component-name>
is defined automatically when <component-name>_API_EXPORTS is defined. When building
static Ice libraries on Windows, please define
ICE_BUILDING_<component-name-being-built>.
ICE_DECLSPEC_EXPORT and ICE_DECLSPEC_IMPORT are now defined all the time on Windows,
and we define the various _API macros to /**/ when ICE_STATIC_LIBS is defined.
Replaced various direct use of ICE_DECLSPEC_EXPORT/ICE_DECLSPEC_IMPORT by
the correct _API macro.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
ICE-3420 - Force link failure for debug/release mismatch?
Update VS add-in to not add C++ libraries
Fixed WinRT builds
Fixed Python Windows builds
|
| |
|
|
|
|
| |
easily retrieving proxies without knowning the instance name
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
Better logging in C++, especially with services. On compilers with
stack-trace printing support, the stack trace of most exceptions is
now logged.
|
|
|
|
| |
ConnectionPool
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
- Fixed IceGrid database code to first save to the database and then
do state changes.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Translator, if dll-export is used, emits code to automatically export symbols.
- Removed the two steps builds from various Makefiles.
- Removed any use of _API from .cpp source files. Now ICE_DECLSPEC_EXPORT is directly used.
- Fixed bug with IceGrid test.
Squashed commit of the following:
commit 5bf039b18ac45bb781b8c8718e03d6055bb5138d
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date: Sun Apr 27 22:43:27 2008 -0700
Removed another translator case where _API was used in .cpp files.
commit 6fc3b01b340ce81299c2896fd624faacea456bdc
Author: Matthew Newhook <matthew@zeroc.com>
Date: Mon Apr 28 12:19:03 2008 +0800
Update UNIX Makefiles.
commit 5847f6cf40624a7c9144f046feb3b8eff7002443
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date: Sun Apr 27 20:59:27 2008 -0700
Another fix to windows Makefile.
commit d32b7f82e297c06161fb9f571e964f7178acbbe0
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date: Sun Apr 27 20:14:46 2008 -0700
Translator changes. Windows Makefile cleanup.
commit cd8c8fa282165a5ce5dbf3976e2e420069a1ef02
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date: Sun Apr 27 17:01:32 2008 -0700
Revert "http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=3025 - Bogus IceStorm Makefile"
This reverts commit 187ae9e788cc97969f81b38f2e292e75fbe178f8.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
template to templates.xml
Squashed commit of the following:
commit 4d118c469f87ecec1c7639268371c0228d6f9bb5
Author: Matthew Newhook <matthew@zeroc.com>
Date: Wed Apr 23 15:31:11 2008 +0800
Fix bug with manual node configuration when using an icegrid deployment.
commit 50fb246fe0c6a64132d34a5a7c9e47d3dc612a03
Author: Matthew Newhook <matthew@zeroc.com>
Date: Wed Apr 23 15:15:26 2008 +0800
new template, plus changes to the IceStorm service initialization code.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
- http://bugzilla/bugzilla/show_bug.cgi?id=2706
- http://bugzilla/bugzilla/show_bug.cgi?id=2705
|
| |
|