FreeBSD Bugzilla – Attachment 179431 Details for
Bug 216609
devel/py-ice: fails to build with libc++ 4.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
c++ -E output diff for Time.cpp
Time.E.diff (text/plain), 2.04 KB, created by
Jan Beich
on 2017-01-30 17:00:25 UTC
(
hide
)
Description:
c++ -E output diff for Time.cpp
Filename:
MIME Type:
Creator:
Jan Beich
Created:
2017-01-30 17:00:25 UTC
Size:
2.04 KB
patch
obsolete
>--- Time.E before >+++ Time.E after >@@ -625,9 +625,7 @@ inline __attribute__ ((__visibility__("h > # 81 "../../include/IceUtil/Config.h" > # 1 "/usr/include/c++/v1/stdint.h" 1 3 > # 106 "/usr/include/c++/v1/stdint.h" 3 >- >- >- >+# 119 "/usr/include/c++/v1/stdint.h" 3 > # 1 "/usr/include/stdint.h" 1 3 4 > # 35 "/usr/include/stdint.h" 3 4 > # 1 "/usr/include/machine/_stdint.h" 1 3 4 >@@ -695,7 +693,7 @@ typedef __uint_fast8_t uint_fast8_t; > typedef __uint_fast16_t uint_fast16_t; > typedef __uint_fast32_t uint_fast32_t; > typedef __uint_fast64_t uint_fast64_t; >-# 110 "/usr/include/c++/v1/stdint.h" 2 3 >+# 120 "/usr/include/c++/v1/stdint.h" 2 3 > # 82 "../../include/IceUtil/Config.h" 2 > # 104 "../../include/IceUtil/Config.h" > # 1 "/usr/include/sys/param.h" 1 3 4 >@@ -39892,12 +39890,9 @@ private: > noncopyable(const noncopyable&); > const noncopyable& operator=(const noncopyable&); > }; >-# 302 "../../include/IceUtil/Config.h" >-typedef long long Int64; >- >- >- >- >+# 298 "../../include/IceUtil/Config.h" >+typedef long Int64; >+# 307 "../../include/IceUtil/Config.h" > } > # 14 "../../include/IceUtil/Exception.h" 2 > >@@ -44019,7 +44014,7 @@ IceUtil::Time::now(Clock clock) > ((0) ? (void)0 : __assert(__func__, "Time.cpp", 110, "0")); > throw SyscallException("Time.cpp", 111, (* __error())); > } >- return Time(tv.tv_sec * 1000000LL + tv.tv_usec); >+ return Time(tv.tv_sec * 1000000L + tv.tv_usec); > > } > else >@@ -44031,7 +44026,7 @@ IceUtil::Time::now(Clock clock) > ((0) ? (void)0 : __assert(__func__, "Time.cpp", 157, "0")); > throw SyscallException("Time.cpp", 158, (* __error())); > } >- return Time(ts.tv_sec * 1000000LL + ts.tv_nsec / 1000LL); >+ return Time(ts.tv_sec * 1000000L + ts.tv_nsec / 1000L); > > } > } >@@ -44039,13 +44034,13 @@ IceUtil::Time::now(Clock clock) > Time > IceUtil::Time::seconds(Int64 t) > { >- return Time(t * 1000000LL); >+ return Time(t * 1000000L); > } > > Time > IceUtil::Time::milliSeconds(Int64 t) > { >- return Time(t * 1000LL); >+ return Time(t * 1000L); > } > > Time
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 216609
:
179431
|
179433
|
179435
|
179461
|
179462