[110428] trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.Slice. Preprocessor.cpp.diff
blair at macports.org
blair at macports.org
Fri Aug 30 19:13:11 PDT 2013
Revision: 110428
https://trac.macports.org/changeset/110428
Author: blair at macports.org
Date: 2013-08-30 19:13:11 -0700 (Fri, 30 Aug 2013)
Log Message:
-----------
zeroc-ice33: update patch for slice compilers aborting.
http://www.zeroc.com/forums/patches/4340-patch-2-ice-3-3-1-slice-compilers-abort.html
http://www.zeroc.com/forums/attachments/patches/716d1255004802-patch-2-ice-3-3-1-slice-compilers-abort-slice.patch.txt
Modified Paths:
--------------
trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff
Modified: trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff
===================================================================
--- trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff 2013-08-31 02:07:29 UTC (rev 110427)
+++ trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff 2013-08-31 02:13:11 UTC (rev 110428)
@@ -1,6 +1,19 @@
+diff -r -c -N ../Ice-3.3.1-old/cpp/include/Slice/Preprocessor.h ./cpp/include/Slice/Preprocessor.h
+*** ../Ice-3.3.1-old/cpp/include/Slice/Preprocessor.h 2009-03-20 15:22:13.000000000 -0230
+--- ./cpp/include/Slice/Preprocessor.h 2009-10-08 09:26:58.000000000 -0230
+***************
+*** 53,58 ****
+--- 53,59 ----
+
+ const std::string _path;
+ const std::string _fileName;
++ const std::string _shortFileName;
+ const std::vector<std::string> _args;
+ #ifdef _WIN32
+ std::wstring _cppFile;
diff -r -c -N ../Ice-3.3.1-old/cpp/src/Slice/Preprocessor.cpp ./cpp/src/Slice/Preprocessor.cpp
*** ../Ice-3.3.1-old/cpp/src/Slice/Preprocessor.cpp 2009-03-20 15:22:14.000000000 -0230
---- ./cpp/src/Slice/Preprocessor.cpp 2009-05-12 16:18:54.000000000 -0230
+--- ./cpp/src/Slice/Preprocessor.cpp 2009-10-08 09:26:20.000000000 -0230
***************
*** 46,52 ****
@@ -10,11 +23,43 @@
_args(args),
_cppHandle(0)
{
---- 46,52 ----
+--- 46,53 ----
Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args) :
_path(path),
! _fileName(fullPath(fileName)),
+! _shortFileName(fileName),
_args(args),
_cppHandle(0)
{
+***************
+*** 316,322 ****
+ {
+ fullIncludePaths.push_back(fullPath(*p));
+ }
+- string absoluteFileName = fullPath(_fileName);
+
+ //
+ // Process each dependency.
+--- 317,322 ----
+***************
+*** 328,336 ****
+ string file = IceUtilInternal::trim(unprocessed.substr(pos, end - pos));
+ if(IceUtilInternal::isAbsolutePath(file))
+ {
+! if(file == absoluteFileName)
+ {
+! file = _fileName;
+ }
+ else
+ {
+--- 328,336 ----
+ string file = IceUtilInternal::trim(unprocessed.substr(pos, end - pos));
+ if(IceUtilInternal::isAbsolutePath(file))
+ {
+! if(file == _fileName)
+ {
+! file = _shortFileName;
+ }
+ else
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130830/43ad81cd/attachment.html>
More information about the macports-changes
mailing list