Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-867662 into
lp:zorba.
Requested reviews:
Sorin Marian Nasoi (sorin.marian.nasoi)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-867662/+merge/78139
Now using zorba_nullptr and macro.
--
https://code.launchpad.net/~paul-lucas/zorba/bug-867662/+merge/78139
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2011-10-04 08:31:21 +0000
+++ ChangeLog 2011-10-04 18:28:25 +0000
@@ -40,7 +40,8 @@
* Fixed bug #863320 (Sentence is incorrectly incremented when token characters end without sentence terminator)
* Fixed bug #863730 (static delete-node* functions don't raise ZDDY0012)
* Implemented the probe-index-range-value for general indexes
-
+ * Fixed bug #867662 ("nullptr" warning)
+
version 2.0.1
* Custom Full-text stemming.
=== modified file 'src/util/cxx_util.h'
--- src/util/cxx_util.h 2011-06-14 17:26:33 +0000
+++ src/util/cxx_util.h 2011-10-04 18:28:25 +0000
@@ -25,6 +25,9 @@
/**
* See: http://www2.research.att.com/~bs/C++0xFAQ.html#nullptr
+ *
+ * We use "zorba_nullptr" in combination with a macro to elimimate a
+ * "identifier 'nullptr' will become a keyword in C++0x" warning.
*/
class nullptr_t {
public:
@@ -38,7 +41,9 @@
}
private:
void operator&() const; // whose address can't be taken
-} const nullptr = {}; // and whose name is nullptr
+} const zorba_nullptr = {}; // and whose name is nullptr
+
+#define nullptr ::zorba_nullptr
#endif /* ZORBA_CXX_NULLPTR */
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
