summaryrefslogtreecommitdiff
path: root/cpp/src/slice2confluence/Main.cpp
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/3.6'Joe George2017-02-13
|\
| * ICE-7506 - Update copyright to 2017Joe George2017-02-13
| |
* | Rework warning suppression to use global meta dataJose2017-02-03
| |
* | Add --no-warn option to Slice compilersJose2017-02-01
| |
* | Replace NULL by ICE_NULLPTRBernard Normier2017-01-11
| |
* | Fixed (ICE-6694) - Unicode output in command line toolsJose2017-01-09
| |
* | Replaced slice compiler options --ice, --underscore and --dll-export byBernard Normier2016-10-31
| | | | | | | | | | global metadata directives (ice-prefix, underscore, cpp:dll-export:SYMBOL and objc:dll-export:SYMBOL) Added new cs:tie and java:tie metadata
* | Merge remote-tracking branch 'origin/3.6'Jose2016-10-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix ICE-4787 - slice compilers and unicode pathsJose2016-09-17
| |
| * Removed extra whitespace in --validate usageBernard Normier2016-09-12
| |
* | Merge from 3.6 branchBernard Normier2016-09-12
| |
* | Re-factored gmake build systemBenoit Foucher2016-05-03
|/
* Update copyright headersJoe George2016-03-01
|
* ICE-6469 added --validate option to Slice compilersDwayne Boone2015-07-07
|
* Fix typo from previous commitJoe George2015-04-29
|
* Improve usage message for slice compilersJoe George2015-04-29
| | | | | * --ice Allow reserved Ice prefix in Slice identifiers. * --underscore Allow underscores in Slice identifiers.
* Updated copyright to 2015Dwayne Boone2015-01-05
|
* merging javascript branchMark Spruiell2014-03-19
|
* Fixed ICE-5179: Fixed copyrightsBenoit Foucher2013-02-12
|
* Fixed ICE-4855: expand tabs to space (8) for .php, .cpp, .h, .java and .cs filesBernard Normier2012-10-23
|
* Fixed copyrightsBenoit Foucher2012-04-25
|
* Fixed navigational and stylistic bugs and added confluence character ↵Shawn Hussey2011-08-30
| | | | | | | | escaping before comment markup parsing. Added --sort-order param for sorting modules. Improvements and bugfixes for slice2confluence.
* Initial commit of slice2confluence.Shawn Hussey2011-08-16
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 14:59:59 +0000