You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2015/12/02 21:52:14 UTC
[1/3] thrift git commit: THRIFT-3456 rounding issue in static assert
Client: D Patch: Nikolay Tolstokulakov
Repository: thrift
Updated Branches:
refs/heads/master 3aa617a48 -> dd89dce84
THRIFT-3456 rounding issue in static assert
Client: D
Patch: Nikolay Tolstokulakov
This closes #726
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/620e7a89
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/620e7a89
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/620e7a89
Branch: refs/heads/master
Commit: 620e7a893a32867b664de4d8b648c8f1811d9f6f
Parents: 3aa617a
Author: Nikolay Tolstokulakov <to...@laximo.ru>
Authored: Wed Dec 2 09:01:30 2015 +0600
Committer: Jens Geyer <je...@apache.org>
Committed: Wed Dec 2 21:41:58 2015 +0100
----------------------------------------------------------------------
lib/d/src/thrift/codegen/idlgen.d | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/620e7a89/lib/d/src/thrift/codegen/idlgen.d
----------------------------------------------------------------------
diff --git a/lib/d/src/thrift/codegen/idlgen.d b/lib/d/src/thrift/codegen/idlgen.d
index 1cb4c1f..9f88936 100644
--- a/lib/d/src/thrift/codegen/idlgen.d
+++ b/lib/d/src/thrift/codegen/idlgen.d
@@ -551,7 +551,7 @@ version (unittest) {
struct WithDefaults {
string a = "asdf";
- double b = 1.0e+20;
+ double b = 3.1415;
WithoutMeta c;
mixin TStructHelpers!([
@@ -641,13 +641,16 @@ version (unittest) {
}
`);
- static assert(structIdlString!WithDefaults ==
+import std.algorithm;
+ static assert(structIdlString!WithDefaults.startsWith(
`struct WithDefaults {
-1: string a = "asdf",
- -2: double b = 1.0e+20,
- 1: WithoutMeta c = {a: "foo", b: 3, },
+ -2: double b = 3.141`));
+
+ static assert(structIdlString!WithDefaults.endsWith(
+`1: WithoutMeta c = {a: "foo", b: 3, },
}
-`);
+`));
static assert(structIdlString!OneOfEach ==
`struct OneOfEach {
[3/3] thrift git commit: THRIFT-3468 Dart TSocketTransport onError
handler is too restrictive Client: Dart Patch: Mark Erickson
Posted by je...@apache.org.
THRIFT-3468 Dart TSocketTransport onError handler is too restrictive
Client: Dart
Patch: Mark Erickson
This closes #728
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/dd89dce8
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/dd89dce8
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/dd89dce8
Branch: refs/heads/master
Commit: dd89dce84b73ca671c8e0b3cf597f1888e2a75dc
Parents: bc3829e
Author: Mark Erickson <ma...@workiva.com>
Authored: Wed Dec 2 09:53:27 2015 -0600
Committer: Jens Geyer <je...@apache.org>
Committed: Wed Dec 2 21:50:11 2015 +0100
----------------------------------------------------------------------
.gitignore | 1 +
lib/dart/lib/src/transport/t_socket_transport.dart | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/dd89dce8/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 040c71e..bcbbd6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,6 +146,7 @@ erl_crash.dump
/lib/d/test/serialization_benchmark
/lib/d/test/transport_test
/lib/d/unittest/
+/lib/dart/coverage
/lib/dart/**/.packages
/lib/dart/**/packages
/lib/dart/**/.pub/
http://git-wip-us.apache.org/repos/asf/thrift/blob/dd89dce8/lib/dart/lib/src/transport/t_socket_transport.dart
----------------------------------------------------------------------
diff --git a/lib/dart/lib/src/transport/t_socket_transport.dart b/lib/dart/lib/src/transport/t_socket_transport.dart
index ad7e48e..d23e6ab 100644
--- a/lib/dart/lib/src/transport/t_socket_transport.dart
+++ b/lib/dart/lib/src/transport/t_socket_transport.dart
@@ -28,7 +28,7 @@ part of thrift;
///
/// Adapted from the JS WebSocket transport.
abstract class TSocketTransport extends TBufferedTransport {
- final Logger log = new Logger('thrift.TSocketTransport');
+ final Logger logger = new Logger('thrift.TSocketTransport');
final TSocket socket;
@@ -38,7 +38,7 @@ abstract class TSocketTransport extends TBufferedTransport {
throw new ArgumentError.notNull('socket');
}
- socket.onError.listen((String e) => log.warning(e));
+ socket.onError.listen((e) => logger.warning(e));
socket.onMessage.listen(handleIncomingMessage);
}
[2/3] thrift git commit: THRIFT-3462 Cocoa generates Incorrect
#import header names Client: Cocoa Patch: J. Riskin
Posted by je...@apache.org.
THRIFT-3462 Cocoa generates Incorrect #import header names
Client: Cocoa
Patch: J. Riskin
This closes #722
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/bc3829e8
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/bc3829e8
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/bc3829e8
Branch: refs/heads/master
Commit: bc3829e8fdc4a39b7ba45b9dbc8317ff22bea004
Parents: 620e7a8
Author: jriskin <ja...@goodinc.com>
Authored: Mon Nov 30 11:59:01 2015 -0800
Committer: Jens Geyer <je...@apache.org>
Committed: Wed Dec 2 21:46:34 2015 +0100
----------------------------------------------------------------------
compiler/cpp/src/generate/t_cocoa_generator.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/bc3829e8/compiler/cpp/src/generate/t_cocoa_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_cocoa_generator.cc b/compiler/cpp/src/generate/t_cocoa_generator.cc
index 61a24c0..8ea2400 100644
--- a/compiler/cpp/src/generate/t_cocoa_generator.cc
+++ b/compiler/cpp/src/generate/t_cocoa_generator.cc
@@ -345,7 +345,7 @@ string t_cocoa_generator::cocoa_thrift_imports() {
// Include other Thrift includes
const vector<t_program*>& other_includes = program_->get_includes();
for (size_t i = 0; i < other_includes.size(); ++i) {
- includes << "#import \"" << other_includes[i]->get_name() << ".h\"" << endl;
+ includes << "#import \"" << cocoa_prefix_ << capitalize(other_includes[i]->get_name()) << ".h\"" << endl;
}
includes << endl;