Use mozilla::void_t, so that CPOW compiles
authorOlli Pettay <Olli.Pettay@helsinki.fi>
Tue, 25 May 2010 10:51:33 +0300
changeset 46876 d9ea9578ff028a659b6a8ed364ff2807f27671e4
parent 46875 983e2271acc37e914e2d62f05f7510067fb6222c
child 46877 c2436a9f3941fd4f5a97810cdca57f5718e394bc
push idunknown
push userunknown
push dateunknown
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Use mozilla::void_t, so that CPOW compiles
js/ipc/CPOWTypes.h
--- a/js/ipc/CPOWTypes.h
+++ b/js/ipc/CPOWTypes.h
@@ -39,23 +39,23 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef mozilla_jsipc_ContextWrapperTypes_h__
 #define mozilla_jsipc_ContextWrapperTypes_h__
 
 #include "jsapi.h"
 #include "jspubtd.h"
 
+using mozilla::void_t;
+
 namespace mozilla {
 namespace jsipc {
 
 using namespace IPC;
 
-struct void_t {};
-
 template <typename P>
 struct CPOWSingleton
 {
     static void Write(Message*, const P&) {}
     static bool Read(const Message*, void**, P*) { return true; }
 };
 
 template <typename Type, typename As>
@@ -73,17 +73,16 @@ struct CPOWConvertible
 
 } // namespace jsipc
 } // namespace mozilla
 
 namespace IPC {
 
 using namespace mozilla::jsipc;
 
-template <> struct ParamTraits<void_t> : public CPOWSingleton<void_t> {};
 template <> struct ParamTraits<JSType> : public CPOWConvertible<JSType, int> {};
 
 }
 
 // TODO Use a more standard logging mechanism.
 #ifdef LOGGING
 #define CPOW_LOG(PRINTF_ARGS) \
     JS_BEGIN_MACRO            \