luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A couple of changes to make MSVC work - not done yet.

This commit is contained in:
Matthias Köfferlein 2018-09-02 00:40:35 +02:00
parent e47a0966bd
commit 356a468d66
21 changed files with 194 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
setup.py
View File

@ -154,13 +154,15 @@ config = Config()
# ------------------------------------------------------------------
# _tl dependency library
_tl_sources = glob.glob("src/tl/tl/*.cc")
_tl_path = os.path.join("src", "tl", "tl")
_tl_sources = glob.glob(os.path.join(_tl_path, "*.cc"))
# Exclude sources which are compatible with Qt only
_tl_sources.remove("src/tl/tl/tlHttpStreamQt.cc")
_tl_sources.remove("src/tl/tl/tlHttpStreamNoQt.cc")
_tl_sources.remove("src/tl/tl/tlFileSystemWatcher.cc")
_tl_sources.remove("src/tl/tl/tlDeferredExecutionQt.cc")
_tl_sources.remove(os.path.join(_tl_path, "tlHttpStreamQt.cc"))
_tl_sources.remove(os.path.join(_tl_path, "tlHttpStreamNoQt.cc"))
_tl_sources.remove(os.path.join(_tl_path, "tlFileSystemWatcher.cc"))
_tl_sources.remove(os.path.join(_tl_path, "tlDeferredExecutionQt.cc"))
_tl = Extension(config.root + '._tl',
define_macros=config.macros() + [('MAKE_TL_LIBRARY', 1)],
@ -201,10 +203,11 @@ _pya = Extension(config.root + '._pya',
# ------------------------------------------------------------------
# _db dependency library
_db_sources = glob.glob("src/db/db/*.cc")
_db_path = os.path.join("src", "db", "db")
_db_sources = glob.glob(os.path.join(_db_path, "*.cc"))
# Not a real source:
_db_sources.remove("src/db/db/fonts.cc")
_db_sources.remove(os.path.join(_db_path, "fonts.cc"))
_db = Extension(config.root + '._db',
define_macros=config.macros() + [('MAKE_DB_LIBRARY', 1)],

2
src/buddies/unit_tests/bdStrmcmpTests.cc
View File

@ -459,10 +459,10 @@ TEST(9B)
EXPECT_EQ (cap.captured_text (),
"Texts differ for layer 8/1 in cell RINGO\n"
"Not in b but in a:\n"
" ('VSS',r0 0,0)\n"
" ('FB',r0 0,1800)\n"
" ('OSC',r0 24560,1800)\n"
" ('VDD',r0 0,2800)\n"
" ('VSS',r0 0,0)\n"
"Not in a but in b:\n"
"Layouts differ\n"
);

9
src/db/db/dbLayoutDiff.cc
View File

@ -1217,8 +1217,15 @@ PrintingDifferenceReceiver::print_cell_inst (const db::CellInstArrayWithProperti
template <class SH>
void
PrintingDifferenceReceiver::print_diffs (const db::PropertiesRepository &pr, const std::vector <std::pair <SH, db::properties_id_type> > &a, const std::vector <std::pair <SH, db::properties_id_type> > &b)
PrintingDifferenceReceiver::print_diffs (const db::PropertiesRepository &pr, const std::vector <std::pair <SH, db::properties_id_type> > &_a, const std::vector <std::pair <SH, db::properties_id_type> > &_b)
{
// the vectors may be in any order (specifically because of tolerances) but
// for the diff we need to make sure they are ordered.
std::vector <std::pair <SH, db::properties_id_type> > a = _a;
std::sort (a.begin (), a.end ());
std::vector <std::pair <SH, db::properties_id_type> > b = _b;
std::sort (b.begin (), b.end ());
std::vector <std::pair <SH, db::properties_id_type> > anotb;
std::set_difference (a.begin (), a.end (), b.begin (), b.end (), std::back_inserter (anotb));
for (typename std::vector <std::pair <SH, db::properties_id_type> >::const_iterator s = anotb.begin (); s != anotb.end (); ++s) {

10
src/db/db/dbPath.h
View File

@ -224,6 +224,7 @@ public:
typedef typename coord_traits::area_type area_type;
typedef object_tag< path<C> > tag;
typedef tl::vector<point_type> pointlist_type;
typedef typename tl::type_traits<pointlist_type>::relocate_requirements relocate_requirements;
typedef db::path_point_iterator<path <C>, db::unit_trans<C> > iterator;
/**
@ -1129,10 +1130,6 @@ Path round_path_corners (const Path &input, int rad, int npoints);
} // namespace db
/**
* @brief Special extractors for the paths
*/
namespace tl
{
/**
@ -1141,7 +1138,7 @@ namespace tl
template <class C>
struct type_traits <db::path<C> > : public type_traits<void>
{
typedef trivial_relocate_required relocate_requirements;
typedef typename db::path<C>::relocate_requirements relocate_requirements;
typedef true_tag has_efficient_swap;
typedef true_tag supports_extractor;
typedef true_tag supports_to_string;
@ -1149,6 +1146,9 @@ namespace tl
typedef true_tag has_equal_operator;
};
/**
* @brief Special extractors for the paths
*/
template<> DB_PUBLIC void extractor_impl (tl::Extractor &ex, db::Path &p);
template<> DB_PUBLIC void extractor_impl (tl::Extractor &ex, db::DPath &p);

1
src/db/db/dbPoint.h
View File

@ -686,6 +686,7 @@ namespace tl
template <class C>
struct type_traits <db::point<C> > : public type_traits<void>
{
typedef trivial_relocate_required relocate_requirements;
typedef true_tag supports_extractor;
typedef true_tag supports_to_string;
typedef true_tag has_less_operator;

38
src/db/db/dbPolygon.h
View File

@ -1011,6 +1011,29 @@ private:
}
};
}
namespace tl
{
/**
* @brief The type traits for the contour type
*/
template <class C>
struct type_traits <db::polygon_contour<C> > : public type_traits<void>
{
// the contour just uses one pointer, hence the relocation requirements are simple
typedef typename tl::trivial_relocate_required relocate_requirements;
typedef true_tag has_efficient_swap;
typedef false_tag supports_extractor;
typedef false_tag supports_to_string;
typedef true_tag has_less_operator;
typedef true_tag has_equal_operator;
};
}
namespace db
{
/**
* @brief The contour point iterator
*
@ -1351,7 +1374,6 @@ private:
}
};
/**
* @brief A polygon class
*
@ -1383,6 +1405,7 @@ public:
typedef typename coord_traits::area_type area_type;
typedef polygon_contour<C> contour_type;
typedef tl::vector<contour_type> contour_list_type;
typedef typename tl::type_traits<contour_list_type>::relocate_requirements relocate_requirements;
typedef db::polygon_edge_iterator< polygon<C>, db::unit_trans<C> > polygon_edge_iterator;
typedef db::polygon_contour_iterator< contour_type, db::unit_trans<C> > polygon_contour_iterator;
typedef db::object_tag< polygon<C> > tag;
@ -2339,11 +2362,11 @@ public:
typedef typename coord_traits::area_type area_type;
typedef polygon_contour<C> contour_type;
typedef tl::vector<contour_type> contour_list_type;
typedef typename tl::type_traits<contour_type>::relocate_requirements relocate_requirements;
typedef db::polygon_edge_iterator< simple_polygon<C>, db::unit_trans<C> > polygon_edge_iterator;
typedef db::polygon_contour_iterator< contour_type, db::unit_trans<C> > polygon_contour_iterator;
typedef db::object_tag< simple_polygon<C> > tag;
/**
* @brief The default constructor.
*
@ -3388,10 +3411,6 @@ void swap (db::simple_polygon<C> &a, db::simple_polygon<C> &b)
} // namespace std
/**
* @brief Special extractors for the polygons
*/
namespace tl
{
/**
@ -3400,7 +3419,7 @@ namespace tl
template <class C>
struct type_traits <db::polygon<C> > : public type_traits<void>
{
typedef trivial_relocate_required relocate_requirements;
typedef typename db::polygon<C>::relocate_requirements relocate_requirements;
typedef true_tag has_efficient_swap;
typedef true_tag supports_extractor;
typedef true_tag supports_to_string;
@ -3414,13 +3433,16 @@ namespace tl
template <class C>
struct type_traits <db::simple_polygon<C> > : public type_traits<void>
{
typedef trivial_relocate_required relocate_requirements;
typedef typename db::simple_polygon<C>::relocate_requirements relocate_requirements;
typedef true_tag supports_extractor;
typedef true_tag supports_to_string;
typedef true_tag has_less_operator;
typedef true_tag has_equal_operator;
};
/**
* @brief Special extractors for the polygons
*/
template<> DB_PUBLIC void extractor_impl (tl::Extractor &ex, db::Polygon &p);
template<> DB_PUBLIC void extractor_impl (tl::Extractor &ex, db::DPolygon &p);
template<> DB_PUBLIC void extractor_impl (tl::Extractor &ex, db::SimplePolygon &p);

30
src/db/unit_tests/dbLayoutDiff.cc
View File

@ -122,8 +122,12 @@ TestDifferenceReceiver::print_cell_inst (const db::CellInstArrayWithProperties &
template <class SH>
void
TestDifferenceReceiver::print_diffs (const db::PropertiesRepository & /*pr*/, const std::vector <std::pair <SH, db::properties_id_type> > &a, const std::vector <std::pair <SH, db::properties_id_type> > &b)
TestDifferenceReceiver::print_diffs (const db::PropertiesRepository & /*pr*/, const std::vector <std::pair <SH, db::properties_id_type> > &_a, const std::vector <std::pair <SH, db::properties_id_type> > &_b)
{
std::vector <std::pair <SH, db::properties_id_type> > a = _a;
std::sort (a.begin (), a.end ());
std::vector <std::pair <SH, db::properties_id_type> > b = _b;
std::sort (b.begin (), b.end ());
std::vector <std::pair <SH, db::properties_id_type> > anotb;
std::set_difference (a.begin (), a.end (), b.begin (), b.end (), std::back_inserter (anotb));
for (typename std::vector <std::pair <SH, db::properties_id_type> >::const_iterator s = anotb.begin (); s != anotb.end (); ++s) {
@ -593,8 +597,8 @@ TEST(2)
"layout_diff: boxes differ for layer 17/0 in cell c2x\n"
"Not in b but in a:\n"
"Not in a but in b:\n"
" (2,2;1003,1004)\n"
" (1,2;1003,1006)\n"
" (2,2;1003,1004)\n"
);
}
@ -736,8 +740,8 @@ TEST(2P)
"Not in b but in a:\n"
" (1,2;1003,1004) [1]\n"
"Not in a but in b:\n"
" (1,2;1003,1006) [1]\n"
" (1,2;1003,1005) [2]\n"
" (1,2;1003,1006) [1]\n"
" (2,2;1003,1004) [3]\n"
);
@ -750,8 +754,8 @@ TEST(2P)
"Not in b but in a:\n"
" (1,2;1003,1004) [1]\n"
"Not in a but in b:\n"
" (1,2;1003,1006) [1]\n"
" (1,2;1003,1005) [2]\n"
" (1,2;1003,1006) [1]\n"
" (2,2;1003,1004) [3]\n"
);
@ -809,8 +813,8 @@ TEST(2P)
"layout_diff: boxes differ for layer 17/0 in cell c2x\n"
"Not in b but in a:\n"
"Not in a but in b:\n"
" (1,2;1003,1006) [2]\n"
" (1,2;1003,1005) [3]\n"
" (1,2;1003,1006) [2]\n"
);
h = hh;
@ -828,9 +832,9 @@ TEST(2P)
"Not in b but in a:\n"
" (1,2;1003,1004) [1]\n"
"Not in a but in b:\n"
" (2,2;1003,1004)\n"
" (1,2;1003,1006) [1]\n"
" (1,2;1003,1005) [1]\n"
" (1,2;1003,1006) [1]\n"
" (2,2;1003,1004)\n"
);
}
@ -941,8 +945,8 @@ TEST(3)
"layout_diff: polygons differ for layer 17/0 in cell c2x\n"
"Not in b but in a:\n"
"Not in a but in b:\n"
" (2,2;2,1004;1003,1004;1003,2)\n"
" (1,2;1,1006;1003,1006;1003,2)\n"
" (2,2;2,1004;1003,1004;1003,2)\n"
);
}
@ -1053,8 +1057,8 @@ TEST(4)
"layout_diff: edges differ for layer 17/0 in cell c2x\n"
"Not in b but in a:\n"
"Not in a but in b:\n"
" (2,2;1003,1004)\n"
" (1,2;1003,1006)\n"
" (2,2;1003,1004)\n"
);
}
@ -1163,10 +1167,10 @@ TEST(5)
"layout_diff: texts differ for layer 17/0 in cell c2x\n"
"Not in b but in a:\n"
"Not in a but in b:\n"
" ('X',r90 3,4)\n"
" ('X',r90 2,3)\n"
" ('X',r180 2,3)\n"
" ('Y',r90 2,3)\n"
" ('X',r90 3,4)\n"
" ('X',r180 2,3)\n"
);
// two more to match more of h:
@ -1181,8 +1185,8 @@ TEST(5)
"layout_diff: texts differ for layer 17/0 in cell c2x\n"
"Not in b but in a:\n"
"Not in a but in b:\n"
" ('X',r180 2,3)\n"
" ('Y',r90 2,3)\n"
" ('X',r180 2,3)\n"
);
}
@ -1297,9 +1301,9 @@ TEST(6)
"layout_diff: paths differ for layer 17/0 in cell c2x\n"
"Not in b but in a:\n"
"Not in a but in b:\n"
" (1,2;11,12) w=17 bx=0 ex=0 r=true\n"
" (1,2;11,12) w=17 bx=0 ex=-1 r=false\n"
" (1,3;11,11) w=17 bx=0 ex=0 r=false\n"
" (1,2;11,12) w=17 bx=0 ex=0 r=true\n"
" (1,2;11,12) w=17 bx=1 ex=0 r=false\n"
" (1,2;11,12) w=18 bx=0 ex=0 r=false\n"
);

10
src/gsi/gsi_test/gsiTest.cc
View File

@ -237,12 +237,18 @@ static std::vector <A>::const_iterator b10e_ext (const B *b)
static const A *b10bp_ext (const B *b)
{
return &*(b->b10b ());
if (b->b10b () == b->b10e ()) {
return 0;
} else {
return b->b10b ().operator-> ();
}
}
static const A *b10ep_ext (const B *b)
{
return &*(b->b10e ());
// The way this code is written there are no assertions from MSVC's
// iterator debug mode:
return b10bp_ext (b) + (b->b10e () - b->b10b ());
}
// ----------------------------------------------------------------

6
src/lay/lay/layMacroController.cc
View File

@ -46,8 +46,7 @@ MacroController::MacroController ()
dm_sync_file_watcher (this, &MacroController::sync_file_watcher),
dm_sync_files (this, &MacroController::sync_files)
{
connect (&m_temp_macros, SIGNAL (menu_needs_update ()), this, SLOT (macro_collection_changed ()));
connect (&m_temp_macros, SIGNAL (macro_collection_changed (lym::MacroCollection *)), this, SLOT (macro_collection_changed ()));
// .. nothing yet ..
}
static lay::MacroController::MacroCategory ruby_cat ()
@ -159,6 +158,9 @@ MacroController::finish ()
void
MacroController::initialized (lay::PluginRoot *root)
{
connect (&m_temp_macros, SIGNAL (menu_needs_update ()), this, SLOT (macro_collection_changed ()));
connect (&m_temp_macros, SIGNAL (macro_collection_changed (lym::MacroCollection *)), this, SLOT (macro_collection_changed ()));
mp_mw = dynamic_cast <lay::MainWindow *> (root);
if (mp_mw) {
mp_macro_editor = new lay::MacroEditorDialog (mp_mw, &lym::MacroCollection::root ());

4
src/laybasic/laybasic/layEditable.cc
View File

@ -57,6 +57,10 @@ Editable::Editable (lay::Editables *editables)
Editable::~Editable ()
{
// Reasoning for reset (): on MSVC, virtual functions must not be called inside
// the destructor. reset () avoids that lay::Editables::enable calls us.
reset ();
// erase the object from the table of enabled services
if (mp_editables) {
mp_editables->enable (this, false);

5
src/laybasic/laybasic/layLayerTreeModel.h
View File

@ -209,11 +209,6 @@ public:
*/
void signal_layer_changed ();
signals:
void dataChanged (const QModelIndex & topLeft, const QModelIndex & bottomRight );
void layoutAboutToBeChanged ();
void layoutChanged ();
private:
lay::LayoutView *mp_view;
size_t m_id_start, m_id_end;

8
src/plugins/streamers/oasis/db_plugin/dbOASISWriter.cc
View File

@ -1070,7 +1070,11 @@ OASISWriter::end_cblock ()
tl::OutputStream deflated_stream (m_cblock_compressed);
tl::DeflateFilter deflate (deflated_stream);
deflate.put (m_cblock_buffer.data (), m_cblock_buffer.size ());
// Reasoning for if(...): we don't want to access data from an empty vector through data()
if (m_cblock_buffer.size () > 0) {
deflate.put (m_cblock_buffer.data (), m_cblock_buffer.size ());
}
deflate.flush ();
const size_t compression_overhead = 4;
@ -1088,7 +1092,7 @@ OASISWriter::end_cblock ()
write_bytes (m_cblock_compressed.data (), m_cblock_compressed.size ());
} else {
} else if (m_cblock_buffer.size () > 0) { // Reasoning for if(...): we don't want to access data from an empty vector through data()
write_bytes (m_cblock_buffer.data (), m_cblock_buffer.size ());
}

16
src/pymod/unit_tests/pymod_tests.cc
View File

@ -36,9 +36,15 @@
int run_pymodtest (tl::TestBase *_this, const std::string &fn)
{
static std::string pypath;
pypath = "PYTHONPATH=";
pypath += STRINGIFY (PYTHONPATH);
putenv ((char *) pypath.c_str ());
if (pypath.empty ()) {
pypath = "PYTHONPATH=";
pypath += STRINGIFY (PYTHONPATH);
}
#if defined(_WIN32)
_putenv (const_cast<char *> (pypath.c_str ()));
#else
putenv (const_cast<char *> (pypath.c_str ()));
#endif
tl::info << pypath;
std::string fp (tl::testsrc ());
@ -47,7 +53,9 @@ int run_pymodtest (tl::TestBase *_this, const std::string &fn)
std::string text;
{
tl::InputPipe pipe (std::string (STRINGIFY (PYTHON)) + " " + fp + " 2>&1");
std::string cmd = std::string ("\"") + STRINGIFY (PYTHON) + "\" " + fp + " 2>&1";
tl::info << cmd;
tl::InputPipe pipe (cmd);
tl::InputStream is (pipe);
text = is.read_all ();
}

7
src/rbastub/rba.cc
View File

@ -21,6 +21,7 @@
*/
#include "rba.h"
#include "tlExceptions.h"
namespace rba
{
@ -129,7 +130,11 @@ RubyInterpreter::available () const
int
RubyInterpreter::initialize (int &argc, char **argv, int (*main_cont)(int &, char **))
{
return (*main_cont) (argc, argv);
int res = 1;
BEGIN_PROTECTED
res = (*main_cont) (argc, argv);
END_PROTECTED
return res;
}
void

1
src/tl/tl/tlExpression.cc
View File

@ -31,6 +31,7 @@
#include <vector>
#include <sstream>
#include <iostream>
#include <algorithm>
#define _USE_MATH_DEFINES // for MSVC
#include <math.h>
#include <string.h>

4
src/tl/tl/tlFileUtils.cc
View File

@ -789,7 +789,7 @@ get_inst_path_internal ()
wchar_t buffer[MAX_PATH];
int len;
if ((len = GetModuleFileName (NULL, buffer, MAX_PATH)) > 0) {
if ((len = GetModuleFileNameW (NULL, buffer, MAX_PATH)) > 0) {
return tl::absolute_path (tl::to_string (std::wstring (buffer)));
}
@ -833,7 +833,7 @@ get_module_path (void *addr)
wchar_t buffer[MAX_PATH];
int len;
if ((len = GetModuleFileName(h_module, buffer, MAX_PATH)) > 0) {
if ((len = GetModuleFileNameW (h_module, buffer, MAX_PATH)) > 0) {
return tl::absolute_file_path (tl::to_string (std::wstring (buffer, 0, len)));
}

8
src/tl/tl/tlObject.cc
View File

@ -38,6 +38,12 @@ Object::Object ()
}
Object::~Object ()
{
reset ();
}
void
Object::reset ()
{
WeakOrSharedPtr *ptrs;
@ -45,7 +51,7 @@ Object::~Object ()
// But this will easily create deadlocks and the
// destructor should not be called while other threads
// are accessing this object anyway.
while ((ptrs = (WeakOrSharedPtr *)(size_t (mp_ptrs) & ~size_t (1))) != 0) {
while ((ptrs = reinterpret_cast<WeakOrSharedPtr *> (size_t (mp_ptrs) & ~size_t (1))) != 0) {
ptrs->reset_object ();
}
}

6
src/tl/tl/tlObject.h
View File

@ -121,6 +121,12 @@ protected:
*/
void detach_from_all_events ();
/**
* @brief Resets all references to this object
* This method will release all references within weak and shared pointers.
*/
void reset ();
private:
friend class WeakOrSharedPtr;

56
src/tl/tl/tlString.cc
View File

@ -141,6 +141,30 @@ std::string to_string (const std::wstring &ws)
return s;
}
// -------------------------------------------------------------------------
// safe versions (assertion-less) of safe_isdigit, safe_isprint, safe_isalpha, safe_isalnum
// (required for debug mode of MSVC)
inline bool safe_isdigit (char c)
{
return c != 0 && static_cast<unsigned char> (c) < 0x80 && isdigit (c);
}
inline bool safe_isalnum (char c)
{
return c != 0 && static_cast<unsigned char> (c) < 0x80 && isalnum (c);
}
inline bool safe_isalpha (char c)
{
return c != 0 && static_cast<unsigned char> (c) < 0x80 && isalpha (c);
}
inline bool safe_isprint (char c)
{
return c != 0 && static_cast<unsigned char> (c) < 0x80 && isprint (c);
}
// -------------------------------------------------------------------------
// Utility: a strtod version that is independent of the locale
@ -246,7 +270,7 @@ static double local_strtod (const char *cp, const char *&cp_new)
// Extract upper digits
int exponent = 0;
double mant = 0.0;
while (isdigit (*cp)) {
while (safe_isdigit (*cp)) {
mant = mant * 10.0 + double (*cp - '0');
++cp;
}
@ -254,7 +278,7 @@ static double local_strtod (const char *cp, const char *&cp_new)
// Extract lower digits
if (*cp == '.') {
++cp;
while (isdigit (*cp)) {
while (safe_isdigit (*cp)) {
mant = mant * 10.0 + double (*cp - '0');
++cp;
--exponent;
@ -272,7 +296,7 @@ static double local_strtod (const char *cp, const char *&cp_new)
++cp;
}
int en = 0;
while (isdigit (*cp)) {
while (safe_isdigit (*cp)) {
en = en * 10 + int (*cp - '0');
++cp;
}
@ -523,7 +547,7 @@ to_quoted_string (const std::string &s)
r += "\\r";
} else if (*c == '\t') {
r += "\\t";
} else if (! isprint (*c) || (unsigned char) *c >= 0x80) {
} else if (! safe_isprint (*c) || (unsigned char) *c >= 0x80) {
char b [20];
::sprintf (b, "\\%03o", int ((unsigned char) *c));
r += b;
@ -549,7 +573,7 @@ escape_string (const std::string &s)
r += "\\r";
} else if (*c == '\t') {
r += "\\t";
} else if (! isprint (*c)) {
} else if (! safe_isprint (*c)) {
char b [20];
::sprintf (b, "\\%03o", int ((unsigned char) *c));
r += b;
@ -562,9 +586,9 @@ escape_string (const std::string &s)
inline char unescape_char (const char * &cp)
{
if (isdigit (*cp)) {
if (safe_isdigit (*cp)) {
int c = 0;
while (*cp && isdigit (*cp)) {
while (*cp && safe_isdigit (*cp)) {
c = c * 8 + int (*cp - '0');
++cp;
}
@ -602,9 +626,9 @@ to_word_or_quoted_string (const std::string &s, const char *non_term)
// If the string does not contain non_term characters, we may simply keep it.
// Otherwise we need to quote it.
const char *cp = s.c_str ();
if (*cp && (isalpha (*cp) || strchr (non_term, *cp) != NULL)) {
if (*cp && (safe_isalpha (*cp) || strchr (non_term, *cp) != NULL)) {
++cp;
for ( ; *cp && (isalnum (*cp) || strchr (non_term, *cp) != NULL); ++cp) {
for ( ; *cp && (safe_isalnum (*cp) || strchr (non_term, *cp) != NULL); ++cp) {
;
}
}
@ -1052,12 +1076,12 @@ Extractor::try_read_signed_int (T &value)
++m_cp;
}
if (! isdigit (*m_cp)) {
if (! safe_isdigit (*m_cp)) {
return false;
}
value = 0;
while (isdigit (*m_cp)) {
while (safe_isdigit (*m_cp)) {
if (value > std::numeric_limits<T>::max () / 10) {
throw tl::Exception (overflow_msg_func<T> () ());
}
@ -1083,12 +1107,12 @@ Extractor::try_read_unsigned_int (T &value)
return false;
}
if (! isdigit (*m_cp)) {
if (! safe_isdigit (*m_cp)) {
return false;
}
value = 0;
while (isdigit (*m_cp)) {
while (safe_isdigit (*m_cp)) {
if (value > std::numeric_limits<T>::max () / 10) {
throw tl::Exception (overflow_msg_func<T> () ());
}
@ -1178,7 +1202,7 @@ Extractor::try_read_word (std::string &string, const char *non_term)
}
string.clear ();
while (*m_cp && (isalnum (*m_cp) || strchr (non_term, *m_cp) != NULL)) {
while (*m_cp && (safe_isalnum (*m_cp) || strchr (non_term, *m_cp) != NULL)) {
string += *m_cp;
++m_cp;
}
@ -1660,7 +1684,7 @@ sprintf (const char *f, const std::vector <tl::Variant> &vv, unsigned int a0)
}
unsigned int width = 0;
while (isdigit (*cp) && *cp) {
while (safe_isdigit (*cp) && *cp) {
width = (width * 10) + (unsigned int)(*cp - '0');
++cp;
}
@ -1669,7 +1693,7 @@ sprintf (const char *f, const std::vector <tl::Variant> &vv, unsigned int a0)
if (*cp == '.') {
++cp;
unsigned int prec = 0;
while (isdigit (*cp) && *cp) {
while (safe_isdigit (*cp) && *cp) {
prec = (prec * 10) + (unsigned int)(*cp - '0');
++cp;
}

6
src/tl/tl/tlTimer.cc
View File

@ -67,9 +67,9 @@ static int64_t ms_time ()
FILETIME ft;
GetSystemTimeAsFileTime (&ft);
// device by 8192 -> should fit into a 64bit type
uint64_t t = (uint64_t (ft.dwHighDateTime) << (64 - 13)) | (uint64_t (ft.dwLowDateTime) >> 13);
return int64_t (0.5 + t / 0.8192);
uint64_t t = (uint64_t (ft.dwHighDateTime) << (sizeof (ft.dwHighDateTime) * 8)) | uint64_t (ft.dwLowDateTime);
// FILETIME uses 100ns resolution, hence divide by 10000 to get ms:
return int64_t (t / 10000);
#else

24
src/tl/tl/tlVector.h
View File

@ -25,6 +25,7 @@
#define HDR_tlVector
#include <vector>
#include "tlTypeTraits.h"
namespace tl
{
@ -39,6 +40,7 @@ namespace tl
* 2.) by use of a special allocator provide a garbage collection
* mechanism that may move and compact the blocks allocated by
* the vectors.
* 3.) Avoid memory fragmentation by using blocks with a maximum size
*/
template <class T>
@ -56,7 +58,7 @@ public:
/**
* @brief Copy constructor
*/
vector (const vector &d) : std::vector<T> (d) { }
explicit vector (const tl::vector<T> &d) : std::vector<T> (d) { }
/**
* @brief Initialization with value and length
@ -64,6 +66,26 @@ public:
vector (const T &v, int s) : std::vector<T> (v, s) { }
};
/**
* @brief The type traits for the vector type
*/
template <class C>
struct type_traits <tl::vector<C> > : public type_traits<void>
{
#if defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL != 0
// With iterator debugging on, the vector carries additional
// information which cannot be copied trivially
typedef complex_relocate_required relocate_requirements;
#else
typedef trivial_relocate_required relocate_requirements;
#endif
typedef true_tag has_efficient_swap;
typedef false_tag supports_extractor;
typedef false_tag supports_to_string;
typedef true_tag has_less_operator;
typedef true_tag has_equal_operator;
};
} // namespace tl
#endif