lp:~fboranek/mariadb++/vs10

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:mariadb++

Sylvain Rochette: Pending requested 2015-11-23

Diff: 3718 lines (+1020/-1507)

46 files modified

CMakeLists.txt (+66/-0)
INSTALL.txt (+39/-0)
include/mariadb++/account.hpp (+107/-107)
include/mariadb++/concurrency.hpp (+71/-71)
include/mariadb++/connection.hpp (+20/-10)
include/mariadb++/data.hpp (+88/-88)
include/mariadb++/date_time.hpp (+1/-1)
include/mariadb++/decimal.hpp (+1/-1)
include/mariadb++/exceptions.hpp (+4/-12)
include/mariadb++/mariadb++.hpp (+17/-4)
include/mariadb++/result_set.hpp (+15/-5)
include/mariadb++/save_point.hpp (+1/-1)
include/mariadb++/statement.hpp (+6/-4)
include/mariadb++/time.hpp (+4/-2)
include/mariadb++/time_span.hpp (+1/-1)
include/mariadb++/transaction.hpp (+2/-2)
include/mariadb++/types.hpp (+2/-0)
makefile (+0/-59)
mariadb++.cbp (+0/-88)
mariadb++.depend (+0/-1)
mariadb++.layout (+0/-103)
src/account.cpp (+1/-196)
src/bind.cpp (+1/-1)
src/concurrency.cpp (+5/-2)
src/config.h.in (+14/-0)
src/connection.cpp (+37/-20)
src/date_time.cpp (+25/-25)
src/decimal.cpp (+81/-69)
src/exceptions.cpp (+3/-4)
src/private.cpp (+10/-4)
src/private.hpp (+39/-4)
src/result_set.cpp (+12/-11)
src/save_point.cpp (+5/-4)
src/statement.cpp (+7/-7)
src/time.cpp (+60/-59)
src/time_span.cpp (+244/-244)
src/transaction.cpp (+5/-4)
src/worker.cpp (+2/-2)
src/worker.hpp (+2/-2)
unittest/CMakeLists.txt (+14/-0)
unittest/main.cpp (+7/-7)
unittest/makefile (+0/-56)
unittest/test.hpp (+1/-1)
unittest/unittest.cbp (+0/-65)
unittest/unittest.depend (+0/-138)
unittest/unittest.layout (+0/-22)

api

Related source package recipes

2 recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9. By Frantisek Boranek on 2015-11-23

fixed issues across platforms

-------------ssues acros This line and the following will be ignored --------------

modified:
  include/mariadb++/connection.hpp
  include/mariadb++/data.hpp
  include/mariadb++/date_time.hpp
  include/mariadb++/decimal.hpp
  include/mariadb++/exceptions.hpp
  include/mariadb++/last_error.hpp
  include/mariadb++/mariadb++.hpp
  include/mariadb++/result_set.hpp
  include/mariadb++/save_point.hpp
  include/mariadb++/statement.hpp
  include/mariadb++/time.hpp
  include/mariadb++/time_span.hpp
  include/mariadb++/transaction.hpp
  include/mariadb++/types.hpp
  src/account.cpp
  src/bind.cpp
  src/bind.hpp
  src/concurrency.cpp
  src/config.h.in
  src/connection.cpp
  src/date_time.cpp
  src/decimal.cpp
  src/exceptions.cpp
  src/last_error.cpp
  src/private.cpp
  src/private.hpp
  src/result_set.cpp
  src/save_point.cpp
  src/statement.cpp
  src/time.cpp
  src/transaction.cpp
  src/worker.cpp
  src/worker.hpp
  unittest/CMakeLists.txt
  unittest/database.cpp
  unittest/date_time.cpp
  unittest/decimal.cpp
  unittest/main.cpp
  unittest/test.cpp
  unittest/test.hpp
unknown:
  .DS_Store
  include/mariadb++/query.hpp
  src/.DS_Store
  src/query.cpp
  unittest/.DS_Store

8. By Frantisek Boranek on 2015-01-17

 to build it on MAC OS X

7. By Frantisek Boranek on 2015-01-17

fixed build on MAC OS X 10.10

------------- This line and the following will be ignored --------------

modified:
  src/connection.cpp
  src/decimal.cpp
  src/private.hpp
unknown:
  .DS_Store
  INSTALL.txt
  include/.DS_Store

6. By Frantisek Boranek on 2015-01-16

- fixed hang in connection due not NULL paramet passed as local socket
- fixed memory leak in destruction of connection
- generating config file
- force to chose throwing exception during build
- fixed compilatin by VS2010

error C2065: '__PRETTY_FUNCTION__' : undeclared identifier src\statement.cpp 33
error C2872: 'time' : ambiguous symbol src\statement.cpp 163
error C4430: missing type specifier - int assumed. Note: C++ does not support default-int D:\Workspace\git.mailserver.8.5.X\connect\extLibs\mariadb++\src\statement.cpp 163 1
error C2143: syntax error : missing ',' before '&' src\statement.cpp 163
error C2511: 'void mariadb::statement::set_time(mariadb::u32,const int)' : overloaded member function not found in 'mariadb::statement' src\statement.cpp 164
error C3861: 'round': identifier not found src\decimal.cpp 25
error C2668: 'pow' : ambiguous call to overloaded function src\decimal.cpp 32
error C2466: cannot allocate an array of constant size 0 src\decimal.cpp 32
error C2065: '__func__' : undeclared identifier src\date_time.cpp 144

src\bind.cpp(49): warning C4800: 'const my_bool' : forcing value to bool 'true' or 'false' (performance warning)
src\connection.cpp(238): warning C4244: '+=' : conversion from 'my_ulonglong' to 'mariadb::u32', possible loss of data
src\connection.cpp(269): warning C4244: 'return' : conversion from 'my_ulonglong' to 'mariadb::u32', possible loss of data
src\date_time.cpp(65): warning C4996: 'localtime': This function or variable may be unsafe. Consider using localtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\date_time.cpp(633): warning C4996: 'localtime': This function or variable may be unsafe. Consider using localtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\date_time.cpp(647): warning C4996: 'gmtime': This function or variable may be unsafe. Consider using gmtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\date_time.cpp(673): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\date_time.cpp(675): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\date_time.cpp(684): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\date_time.cpp(493): warning C4244: 'initializing' : conversion from 'mariadb::s64' to 'mariadb::u32', possible loss of data
src\date_time.cpp(496): warning C4244: 'initializing' : conversion from 'mariadb::s64' to 'mariadb::u32', possible loss of data
src\date_time.cpp(499): warning C4244: 'initializing' : conversion from 'mariadb::s64' to 'mariadb::u32', possible loss of data
src\date_time.cpp(502): warning C4244: 'initializing' : conversion from 'mariadb::s64' to 'mariadb::u32', possible loss of data
src\date_time.cpp(586): warning C4244: 'argument' : conversion from 'mariadb::u16' to 'mariadb::u8', possible loss of data
src\date_time.cpp(658): warning C4244: 'initializing' : conversion from 'mariadb::u16' to 'mariadb::u8', possible loss of data
src\date_time.cpp(659): warning C4244: 'initializing' : conversion from 'mariadb::u16' to 'mariadb::u8', possible loss of data
src\decimal.cpp(173): warning C4244: 'argument' : conversion from 'mariadb::s64' to 'mariadb::u8', possible loss of data
src\result_set.cpp(264): warning C4800: 'mariadb::u64' : forcing value to bool 'true' or 'false' (performance warning)
src\result_set.cpp(272): warning C4244: 'return' : conversion from 'mariadb::u64' to 'mariadb::u8', possible loss of data
src\result_set.cpp(280): warning C4244: 'return' : conversion from 'mariadb::s64' to 'mariadb::s8', possible loss of data
src\result_set.cpp(288): warning C4244: 'return' : conversion from 'mariadb::u64' to 'mariadb::u16', possible loss of data
src\result_set.cpp(296): warning C4244: 'return' : conversion from 'mariadb::s64' to 'mariadb::s16', possible loss of data
src\result_set.cpp(304): warning C4244: 'return' : conversion from 'mariadb::u64' to 'mariadb::u32', possible loss of data
src\result_set.cpp(312): warning C4244: 'return' : conversion from 'mariadb::s64' to 'mariadb::s32', possible loss of data
src\save_point.cpp(33): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\save_point.cpp(35): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\save_point.cpp(49): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\save_point.cpp(64): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\statement.cpp(85): warning C4244: 'return' : conversion from 'my_ulonglong' to 'mariadb::s32', possible loss of data
src\statement.cpp(96): warning C4244: 'return' : conversion from 'my_ulonglong' to 'mariadb::u32', possible loss of data
src\statement.cpp(125): warning C4244: 'argument' : conversion from 'mariadb::u64' to 'unsigned long', possible loss of data
src\time.cpp(55): warning C4996: 'localtime': This function or variable may be unsafe. Consider using localtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\time.cpp(366): warning C4244: 'initializing' : conversion from 'mariadb::s64' to 'mariadb::u32', possible loss of data
src\time.cpp(369): warning C4244: 'initializing' : conversion from 'mariadb::s64' to 'mariadb::u32', possible loss of data
src\time.cpp(372): warning C4244: 'initializing' : conversion from 'mariadb::s64' to 'mariadb::u32', possible loss of data
src\time.cpp(375): warning C4244: 'argument' : conversion from 'mariadb::s64' to 'mariadb::u32', possible loss of data
src\time.cpp(419): warning C4996: 'localtime': This function or variable may be unsafe. Consider using localtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\time.cpp(427): warning C4996: 'gmtime': This function or variable may be unsafe. Consider using gmtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\time.cpp(438): warning C4244: 'initializing' : conversion from 'mariadb::u16' to 'mariadb::u8', possible loss of data
src\time.cpp(444): warning C4244: '=' : conversion from 'mariadb::u16' to 'mariadb::u8', possible loss of data
src\time.cpp(450): warning C4244: 'initializing' : conversion from 'double' to 'mariadb::u16', possible loss of data
src\time.cpp(460): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
src\time.cpp(462): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.

5. By Sylvain Rochette on 2013-03-19

C++11 support update by Fridrich Strba

4. By Sylvain Rochette on 2013-03-19

Removed comment

3. By Sylvain Rochette on 2013-03-19

Added possibility to remove C++11 support from std by using boost instead. See makefile for instruction
Removed all auto to the appropriate type

2. By Sylvain Rochette on 2013-03-10

Updated licenses info

1. By Sylvain Rochette on 2013-03-09

Initial import