svn commit: r666486 - in /incubator/thrift/trunk: compiler/cpp/src/generate/t_erl_generator.cc lib/erl/Makefile test/py/TestServer.py

[dr...@apache.org]

Author: dreiss
Date: Tue Jun 10 18:16:29 2008
New Revision: 666486

URL: http://svn.apache.org/viewvc?rev=666486&view=rev
Log:
Clean up some bad/missed merges from the alterl merge.

Modified:
    incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc
    incubator/thrift/trunk/lib/erl/Makefile
    incubator/thrift/trunk/test/py/TestServer.py

Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc?rev=666486&r1=666485&r2=666486&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc (original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc Tue Jun 10 18:16:29 2008
@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <sstream>
 #include "t_erl_generator.h"
+#include "platform.h"
 
 using namespace std;
 
@@ -20,7 +21,7 @@
  */
 void t_erl_generator::init_generator() {
   // Make output directory
-  mkdir(get_out_dir().c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
+  MKDIR(get_out_dir().c_str());
 
   // setup export lines
   export_lines_first_ = true;
@@ -174,6 +175,7 @@
  * validate_types method in main.cc
  */
 string t_erl_generator::render_const_value(t_type* type, t_const_value* value) {
+  type = get_true_type(type);
   std::ostringstream out;
 
   if (type->is_base_type()) {
@@ -290,6 +292,8 @@
       out << render_const_value(etype, *v_iter);
     }
     out << "]";
+  } else {
+    throw "CANNOT GENERATE CONSTANT FOR TYPE: " + type->get_name();
   }
   return out.str();
 }

Modified: incubator/thrift/trunk/lib/erl/Makefile
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/Makefile?rev=666486&r1=666485&r2=666486&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/Makefile (original)
+++ incubator/thrift/trunk/lib/erl/Makefile Tue Jun 10 18:16:29 2008
@@ -8,3 +8,11 @@
 
 install: all
 	echo 'No install target, sorry.'
+
+check: all
+
+distclean: clean
+
+# Hack to make "make dist" work.
+# This should not work, but it appears to.
+distdir:

Modified: incubator/thrift/trunk/test/py/TestServer.py
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/py/TestServer.py?rev=666486&r1=666485&r2=666486&view=diff
==============================================================================
--- incubator/thrift/trunk/test/py/TestServer.py (original)
+++ incubator/thrift/trunk/test/py/TestServer.py Tue Jun 10 18:16:29 2008
@@ -59,11 +59,6 @@
     time.sleep(seconds)
     print 'done sleeping'
 
-  def testAsync(self, seconds):
-    print 'testAsync(%d) => sleeping...' % seconds
-    time.sleep(seconds)
-    print 'done sleeping'
-
 handler = TestHandler()
 processor = ThriftTest.Processor(handler)
 transport = TSocket.TServerSocket(9090)