zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #26301
[Merge] lp:~zorba-coders/zorba/php_windows_fix into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/php_windows_fix into lp:zorba.
Commit message:
Solved Linker error when building the php bindings.
Requested reviews:
Juan Zacarias (juan457)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/php_windows_fix/+merge/192253
Solved Linker error when building the php bindings.
--
https://code.launchpad.net/~zorba-coders/zorba/php_windows_fix/+merge/192253
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/internal/diagnostic.h'
--- include/zorba/internal/diagnostic.h 2013-09-13 21:42:43 +0000
+++ include/zorba/internal/diagnostic.h 2013-10-22 21:42:17 +0000
@@ -262,9 +262,7 @@
* @param j The second location.
* @return Returns \c true only if the two locations are not equal.
*/
-inline bool operator!=( location const &i, location const &j ) {
- return !(i == j);
-}
+bool operator!=( location const &i, location const &j );
///////////////////////////////////////////////////////////////////////////////
=== modified file 'src/diagnostics/diagnostic.cpp'
--- src/diagnostics/diagnostic.cpp 2013-09-13 21:43:08 +0000
+++ src/diagnostics/diagnostic.cpp 2013-10-22 21:42:17 +0000
@@ -66,6 +66,7 @@
&& ztd::equals( q1.ns(), q2.ns() );
}
+
bool operator==( QName const &q1, char const *q2 ) {
if ( q2 ) {
if ( *q2 == '{' ) {
@@ -148,6 +149,10 @@
&& i.column_end_ == j.column_end_;
}
+bool operator!=( location const &i, location const &j ) {
+ return !(i == j);
+}
+
parameters const parameters::empty;
#define case_123456789 \