[Opalvoip-svn] SF.net SVN: opalvoip:[34728] ptlib/trunk

[<rjo...@us...>]

Revision: 34728
          http://sourceforge.net/p/opalvoip/code/34728
Author:   rjongbloed
Date:     2016-03-28 16:46:34 +0000 (Mon, 28 Mar 2016)
Log Message:
-----------
Merged revision(s) 34697-34727 from ptlib/branches/v2_16:
Fixed compile error on older V8 API.

Modified Paths:
--------------
    ptlib/trunk/src/ptclib/jscript.cxx

Property Changed:
----------------
    ptlib/trunk/

Index: ptlib/trunk
===================================================================
--- ptlib/trunk	2016-03-28 16:33:47 UTC (rev 34727)
+++ ptlib/trunk	2016-03-28 16:46:34 UTC (rev 34728)

Property changes on: ptlib/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -6,7 +6,7 ##
 /ptlib/branches/v2_10:25177-29189,32921,32947
 /ptlib/branches/v2_12:28485-31603
 /ptlib/branches/v2_14:31501-33720
-/ptlib/branches/v2_16:34085-34696
+/ptlib/branches/v2_16:34085-34727
 /ptlib/branches/v2_2:20746,20791,20827,22014,22942
 /ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322,21337,21363,21467,21471-21472,21506,21508,21623,21695,21744,21746,21763,22241,22958,23045-23046,23061,23066,23712
 /ptlib/branches/v2_6:22195,22243,22295,22304,22311,22317,22320,22356,22458,22509,22587,22601-22602,22611,22629,22633,22673,22681,22729,22731-22732,22736,22742,22848,22960,22992,23161,23163,23167,23169,23177,23239,23291,23298,23336,23429,23595,23823,23827,23873,24816
\ No newline at end of property
Modified: ptlib/trunk/src/ptclib/jscript.cxx
===================================================================
--- ptlib/trunk/src/ptclib/jscript.cxx	2016-03-28 16:33:47 UTC (rev 34727)
+++ ptlib/trunk/src/ptclib/jscript.cxx	2016-03-28 16:46:34 UTC (rev 34728)
@@ -440,7 +440,11 @@
       case PVarType::VarStaticBinary:
       case PVarType::VarDynamicBinary:
       default:
+#if P_V8_API > 1
         value = v8::Object::New(m_isolate);
+#else
+        value = v8::Object::New();
+#endif
         break;
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.