forked from Lainports/freebsd-ports
f91e6f96c6
/wrkdirs/usr/ports/cad/libopencad/work/libopencad-0.2.0/lib/cadheader.cpp:478:28: error: ambiguous conversion for functional-style cast from 'time_t' (aka 'long long') to 'CADVariant'
return addValue( code, CADVariant( fullSeconds ) );
^~~~~~~~~~~~~~~~~~~~~~~
26 lines
790 B
C++
26 lines
790 B
C++
--- lib/cadheader.h.orig 2016-08-24 13:25:41 UTC
|
|
+++ lib/cadheader.h
|
|
@@ -35,6 +35,7 @@
|
|
#include <map>
|
|
#include <string>
|
|
#include <vector>
|
|
+#include <ctime>
|
|
|
|
class OCAD_EXTERN CADHandle final
|
|
{
|
|
@@ -64,12 +65,14 @@ class OCAD_EXTERN CADVariant final (public)
|
|
CADVariant();
|
|
CADVariant( const char * val );
|
|
CADVariant( int val );
|
|
+ CADVariant( long val );
|
|
+ CADVariant( long long val );
|
|
CADVariant( short val );
|
|
CADVariant( double val );
|
|
CADVariant( double x, double y, double z = 0 );
|
|
CADVariant( const CADHandle& val );
|
|
CADVariant( const std::string& val );
|
|
- CADVariant( time_t val );
|
|
+ CADVariant( time_t val, bool bIsTime );
|
|
public:
|
|
CADVariant( const CADVariant& orig );
|
|
CADVariant& operator=( const CADVariant& orig );
|