Commit Graph

344 Commits

Author SHA1 Message Date
minggo 966d47c251 fix crash if create and delete downloader quickly (#17010) 2016-12-14 14:44:36 +08:00
minggo 84a6ab312c use correct downloader implementation on mac (#16955) 2016-12-05 09:36:35 +08:00
Wilson E. Alvarez 3056269531 Various small performance tweaks (#16881)
* These variables can be accessed by reference

* Assign values in initialization list

* _range can also be in initialization list

* Prefixed ++ and added 'auto' to loops

Also removed extra whitespace

* Prefixed ++/--, and changed for-loop implementation to use 'auto' on some loops
2016-11-22 09:54:04 +08:00
pyrosphere 663bb4d7ed No CC_UNUSED_PARAM (#16812)
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro

* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM

* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.

* Fixed some errors and warnings caused by the previous commit.

* Commented remaining unused parameter names in .cpp files.

* Fixed unused parameter warnings in headers.

* Fixed some more unused parameter warnings.

* Fixed some more unused parameters warnings.

* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.

* Fixed build errors.

* Added missing file to CMakeLists
2016-11-16 09:48:37 +08:00
UQ Times 0d2e58b9da fix compile error if "USE_STD_UNORDERED_MAP == 0". (#16831) 2016-11-14 10:00:55 +08:00
James Chen 7e14812240 fixed #16492: RapidJSON Crashes in Release mode on Android. (#16792)
* fixed #16492: RapidJSON Crashes in Release mode on Android.

* Updates external/config.json

* json/filestream.h -> json/filereadstream.h
2016-11-04 09:36:59 +08:00
Wilson E. Alvarez c0e1e91373 Performance tweak: Use range-based for-loops and allocate std::vector size() and *end() on the stack where favorable. (#16716)
* Use range-based for-loops and allocate std::vector size(), end(), cend(), rend(), crend() on the stack where favorable.

Other minor trivial changes were applied.

* Fixed Android compilation error

* Fixed windows-universal compilation error
2016-10-27 15:10:24 +08:00
mogemimi 5b8919829c Fix typos in local variables (#16712) 2016-10-20 18:17:37 +08:00
mogemimi 1ed151be82 Fix indentation (#16699) 2016-10-14 17:48:23 +08:00
Wilson E. Alvarez cdee1e11de Performance tweak: use range-based for-loops instead of iterator-based for-loops. (#16642)
* Use ++ prefix instead for non-primitive data types in CCAutoPolygon.cpp

* Use ++ prefix instead for non-primitive data types in SimpleAudioEngine.cpp

* Use ++ prefix instead for non-primitive data types in CCNodeLoaderLibrary.cpp

* Use ++ prefix instead for non-primitive data types in CCActionManagerEx.cpp

* Use ++ prefix instead for non-primitive data types in CCDataReaderHelper.cpp

* Use ++ prefix instead for non-primitive data types in HttpClient-android.cpp

* Use ++ prefix instead for non-primitive data types in CCDevice-linux.cpp

* Use ++ prefix instead for non-primitive data types in ScriptingCore.cpp

* Switched implementation to range-based for loops

* Added readability, fixed loop in CCDataReaderHelper.cpp

Thanks to Dimon4eg for the code review.
2016-10-11 10:59:44 -07:00
mogemimi 59dea5a487 Removed unnecessary comments (#16649) 2016-10-07 11:47:48 -07:00
mogemimi 63b3043dc0 Remove extra semicolon after member function definition (#16595) 2016-09-20 14:43:48 +08:00
mogemimi eca7b2392d Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
Allen Lee 7c298bdcd7 misspelling check on cocos directory (#16522)
Misspelling fix on some comments,
cocos/editor-support/cocostudio/CSParseBinary_generated.h
fix misspelling postion -> position
2016-09-06 10:14:14 +08:00
Rubonnek 91efab2ba7 Fix memory leak caused by packetOut in SocketIO.cpp (#16451) 2016-08-29 19:22:38 -07:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
James Chen 020745ee2e Disables 'permessage-deflate' extension for WebSocket temporarily. (#16366)
Currently, we couldn't find out the exact reason.
libwebsockets official said it's probably an issue of user code since 'libwebsockets' passed AutoBahn stressed Test.
2016-08-15 13:59:01 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
mogemimi 15030ad4c3 Fix typos in log messages 2016-07-25 02:53:22 +09:00
minggo 4c2234fe20 get correct control code 2016-07-22 14:30:06 +08:00
minggo 26dd7b2698 remove curl link for Android 2016-07-21 11:56:56 +08:00
minggo 4e125d84a4 fix compiling and linking error with ndk r12b 2016-07-08 15:29:35 +08:00
mogemimi 2443e09d29 Fix typos and other mistakes in docs 2016-07-04 00:42:10 +09:00
zilongshanren 2d3785c03d fix tizen compile error 2016-06-21 19:50:00 +08:00
mogemimi a348cbda8b Move StringUtils functions from deprecated header file to ccUTF8.h (#15835)
* Move StringUtils functions outside of deprecated header

* Replace deprecated headers with 'base/ccUTF8.h'
2016-06-15 15:01:26 +08:00
mogemimi c647a95656 Fix C4267 and C4309 warnings when compiling for Windows 10 UWP 2016-05-29 14:43:28 +09:00
pandamicro ea6a6a8586 Reverse include path in network module and update web engine 2016-05-25 23:58:11 +08:00
pandamicro 8692ee176c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Conflicts:
	cocos/network/HttpAsynConnection-apple.m
	cocos/network/HttpClient-android.cpp
	cocos/network/HttpClient.cpp
	cocos/network/HttpCookie.h
	cocos/network/HttpRequest.h
	cocos/network/HttpResponse.h
	cocos/network/SocketIO.cpp
	cocos/network/WebSocket.h
2016-05-25 19:19:27 +08:00
minggo 4e92b82571 Merge pull request #15716 from cezheng/bug/ios_httpclient_ssl
correct assign to equal in cert trust expression
2016-05-25 18:44:01 +08:00
Ce Zheng e4bf6584db correct assign to equal in cert trust expression 2016-05-25 18:34:05 +09:00
James Chen 1db3c1644d dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE. 2016-05-25 13:54:13 +08:00
pandamicro a03c45ce62 Update network licenses and reformat 2016-05-18 14:29:54 +08:00
mogemimi 948f64631f Use const references whenever possible 2016-05-17 13:17:56 +09:00
mogemimi a1a8feed71 Add missing references to avoid unnecessary copies 2016-05-17 01:15:07 +09:00
mogemimi 16878a53b1 Suppress MSVC warning C4800 2016-05-13 11:44:17 +09:00
minggo 74af3b5232 merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
pandamicro 85812b4f5b Remove client_no_context_takeover extension in WebSocket (not working on Android/iOS/Mac) 2016-05-10 20:35:02 +08:00
minggo fd160a1611 remove Content-Type limitation 2016-05-10 18:15:57 +08:00
mogemimi 2df9afbe71 Fix typos in documentation and comments 2016-05-05 08:05:20 +09:00
pandamicro fcfaafa4a5 Fix SocketIO fail to connect issue on Android 2016-05-04 17:43:36 +08:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
mogemimi a3ad4cddf8 Fix warnings about signed/unsigned mismatch 2016-04-22 12:20:05 +09:00
minggo 949112fdc2 Merge pull request #14321 from pandemosth/socketIO_issue_14287
Fix SocketIO crash on reconnect
2016-04-21 14:28:21 +08:00
Ce Zheng 200c9fda59 fix HTTPAsyncConnection bad memory management
Removed a redundant release on certDataRef that caused crash on
NSURLConnectionLoader thread.
Fixed a memory leak of SecCertificateRef
This fixes #15464
2016-04-20 14:04:44 +09:00
Ce Zheng 7f1b02ab92 Merge branch 'fix/ios_downloader_crashes_with_storage_path_containing_spaces' into fix/several_network_bugs 2016-04-20 12:12:31 +09:00
minggo 776ee8ac5a Merge pull request #14843 from cezheng/fix/ios_downloader_crashes_with_storage_path_containing_spaces
fix iOS downloader crash when storage path contains spaces
2016-04-19 13:46:02 +08:00
minggo 03ad0f01c9 Merge pull request #15001 from mogemimi/refactor-httprequest
Refactor HttpRequest and HttpResponse
2016-04-19 11:23:59 +08:00
mogemimi d1871d1ca7 Refactor HttpRequest and HttpResponse 2016-04-19 02:58:42 +09:00
Xpol Wan dc0f7bf903 Fixes format warnings. 2016-04-18 17:52:58 +08:00
James Chen 6dff5fdc13 std::shared_ptr<bool> -> std::shared_ptr<std::atomic<bool>>
The reference count field in shared_ptr is threadsafe but the value field is not. So we need to wrap a std::atomic for preventing potential thread racing.
2016-04-07 15:06:19 +08:00