You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2012/04/13 11:12:44 UTC
svn commit: r1325674 [2/4] - in /thrift/trunk: ./ compiler/cpp/
compiler/cpp/src/generate/ contrib/ contrib/async-test/ contrib/fb303/
contrib/fb303/cpp/ contrib/zeromq/ lib/c_glib/ lib/c_glib/src/
lib/c_glib/src/processor/ lib/c_glib/src/protocol/ lib...
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_buffered_transport.c (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_buffered_transport.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_buffered_transport.c?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_buffered_transport.c&p1=thrift/trunk/lib/c_glib/src/transport/thrift_buffered_transport.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/transport/thrift_buffered_transport.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/transport/thrift_buffered_transport.c Fri Apr 13 09:12:31 2012
@@ -24,9 +24,9 @@
#include <string.h>
#include <unistd.h>
-#include "thrift.h"
-#include "transport/thrift_transport.h"
-#include "transport/thrift_buffered_transport.h"
+#include <thrift/thrift.h>
+#include <thrift/transport/thrift_transport.h>
+#include <thrift/transport/thrift_buffered_transport.h>
/* object properties */
enum _ThriftBufferedTransportProperties
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_buffered_transport.h (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_buffered_transport.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_buffered_transport.h?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_buffered_transport.h&p1=thrift/trunk/lib/c_glib/src/transport/thrift_buffered_transport.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/transport/thrift_buffered_transport.h (original)
+++ thrift/trunk/lib/c_glib/src/thrift/transport/thrift_buffered_transport.h Fri Apr 13 09:12:31 2012
@@ -23,7 +23,7 @@
#include <glib.h>
#include <glib-object.h>
-#include "transport/thrift_transport.h"
+#include <thrift/transport/thrift_transport.h>
G_BEGIN_DECLS
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_framed_transport.c (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_framed_transport.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_framed_transport.c?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_framed_transport.c&p1=thrift/trunk/lib/c_glib/src/transport/thrift_framed_transport.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/transport/thrift_framed_transport.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/transport/thrift_framed_transport.c Fri Apr 13 09:12:31 2012
@@ -24,9 +24,9 @@
#include <string.h>
#include <unistd.h>
-#include "thrift.h"
-#include "transport/thrift_transport.h"
-#include "transport/thrift_framed_transport.h"
+#include <thrift/thrift.h>
+#include <thrift/transport/thrift_transport.h>
+#include <thrift/transport/thrift_framed_transport.h>
/* object properties */
enum _ThriftFramedTransportProperties
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_framed_transport.h (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_framed_transport.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_framed_transport.h?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_framed_transport.h&p1=thrift/trunk/lib/c_glib/src/transport/thrift_framed_transport.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/transport/thrift_framed_transport.h (original)
+++ thrift/trunk/lib/c_glib/src/thrift/transport/thrift_framed_transport.h Fri Apr 13 09:12:31 2012
@@ -23,7 +23,7 @@
#include <glib.h>
#include <glib-object.h>
-#include "transport/thrift_transport.h"
+#include <thrift/transport/thrift_transport.h>
G_BEGIN_DECLS
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_memory_buffer.c (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_memory_buffer.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_memory_buffer.c?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_memory_buffer.c&p1=thrift/trunk/lib/c_glib/src/transport/thrift_memory_buffer.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/transport/thrift_memory_buffer.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/transport/thrift_memory_buffer.c Fri Apr 13 09:12:31 2012
@@ -24,9 +24,9 @@
#include <string.h>
#include <unistd.h>
-#include "thrift.h"
-#include "transport/thrift_transport.h"
-#include "transport/thrift_memory_buffer.h"
+#include <thrift/thrift.h>
+#include <thrift/transport/thrift_transport.h>
+#include <thrift/transport/thrift_memory_buffer.h>
/* object properties */
enum _ThriftMemoryBufferProperties
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_memory_buffer.h (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_memory_buffer.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_memory_buffer.h?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_memory_buffer.h&p1=thrift/trunk/lib/c_glib/src/transport/thrift_memory_buffer.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/transport/thrift_memory_buffer.h (original)
+++ thrift/trunk/lib/c_glib/src/thrift/transport/thrift_memory_buffer.h Fri Apr 13 09:12:31 2012
@@ -23,7 +23,7 @@
#include <glib.h>
#include <glib-object.h>
-#include "transport/thrift_transport.h"
+#include <thrift/transport/thrift_transport.h>
G_BEGIN_DECLS
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_socket.c (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_server_socket.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_socket.c?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_socket.c&p1=thrift/trunk/lib/c_glib/src/transport/thrift_server_socket.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/transport/thrift_server_socket.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_socket.c Fri Apr 13 09:12:31 2012
@@ -23,11 +23,11 @@
#include <stdlib.h>
#include <unistd.h>
-#include "thrift.h"
-#include "transport/thrift_socket.h"
-#include "transport/thrift_transport.h"
-#include "transport/thrift_server_transport.h"
-#include "transport/thrift_server_socket.h"
+#include <thrift/thrift.h>
+#include <thrift/transport/thrift_socket.h>
+#include <thrift/transport/thrift_transport.h>
+#include <thrift/transport/thrift_server_transport.h>
+#include <thrift/transport/thrift_server_socket.h>
/* object properties */
enum _ThriftServerSocketProperties
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_socket.h (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_server_socket.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_socket.h?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_socket.h&p1=thrift/trunk/lib/c_glib/src/transport/thrift_server_socket.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
(empty)
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_transport.c (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_server_transport.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_transport.c?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_transport.c&p1=thrift/trunk/lib/c_glib/src/transport/thrift_server_transport.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/transport/thrift_server_transport.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_transport.c Fri Apr 13 09:12:31 2012
@@ -17,9 +17,9 @@
* under the License.
*/
-#include "thrift.h"
-#include "transport/thrift_transport.h"
-#include "transport/thrift_server_transport.h"
+#include <thrift/thrift.h>
+#include <thrift/transport/thrift_transport.h>
+#include <thrift/transport/thrift_server_transport.h>
G_DEFINE_ABSTRACT_TYPE(ThriftServerTransport, thrift_server_transport, G_TYPE_OBJECT)
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_transport.h (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_server_transport.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_transport.h?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_transport.h&p1=thrift/trunk/lib/c_glib/src/transport/thrift_server_transport.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
(empty)
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_socket.c (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_socket.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_socket.c?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_socket.c&p1=thrift/trunk/lib/c_glib/src/transport/thrift_socket.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/transport/thrift_socket.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/transport/thrift_socket.c Fri Apr 13 09:12:31 2012
@@ -23,9 +23,9 @@
#include <string.h>
#include <unistd.h>
-#include "thrift.h"
-#include "transport/thrift_transport.h"
-#include "transport/thrift_socket.h"
+#include <thrift/thrift.h>
+#include <thrift/transport/thrift_transport.h>
+#include <thrift/transport/thrift_socket.h>
/* object properties */
enum _ThriftSocketProperties
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_socket.h (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_socket.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_socket.h?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_socket.h&p1=thrift/trunk/lib/c_glib/src/transport/thrift_socket.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/transport/thrift_socket.h (original)
+++ thrift/trunk/lib/c_glib/src/thrift/transport/thrift_socket.h Fri Apr 13 09:12:31 2012
@@ -22,7 +22,7 @@
#include <glib-object.h>
-#include "transport/thrift_transport.h"
+#include <thrift/transport/thrift_transport.h>
G_BEGIN_DECLS
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport.c (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_transport.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport.c?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport.c&p1=thrift/trunk/lib/c_glib/src/transport/thrift_transport.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/transport/thrift_transport.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport.c Fri Apr 13 09:12:31 2012
@@ -17,8 +17,8 @@
* under the License.
*/
-#include "thrift.h"
-#include "transport/thrift_transport.h"
+#include <thrift/thrift.h>
+#include <thrift/transport/thrift_transport.h>
/* define the GError domain string */
#define THRIFT_TRANSPORT_ERROR_DOMAIN "thrift-transport-error-quark"
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport.h (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_transport.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport.h?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport.h&p1=thrift/trunk/lib/c_glib/src/transport/thrift_transport.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
(empty)
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport_factory.c (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_transport_factory.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport_factory.c?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport_factory.c&p1=thrift/trunk/lib/c_glib/src/transport/thrift_transport_factory.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/transport/thrift_transport_factory.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport_factory.c Fri Apr 13 09:12:31 2012
@@ -17,8 +17,8 @@
* under the License.
*/
-#include "thrift.h"
-#include "transport/thrift_transport_factory.h"
+#include <thrift/thrift.h>
+#include <thrift/transport/thrift_transport_factory.h>
G_DEFINE_TYPE(ThriftTransportFactory, thrift_transport_factory, G_TYPE_OBJECT)
Copied: thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport_factory.h (from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_transport_factory.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport_factory.h?p2=thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport_factory.h&p1=thrift/trunk/lib/c_glib/src/transport/thrift_transport_factory.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
(empty)
Modified: thrift/trunk/lib/c_glib/test/testbinaryprotocol.c
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/test/testbinaryprotocol.c?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/test/testbinaryprotocol.c (original)
+++ thrift/trunk/lib/c_glib/test/testbinaryprotocol.c Fri Apr 13 09:12:31 2012
@@ -24,9 +24,9 @@
#include <netdb.h>
#include <string.h>
-#include "protocol/thrift_protocol.h"
-#include "transport/thrift_socket.h"
-#include "transport/thrift_server_socket.h"
+#include <thrift/protocol/thrift_protocol.h>
+#include <thrift/transport/thrift_socket.h>
+#include <thrift/transport/thrift_server_socket.h>
#define TEST_BOOL TRUE
#define TEST_BYTE 123
Modified: thrift/trunk/lib/c_glib/test/testbufferedtransport.c
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/test/testbufferedtransport.c?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/test/testbufferedtransport.c (original)
+++ thrift/trunk/lib/c_glib/test/testbufferedtransport.c Fri Apr 13 09:12:31 2012
@@ -20,10 +20,10 @@
#include <assert.h>
#include <netdb.h>
-#include "transport/thrift_transport.h"
-#include "transport/thrift_socket.h"
-#include "transport/thrift_server_transport.h"
-#include "transport/thrift_server_socket.h"
+#include <thrift/transport/thrift_transport.h>
+#include <thrift/transport/thrift_socket.h>
+#include <thrift/transport/thrift_server_transport.h>
+#include <thrift/transport/thrift_server_socket.h>
#define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
Modified: thrift/trunk/lib/c_glib/test/testframedtransport.c
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/test/testframedtransport.c?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/test/testframedtransport.c (original)
+++ thrift/trunk/lib/c_glib/test/testframedtransport.c Fri Apr 13 09:12:31 2012
@@ -20,10 +20,10 @@
#include <assert.h>
#include <netdb.h>
-#include "transport/thrift_transport.h"
-#include "transport/thrift_socket.h"
-#include "transport/thrift_server_transport.h"
-#include "transport/thrift_server_socket.h"
+#include <thrift/transport/thrift_transport.h>
+#include <thrift/transport/thrift_socket.h>
+#include <thrift/transport/thrift_server_transport.h>
+#include <thrift/transport/thrift_server_socket.h>
#define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
Modified: thrift/trunk/lib/c_glib/test/testmemorybuffer.c
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/test/testmemorybuffer.c?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/test/testmemorybuffer.c (original)
+++ thrift/trunk/lib/c_glib/test/testmemorybuffer.c Fri Apr 13 09:12:31 2012
@@ -20,10 +20,10 @@
#include <assert.h>
#include <netdb.h>
-#include "transport/thrift_transport.h"
-#include "transport/thrift_socket.h"
-#include "transport/thrift_server_transport.h"
-#include "transport/thrift_server_socket.h"
+#include <thrift/transport/thrift_transport.h>
+#include <thrift/transport/thrift_socket.h>
+#include <thrift/transport/thrift_server_transport.h>
+#include <thrift/transport/thrift_server_socket.h>
#define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
Modified: thrift/trunk/lib/c_glib/test/testoptionalrequired.c
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/test/testoptionalrequired.c?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/test/testoptionalrequired.c (original)
+++ thrift/trunk/lib/c_glib/test/testoptionalrequired.c Fri Apr 13 09:12:31 2012
@@ -21,9 +21,9 @@
#include <glib.h>
#include "thrift_struct.h"
-#include "protocol/thrift_protocol.h"
-#include "protocol/thrift_binary_protocol.h"
-#include "transport/thrift_memory_buffer.h"
+#include <thrift/protocol/thrift_protocol.h>
+#include <thrift/protocol/thrift_binary_protocol.h>
+#include <thrift/transport/thrift_memory_buffer.h>
#include "gen-c_glib/t_test_optional_required_test_types.h"
#include "gen-c_glib/t_test_optional_required_test_types.c"
Modified: thrift/trunk/lib/c_glib/test/testsimpleserver.c
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/test/testsimpleserver.c?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/test/testsimpleserver.c (original)
+++ thrift/trunk/lib/c_glib/test/testsimpleserver.c Fri Apr 13 09:12:31 2012
@@ -24,13 +24,13 @@
#include <sys/types.h>
#include <sys/wait.h>
-#include "thrift.h"
-#include "processor/thrift_processor.h"
-#include "transport/thrift_server_socket.h"
+#include <thrift/thrift.h>
+#include <thrift/processor/thrift_processor.h>
+#include <thrift/transport/thrift_server_socket.h>
#define TEST_PORT 51199
-#include "server/thrift_simple_server.c"
+#include <thrift/server/thrift_simple_server.c>
/* create a rudimentary processor */
#define TEST_PROCESSOR_TYPE (test_processor_get_type ())
Modified: thrift/trunk/lib/c_glib/test/testthrifttest.c
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/test/testthrifttest.c?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/test/testthrifttest.c (original)
+++ thrift/trunk/lib/c_glib/test/testthrifttest.c Fri Apr 13 09:12:31 2012
@@ -1,8 +1,8 @@
#include <assert.h>
#include <netdb.h>
-#include "transport/thrift_server_transport.h"
-#include "transport/thrift_server_socket.h"
+#include <thrift/transport/thrift_server_transport.h>
+#include <thrift/transport/thrift_server_socket.h>
static const char TEST_ADDRESS[] = "localhost";
static const int TEST_PORT = 64444;
Modified: thrift/trunk/lib/c_glib/test/testthrifttestclient.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/test/testthrifttestclient.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/test/testthrifttestclient.cpp (original)
+++ thrift/trunk/lib/c_glib/test/testthrifttestclient.cpp Fri Apr 13 09:12:31 2012
@@ -22,10 +22,10 @@
#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <protocol/TBinaryProtocol.h>
-#include <protocol/TDebugProtocol.h>
-#include <server/TSimpleServer.h>
-#include <transport/TServerSocket.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/protocol/TDebugProtocol.h>
+#include <thrift/server/TSimpleServer.h>
+#include <thrift/transport/TServerSocket.h>
#include "ThriftTest.h"
#include "ThriftTest_types.h"
@@ -314,9 +314,9 @@ extern "C" {
#include "t_test_thrift_test.h"
#include "t_test_thrift_test_types.h"
-#include "transport/thrift_socket.h"
-#include "protocol/thrift_protocol.h"
-#include "protocol/thrift_binary_protocol.h"
+#include <thrift/transport/thrift_socket.h>
+#include <thrift/protocol/thrift_protocol.h>
+#include <thrift/protocol/thrift_binary_protocol.h>
static void
test_thrift_client (void)
Modified: thrift/trunk/lib/c_glib/test/testtransportsocket.c
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/test/testtransportsocket.c?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/test/testtransportsocket.c (original)
+++ thrift/trunk/lib/c_glib/test/testtransportsocket.c Fri Apr 13 09:12:31 2012
@@ -20,9 +20,9 @@
#include <assert.h>
#include <netdb.h>
-#include "transport/thrift_transport.h"
-#include "transport/thrift_server_transport.h"
-#include "transport/thrift_server_socket.h"
+#include <thrift/transport/thrift_transport.h>
+#include <thrift/transport/thrift_server_transport.h>
+#include <thrift/transport/thrift_server_socket.h>
#define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
Modified: thrift/trunk/lib/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/Makefile.am?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/Makefile.am (original)
+++ thrift/trunk/lib/cpp/Makefile.am Fri Apr 13 09:12:31 2012
@@ -48,63 +48,63 @@ pkgconfig_DATA += thrift-qt.pc
endif
AM_CXXFLAGS = -Wall
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(srcdir)/src
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(srcdir)/src -I$(srcdir)/src/thrift
AM_LDFLAGS = $(BOOST_LDFLAGS)
# Define the source files for the module
-libthrift_la_SOURCES = src/Thrift.cpp \
- src/TApplicationException.cpp \
- src/VirtualProfiling.cpp \
- src/concurrency/ThreadManager.cpp \
- src/concurrency/TimerManager.cpp \
- src/concurrency/Util.cpp \
- src/protocol/TDebugProtocol.cpp \
- src/protocol/TDenseProtocol.cpp \
- src/protocol/TJSONProtocol.cpp \
- src/protocol/TBase64Utils.cpp \
- src/transport/TTransportException.cpp \
- src/transport/TFDTransport.cpp \
- src/transport/TFileTransport.cpp \
- src/transport/TSimpleFileTransport.cpp \
- src/transport/THttpTransport.cpp \
- src/transport/THttpClient.cpp \
- src/transport/THttpServer.cpp \
- src/transport/TSocket.cpp \
- src/transport/TSSLSocket.cpp \
- src/transport/TSocketPool.cpp \
- src/transport/TServerSocket.cpp \
- src/transport/TSSLServerSocket.cpp \
- src/transport/TTransportUtils.cpp \
- src/transport/TBufferTransports.cpp \
- src/server/TServer.cpp \
- src/server/TSimpleServer.cpp \
- src/server/TThreadPoolServer.cpp \
- src/server/TThreadedServer.cpp \
- src/async/TAsyncChannel.cpp \
- src/processor/PeekProcessor.cpp
+libthrift_la_SOURCES = src/thrift/Thrift.cpp \
+ src/thrift/TApplicationException.cpp \
+ src/thrift/VirtualProfiling.cpp \
+ src/thrift/concurrency/ThreadManager.cpp \
+ src/thrift/concurrency/TimerManager.cpp \
+ src/thrift/concurrency/Util.cpp \
+ src/thrift/protocol/TDebugProtocol.cpp \
+ src/thrift/protocol/TDenseProtocol.cpp \
+ src/thrift/protocol/TJSONProtocol.cpp \
+ src/thrift/protocol/TBase64Utils.cpp \
+ src/thrift/transport/TTransportException.cpp \
+ src/thrift/transport/TFDTransport.cpp \
+ src/thrift/transport/TFileTransport.cpp \
+ src/thrift/transport/TSimpleFileTransport.cpp \
+ src/thrift/transport/THttpTransport.cpp \
+ src/thrift/transport/THttpClient.cpp \
+ src/thrift/transport/THttpServer.cpp \
+ src/thrift/transport/TSocket.cpp \
+ src/thrift/transport/TSSLSocket.cpp \
+ src/thrift/transport/TSocketPool.cpp \
+ src/thrift/transport/TServerSocket.cpp \
+ src/thrift/transport/TSSLServerSocket.cpp \
+ src/thrift/transport/TTransportUtils.cpp \
+ src/thrift/transport/TBufferTransports.cpp \
+ src/thrift/server/TServer.cpp \
+ src/thrift/server/TSimpleServer.cpp \
+ src/thrift/server/TThreadPoolServer.cpp \
+ src/thrift/server/TThreadedServer.cpp \
+ src/thrift/async/TAsyncChannel.cpp \
+ src/thrift/processor/PeekProcessor.cpp
if WITH_BOOSTTHREADS
-libthrift_la_SOURCES += src/concurrency/BoostThreadFactory.cpp \
- src/concurrency/BoostMonitor.cpp \
- src/concurrency/BoostMutex.cpp
+libthrift_la_SOURCES += src/thrift/concurrency/BoostThreadFactory.cpp \
+ src/thrift/concurrency/BoostMonitor.cpp \
+ src/thrift/concurrency/BoostMutex.cpp
else
-libthrift_la_SOURCES += src/concurrency/Mutex.cpp \
- src/concurrency/Monitor.cpp \
- src/concurrency/PosixThreadFactory.cpp
+libthrift_la_SOURCES += src/thrift/concurrency/Mutex.cpp \
+ src/thrift/concurrency/Monitor.cpp \
+ src/thrift/concurrency/PosixThreadFactory.cpp
endif
-libthriftnb_la_SOURCES = src/server/TNonblockingServer.cpp \
- src/async/TAsyncProtocolProcessor.cpp \
- src/async/TEvhttpServer.cpp \
- src/async/TEvhttpClientChannel.cpp
+libthriftnb_la_SOURCES = src/thrift/server/TNonblockingServer.cpp \
+ src/thrift/async/TAsyncProtocolProcessor.cpp \
+ src/thrift/async/TEvhttpServer.cpp \
+ src/thrift/async/TEvhttpClientChannel.cpp
-libthriftz_la_SOURCES = src/transport/TZlibTransport.cpp
+libthriftz_la_SOURCES = src/thrift/transport/TZlibTransport.cpp
libthriftqt_la_MOC = src/qt/moc_TQTcpServer.cpp
libthriftqt_la_SOURCES = $(libthriftqt_la_MOC) \
- src/qt/TQIODeviceTransport.cpp \
- src/qt/TQTcpServer.cpp
+ src/thrift/qt/TQIODeviceTransport.cpp \
+ src/thrift/qt/TQTcpServer.cpp
CLEANFILES = $(libthriftqt_la_MOC)
# Flags for the various libraries
@@ -121,100 +121,100 @@ libthriftqt_la_LDFLAGS = -release $(VE
include_thriftdir = $(includedir)/thrift
include_thrift_HEADERS = \
$(top_builddir)/config.h \
- src/TDispatchProcessor.h \
- src/Thrift.h \
- src/TReflectionLocal.h \
- src/TProcessor.h \
- src/TApplicationException.h \
- src/TLogging.h
+ src/thrift/TDispatchProcessor.h \
+ src/thrift/Thrift.h \
+ src/thrift/TReflectionLocal.h \
+ src/thrift/TProcessor.h \
+ src/thrift/TApplicationException.h \
+ src/thrift/TLogging.h
include_concurrencydir = $(include_thriftdir)/concurrency
include_concurrency_HEADERS = \
- src/concurrency/BoostThreadFactory.h \
- src/concurrency/Exception.h \
- src/concurrency/Mutex.h \
- src/concurrency/Monitor.h \
- src/concurrency/PlatformThreadFactory.h \
- src/concurrency/PosixThreadFactory.h \
- src/concurrency/Thread.h \
- src/concurrency/ThreadManager.h \
- src/concurrency/TimerManager.h \
- src/concurrency/FunctionRunner.h \
- src/concurrency/Util.h
+ src/thrift/concurrency/BoostThreadFactory.h \
+ src/thrift/concurrency/Exception.h \
+ src/thrift/concurrency/Mutex.h \
+ src/thrift/concurrency/Monitor.h \
+ src/thrift/concurrency/PlatformThreadFactory.h \
+ src/thrift/concurrency/PosixThreadFactory.h \
+ src/thrift/concurrency/Thread.h \
+ src/thrift/concurrency/ThreadManager.h \
+ src/thrift/concurrency/TimerManager.h \
+ src/thrift/concurrency/FunctionRunner.h \
+ src/thrift/concurrency/Util.h
include_protocoldir = $(include_thriftdir)/protocol
include_protocol_HEADERS = \
- src/protocol/TBinaryProtocol.h \
- src/protocol/TBinaryProtocol.tcc \
- src/protocol/TCompactProtocol.h \
- src/protocol/TCompactProtocol.tcc \
- src/protocol/TDenseProtocol.h \
- src/protocol/TDebugProtocol.h \
- src/protocol/TBase64Utils.h \
- src/protocol/TJSONProtocol.h \
- src/protocol/TProtocolTap.h \
- src/protocol/TProtocolException.h \
- src/protocol/TVirtualProtocol.h \
- src/protocol/TProtocol.h
+ src/thrift/protocol/TBinaryProtocol.h \
+ src/thrift/protocol/TBinaryProtocol.tcc \
+ src/thrift/protocol/TCompactProtocol.h \
+ src/thrift/protocol/TCompactProtocol.tcc \
+ src/thrift/protocol/TDenseProtocol.h \
+ src/thrift/protocol/TDebugProtocol.h \
+ src/thrift/protocol/TBase64Utils.h \
+ src/thrift/protocol/TJSONProtocol.h \
+ src/thrift/protocol/TProtocolTap.h \
+ src/thrift/protocol/TProtocolException.h \
+ src/thrift/protocol/TVirtualProtocol.h \
+ src/thrift/protocol/TProtocol.h
include_transportdir = $(include_thriftdir)/transport
include_transport_HEADERS = \
- src/transport/TFDTransport.h \
- src/transport/TFileTransport.h \
- src/transport/TSimpleFileTransport.h \
- src/transport/TServerSocket.h \
- src/transport/TSSLServerSocket.h \
- src/transport/TServerTransport.h \
- src/transport/THttpTransport.h \
- src/transport/THttpClient.h \
- src/transport/THttpServer.h \
- src/transport/TSocket.h \
- src/transport/TSSLSocket.h \
- src/transport/TSocketPool.h \
- src/transport/TVirtualTransport.h \
- src/transport/TTransport.h \
- src/transport/TTransportException.h \
- src/transport/TTransportUtils.h \
- src/transport/TBufferTransports.h \
- src/transport/TShortReadTransport.h \
- src/transport/TZlibTransport.h
+ src/thrift/transport/TFDTransport.h \
+ src/thrift/transport/TFileTransport.h \
+ src/thrift/transport/TSimpleFileTransport.h \
+ src/thrift/transport/TServerSocket.h \
+ src/thrift/transport/TSSLServerSocket.h \
+ src/thrift/transport/TServerTransport.h \
+ src/thrift/transport/THttpTransport.h \
+ src/thrift/transport/THttpClient.h \
+ src/thrift/transport/THttpServer.h \
+ src/thrift/transport/TSocket.h \
+ src/thrift/transport/TSSLSocket.h \
+ src/thrift/transport/TSocketPool.h \
+ src/thrift/transport/TVirtualTransport.h \
+ src/thrift/transport/TTransport.h \
+ src/thrift/transport/TTransportException.h \
+ src/thrift/transport/TTransportUtils.h \
+ src/thrift/transport/TBufferTransports.h \
+ src/thrift/transport/TShortReadTransport.h \
+ src/thrift/transport/TZlibTransport.h
include_serverdir = $(include_thriftdir)/server
include_server_HEADERS = \
- src/server/TServer.h \
- src/server/TSimpleServer.h \
- src/server/TThreadPoolServer.h \
- src/server/TThreadedServer.h \
- src/server/TNonblockingServer.h
+ src/thrift/server/TServer.h \
+ src/thrift/server/TSimpleServer.h \
+ src/thrift/server/TThreadPoolServer.h \
+ src/thrift/server/TThreadedServer.h \
+ src/thrift/server/TNonblockingServer.h
include_processordir = $(include_thriftdir)/processor
include_processor_HEADERS = \
- src/processor/PeekProcessor.h \
- src/processor/StatsProcessor.h
+ src/thrift/processor/PeekProcessor.h \
+ src/thrift/processor/StatsProcessor.h
include_asyncdir = $(include_thriftdir)/async
include_async_HEADERS = \
- src/async/TAsyncChannel.h \
- src/async/TAsyncDispatchProcessor.h \
- src/async/TAsyncProcessor.h \
- src/async/TAsyncBufferProcessor.h \
- src/async/TAsyncProtocolProcessor.h \
- src/async/TEvhttpClientChannel.h \
- src/async/TEvhttpServer.h
+ src/thrift/async/TAsyncChannel.h \
+ src/thrift/async/TAsyncDispatchProcessor.h \
+ src/thrift/async/TAsyncProcessor.h \
+ src/thrift/async/TAsyncBufferProcessor.h \
+ src/thrift/async/TAsyncProtocolProcessor.h \
+ src/thrift/async/TEvhttpClientChannel.h \
+ src/thrift/async/TEvhttpServer.h
include_qtdir = $(include_thriftdir)/qt
include_qt_HEADERS = \
- src/qt/TQIODeviceTransport.h \
- src/qt/TQTcpServer.h
+ src/thrift/qt/TQIODeviceTransport.h \
+ src/thrift/qt/TQTcpServer.h
noinst_PROGRAMS = concurrency_test
concurrency_test_SOURCES = \
- src/concurrency/test/Tests.cpp \
- src/concurrency/test/ThreadFactoryTests.h \
- src/concurrency/test/ThreadManagerTests.h \
- src/concurrency/test/TimerManagerTests.h
+ src/thrift/concurrency/test/Tests.cpp \
+ src/thrift/concurrency/test/ThreadFactoryTests.h \
+ src/thrift/concurrency/test/ThreadManagerTests.h \
+ src/thrift/concurrency/test/TimerManagerTests.h
concurrency_test_LDADD = libthrift.la
Modified: thrift/trunk/lib/cpp/libthrift.vcxproj
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/libthrift.vcxproj?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/libthrift.vcxproj (original)
+++ thrift/trunk/lib/cpp/libthrift.vcxproj Fri Apr 13 09:12:31 2012
@@ -19,192 +19,192 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\async\TAsyncChannel.cpp">
+ <ClCompile Include="src\thrift\thrift\async\TAsyncChannel.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\concurrency\BoostMonitor.cpp" />
- <ClCompile Include="src\concurrency\BoostMutex.cpp" />
- <ClCompile Include="src\concurrency\BoostThreadFactory.cpp" />
- <ClCompile Include="src\concurrency\ThreadManager.cpp">
+ <ClCompile Include="src\thrift\thrift\concurrency\BoostMonitor.cpp" />
+ <ClCompile Include="src\thrift\thrift\concurrency\BoostMutex.cpp" />
+ <ClCompile Include="src\thrift\thrift\concurrency\BoostThreadFactory.cpp" />
+ <ClCompile Include="src\thrift\thrift\concurrency\ThreadManager.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\concurrency\TimerManager.cpp">
+ <ClCompile Include="src\thrift\thrift\concurrency\TimerManager.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\concurrency\Util.cpp">
+ <ClCompile Include="src\thrift\thrift\concurrency\Util.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\processor\PeekProcessor.cpp">
+ <ClCompile Include="src\thrift\thrift\processor\PeekProcessor.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\protocol\TBase64Utils.cpp" />
- <ClCompile Include="src\protocol\TDebugProtocol.cpp">
+ <ClCompile Include="src\thrift\thrift\protocol\TBase64Utils.cpp" />
+ <ClCompile Include="src\thrift\thrift\protocol\TDebugProtocol.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\protocol\TDenseProtocol.cpp">
+ <ClCompile Include="src\thrift\thrift\protocol\TDenseProtocol.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\protocol\TJSONProtocol.cpp">
+ <ClCompile Include="src\thrift\thrift\protocol\TJSONProtocol.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\server\TSimpleServer.cpp">
+ <ClCompile Include="src\thrift\thrift\server\TSimpleServer.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\server\TThreadPoolServer.cpp">
+ <ClCompile Include="src\thrift\thrift\server\TThreadPoolServer.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\TApplicationException.cpp">
+ <ClCompile Include="src\thrift\thrift\TApplicationException.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\Thrift.cpp">
+ <ClCompile Include="src\thrift\thrift\Thrift.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\transport\TBufferTransports.cpp">
+ <ClCompile Include="src\thrift\thrift\transport\TBufferTransports.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\transport\TFDTransport.cpp" />
- <ClCompile Include="src\transport\TFileTransport.cpp">
+ <ClCompile Include="src\thrift\thrift\transport\TFDTransport.cpp" />
+ <ClCompile Include="src\thrift\thrift\transport\TFileTransport.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="src\transport\THttpClient.cpp" />
- <ClCompile Include="src\transport\THttpServer.cpp" />
- <ClCompile Include="src\transport\THttpTransport.cpp">
+ <ClCompile Include="src\thrift\thrift\transport\THttpClient.cpp" />
+ <ClCompile Include="src\thrift\thrift\transport\THttpServer.cpp" />
+ <ClCompile Include="src\thrift\thrift\transport\THttpTransport.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\transport\TPipe.cpp" />
- <ClCompile Include="src\transport\TPipeServer.cpp" />
- <ClCompile Include="src\transport\TServerSocket.cpp">
+ <ClCompile Include="src\thrift\thrift\transport\TPipe.cpp" />
+ <ClCompile Include="src\thrift\thrift\transport\TPipeServer.cpp" />
+ <ClCompile Include="src\thrift\thrift\transport\TServerSocket.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\transport\TSimpleFileTransport.cpp" />
- <ClCompile Include="src\transport\TSocket.cpp">
+ <ClCompile Include="src\thrift\thrift\transport\TSimpleFileTransport.cpp" />
+ <ClCompile Include="src\thrift\thrift\transport\TSocket.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\transport\TSSLSocket.cpp">
+ <ClCompile Include="src\thrift\thrift\transport\TSSLSocket.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="src\transport\TTransportException.cpp">
+ <ClCompile Include="src\thrift\thrift\transport\TTransportException.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\transport\TTransportUtils.cpp">
+ <ClCompile Include="src\thrift\thrift\transport\TTransportUtils.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\windows\GetTimeOfDay.cpp" />
- <ClCompile Include="src\windows\SocketPair.cpp" />
- <ClCompile Include="src\windows\StdAfx.cpp">
+ <ClCompile Include="src\thrift\thrift\windows\GetTimeOfDay.cpp" />
+ <ClCompile Include="src\thrift\thrift\windows\SocketPair.cpp" />
+ <ClCompile Include="src\thrift\thrift\windows\StdAfx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="src\windows\TWinsockSingleton.cpp" />
- <ClCompile Include="src\windows\WinFcntl.cpp" />
+ <ClCompile Include="src\thrift\thrift\windows\TWinsockSingleton.cpp" />
+ <ClCompile Include="src\thrift\thrift\windows\WinFcntl.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\async\TAsyncChannel.h" />
- <ClInclude Include="src\concurrency\BoostThreadFactory.h" />
- <ClInclude Include="src\concurrency\Exception.h" />
- <ClInclude Include="src\concurrency\PlatformThreadFactory.h" />
- <ClInclude Include="src\processor\PeekProcessor.h" />
- <ClInclude Include="src\protocol\TBinaryProtocol.h" />
- <ClInclude Include="src\protocol\TDebugProtocol.h" />
- <ClInclude Include="src\protocol\TDenseProtocol.h" />
- <ClInclude Include="src\protocol\TJSONProtocol.h" />
- <ClInclude Include="src\protocol\TProtocol.h" />
- <ClInclude Include="src\protocol\TVirtualProtocol.h" />
- <ClInclude Include="src\server\TServer.h" />
- <ClInclude Include="src\server\TSimpleServer.h" />
- <ClInclude Include="src\server\TThreadPoolServer.h" />
- <ClInclude Include="src\TApplicationException.h" />
- <ClInclude Include="src\Thrift.h" />
- <ClInclude Include="src\TProcessor.h" />
- <ClInclude Include="src\transport\TBufferTransports.h" />
- <ClInclude Include="src\transport\TFDTransport.h" />
- <ClInclude Include="src\transport\TFileTransport.h" />
- <ClInclude Include="src\transport\THttpClient.h" />
- <ClInclude Include="src\transport\THttpServer.h" />
- <ClInclude Include="src\transport\TPipe.h" />
- <ClInclude Include="src\transport\TPipeServer.h" />
- <ClInclude Include="src\transport\TServerSocket.h" />
- <ClInclude Include="src\transport\TServerTransport.h" />
- <ClInclude Include="src\transport\TSimpleFileTransport.h" />
- <ClInclude Include="src\transport\TSocket.h" />
- <ClInclude Include="src\transport\TSSLSocket.h" />
- <ClInclude Include="src\transport\TTransport.h" />
- <ClInclude Include="src\transport\TTransportException.h" />
- <ClInclude Include="src\transport\TTransportUtils.h" />
- <ClInclude Include="src\transport\TVirtualTransport.h" />
- <ClInclude Include="src\windows\config.h" />
- <ClInclude Include="src\windows\force_inc.h" />
- <ClInclude Include="src\windows\GetTimeOfDay.h" />
- <ClInclude Include="src\windows\Operators.h" />
- <ClInclude Include="src\windows\SocketPair.h" />
- <ClInclude Include="src\windows\StdAfx.h" />
- <ClInclude Include="src\windows\TargetVersion.h" />
- <ClInclude Include="src\windows\TWinsockSingleton.h" />
- <ClInclude Include="src\windows\WinFcntl.h" />
+ <ClInclude Include="src\thrift\thrift\async\TAsyncChannel.h" />
+ <ClInclude Include="src\thrift\thrift\concurrency\BoostThreadFactory.h" />
+ <ClInclude Include="src\thrift\thrift\concurrency\Exception.h" />
+ <ClInclude Include="src\thrift\thrift\concurrency\PlatformThreadFactory.h" />
+ <ClInclude Include="src\thrift\thrift\processor\PeekProcessor.h" />
+ <ClInclude Include="src\thrift\thrift\protocol\TBinaryProtocol.h" />
+ <ClInclude Include="src\thrift\thrift\protocol\TDebugProtocol.h" />
+ <ClInclude Include="src\thrift\thrift\protocol\TDenseProtocol.h" />
+ <ClInclude Include="src\thrift\thrift\protocol\TJSONProtocol.h" />
+ <ClInclude Include="src\thrift\thrift\protocol\TProtocol.h" />
+ <ClInclude Include="src\thrift\thrift\protocol\TVirtualProtocol.h" />
+ <ClInclude Include="src\thrift\thrift\server\TServer.h" />
+ <ClInclude Include="src\thrift\thrift\server\TSimpleServer.h" />
+ <ClInclude Include="src\thrift\thrift\server\TThreadPoolServer.h" />
+ <ClInclude Include="src\thrift\thrift\TApplicationException.h" />
+ <ClInclude Include="src\thrift\thrift\Thrift.h" />
+ <ClInclude Include="src\thrift\thrift\TProcessor.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TBufferTransports.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TFDTransport.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TFileTransport.h" />
+ <ClInclude Include="src\thrift\thrift\transport\THttpClient.h" />
+ <ClInclude Include="src\thrift\thrift\transport\THttpServer.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TPipe.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TPipeServer.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TServerSocket.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TServerTransport.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TSimpleFileTransport.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TSocket.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TSSLSocket.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TTransport.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TTransportException.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TTransportUtils.h" />
+ <ClInclude Include="src\thrift\thrift\transport\TVirtualTransport.h" />
+ <ClInclude Include="src\thrift\thrift\windows\config.h" />
+ <ClInclude Include="src\thrift\thrift\windows\force_inc.h" />
+ <ClInclude Include="src\thrift\thrift\windows\GetTimeOfDay.h" />
+ <ClInclude Include="src\thrift\thrift\windows\Operators.h" />
+ <ClInclude Include="src\thrift\thrift\windows\SocketPair.h" />
+ <ClInclude Include="src\thrift\thrift\windows\StdAfx.h" />
+ <ClInclude Include="src\thrift\thrift\windows\TargetVersion.h" />
+ <ClInclude Include="src\thrift\thrift\windows\TWinsockSingleton.h" />
+ <ClInclude Include="src\thrift\thrift\windows\WinFcntl.h" />
</ItemGroup>
<ItemGroup>
- <None Include="src\protocol\TBinaryProtocol.tcc" />
- <None Include="src\windows\tr1\functional" />
+ <None Include="src\thrift\thrift\protocol\TBinaryProtocol.tcc" />
+ <None Include="src\thrift\thrift\windows\tr1\functional" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{DD26F57E-60F2-4F37-A616-D219A9BF338F}</ProjectGuid>
@@ -252,16 +252,16 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(ProjectDir)\src\transport\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;..\..\..\..\boost;..\..\..\..\boost\boost;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(ProjectDir)\src\transport\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;..\..\..\..\boost;..\..\..\..\boost\boost;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(ProjectDir)\src\transport\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(ProjectDir)\src\transport\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(ProjectDir)\src\transport\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;..\..\..\..\boost;..\..\..\..\boost\boost;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(ProjectDir)\src\transport\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;..\..\..\..\boost;..\..\..\..\boost\boost;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(ProjectDir)\src\transport\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(ProjectDir)\src\transport\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -328,4 +328,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: thrift/trunk/lib/cpp/libthrift.vcxproj.filters
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/libthrift.vcxproj.filters?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/libthrift.vcxproj.filters (original)
+++ thrift/trunk/lib/cpp/libthrift.vcxproj.filters Fri Apr 13 09:12:31 2012
@@ -1,99 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <ClCompile Include="src\transport\TBufferTransports.cpp">
+ <ClCompile Include="src\thrift\transport\TBufferTransports.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\Thrift.cpp" />
- <ClCompile Include="src\TApplicationException.cpp" />
- <ClCompile Include="src\windows\StdAfx.cpp">
+ <ClCompile Include="src\thrift\Thrift.cpp" />
+ <ClCompile Include="src\thrift\TApplicationException.cpp" />
+ <ClCompile Include="src\thrift\windows\StdAfx.cpp">
<Filter>windows</Filter>
</ClCompile>
- <ClCompile Include="src\transport\TTransportException.cpp">
+ <ClCompile Include="src\thrift\transport\TTransportException.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\windows\GetTimeOfDay.cpp">
+ <ClCompile Include="src\thrift\windows\GetTimeOfDay.cpp">
<Filter>windows</Filter>
</ClCompile>
- <ClCompile Include="src\concurrency\ThreadManager.cpp">
+ <ClCompile Include="src\thrift\concurrency\ThreadManager.cpp">
<Filter>concurrency</Filter>
</ClCompile>
- <ClCompile Include="src\concurrency\TimerManager.cpp">
+ <ClCompile Include="src\thrift\concurrency\TimerManager.cpp">
<Filter>concurrency</Filter>
</ClCompile>
- <ClCompile Include="src\concurrency\Util.cpp">
+ <ClCompile Include="src\thrift\concurrency\Util.cpp">
<Filter>concurrency</Filter>
</ClCompile>
- <ClCompile Include="src\protocol\TDebugProtocol.cpp">
+ <ClCompile Include="src\thrift\protocol\TDebugProtocol.cpp">
<Filter>protocal</Filter>
</ClCompile>
- <ClCompile Include="src\protocol\TDenseProtocol.cpp">
+ <ClCompile Include="src\thrift\protocol\TDenseProtocol.cpp">
<Filter>protocal</Filter>
</ClCompile>
- <ClCompile Include="src\protocol\TBase64Utils.cpp">
+ <ClCompile Include="src\thrift\protocol\TBase64Utils.cpp">
<Filter>protocal</Filter>
</ClCompile>
- <ClCompile Include="src\protocol\TJSONProtocol.cpp">
+ <ClCompile Include="src\thrift\protocol\TJSONProtocol.cpp">
<Filter>protocal</Filter>
</ClCompile>
- <ClCompile Include="src\transport\TFDTransport.cpp">
+ <ClCompile Include="src\thrift\transport\TFDTransport.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\transport\TFileTransport.cpp">
+ <ClCompile Include="src\thrift\transport\TFileTransport.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\transport\TSimpleFileTransport.cpp">
+ <ClCompile Include="src\thrift\transport\TSimpleFileTransport.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\transport\THttpTransport.cpp">
+ <ClCompile Include="src\thrift\transport\THttpTransport.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\transport\THttpClient.cpp">
+ <ClCompile Include="src\thrift\transport\THttpClient.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\transport\THttpServer.cpp">
+ <ClCompile Include="src\thrift\transport\THttpServer.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\transport\TSSLSocket.cpp">
+ <ClCompile Include="src\thrift\transport\TSSLSocket.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\transport\TTransportUtils.cpp">
+ <ClCompile Include="src\thrift\transport\TTransportUtils.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\server\TSimpleServer.cpp">
+ <ClCompile Include="src\thrift\server\TSimpleServer.cpp">
<Filter>server</Filter>
</ClCompile>
- <ClCompile Include="src\server\TThreadPoolServer.cpp">
+ <ClCompile Include="src\thrift\server\TThreadPoolServer.cpp">
<Filter>server</Filter>
</ClCompile>
- <ClCompile Include="src\async\TAsyncChannel.cpp">
+ <ClCompile Include="src\thrift\async\TAsyncChannel.cpp">
<Filter>async</Filter>
</ClCompile>
- <ClCompile Include="src\processor\PeekProcessor.cpp">
+ <ClCompile Include="src\thrift\processor\PeekProcessor.cpp">
<Filter>processor</Filter>
</ClCompile>
- <ClCompile Include="src\transport\TServerSocket.cpp">
+ <ClCompile Include="src\thrift\transport\TServerSocket.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\transport\TSocket.cpp">
+ <ClCompile Include="src\thrift\transport\TSocket.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\windows\TWinsockSingleton.cpp">
+ <ClCompile Include="src\thrift\windows\TWinsockSingleton.cpp">
<Filter>windows</Filter>
</ClCompile>
- <ClCompile Include="src\windows\SocketPair.cpp">
+ <ClCompile Include="src\thrift\windows\SocketPair.cpp">
<Filter>windows</Filter>
</ClCompile>
- <ClCompile Include="src\concurrency\BoostMonitor.cpp">
+ <ClCompile Include="src\thrift\concurrency\BoostMonitor.cpp">
<Filter>concurrency</Filter>
</ClCompile>
- <ClCompile Include="src\concurrency\BoostMutex.cpp">
+ <ClCompile Include="src\thrift\concurrency\BoostMutex.cpp">
<Filter>concurrency</Filter>
</ClCompile>
- <ClCompile Include="src\concurrency\BoostThreadFactory.cpp">
+ <ClCompile Include="src\thrift\concurrency\BoostThreadFactory.cpp">
<Filter>concurrency</Filter>
</ClCompile>
- <ClCompile Include="src\windows\WinFcntl.cpp">
+ <ClCompile Include="src\thrift\windows\WinFcntl.cpp">
<Filter>windows</Filter>
</ClCompile>
<ClCompile Include="src\transport\TPipeServer.cpp">
@@ -104,118 +104,118 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\transport\TBufferTransports.h">
+ <ClInclude Include="src\thrift\transport\TBufferTransports.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\transport\TSocket.h">
+ <ClInclude Include="src\thrift\transport\TSocket.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\protocol\TBinaryProtocol.h">
+ <ClInclude Include="src\thrift\protocol\TBinaryProtocol.h">
<Filter>protocal</Filter>
</ClInclude>
- <ClInclude Include="src\Thrift.h" />
- <ClInclude Include="src\TProcessor.h" />
- <ClInclude Include="src\TApplicationException.h" />
- <ClInclude Include="src\windows\StdAfx.h">
+ <ClInclude Include="src\thrift\Thrift.h" />
+ <ClInclude Include="src\thrift\TProcessor.h" />
+ <ClInclude Include="src\thrift\TApplicationException.h" />
+ <ClInclude Include="src\thrift\windows\StdAfx.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\windows\TargetVersion.h">
+ <ClInclude Include="src\thrift\windows\TargetVersion.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\concurrency\Exception.h">
+ <ClInclude Include="src\thrift\concurrency\Exception.h">
<Filter>concurrency</Filter>
</ClInclude>
- <ClInclude Include="src\transport\TVirtualTransport.h">
+ <ClInclude Include="src\thrift\transport\TVirtualTransport.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\transport\TTransport.h">
+ <ClInclude Include="src\thrift\transport\TTransport.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\transport\TTransportException.h">
+ <ClInclude Include="src\thrift\transport\TTransportException.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\windows\GetTimeOfDay.h">
+ <ClInclude Include="src\thrift\windows\GetTimeOfDay.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\transport\TServerTransport.h">
+ <ClInclude Include="src\thrift\transport\TServerTransport.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\windows\config.h">
+ <ClInclude Include="src\thrift\windows\config.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\protocol\TProtocol.h">
+ <ClInclude Include="src\thrift\protocol\TProtocol.h">
<Filter>protocal</Filter>
</ClInclude>
- <ClInclude Include="src\protocol\TVirtualProtocol.h">
+ <ClInclude Include="src\thrift\protocol\TVirtualProtocol.h">
<Filter>protocal</Filter>
</ClInclude>
- <ClInclude Include="src\server\TServer.h">
+ <ClInclude Include="src\thrift\server\TServer.h">
<Filter>server</Filter>
</ClInclude>
- <ClInclude Include="src\server\TSimpleServer.h">
+ <ClInclude Include="src\thrift\server\TSimpleServer.h">
<Filter>server</Filter>
</ClInclude>
- <ClInclude Include="src\server\TThreadPoolServer.h">
+ <ClInclude Include="src\thrift\server\TThreadPoolServer.h">
<Filter>server</Filter>
</ClInclude>
- <ClInclude Include="src\async\TAsyncChannel.h">
+ <ClInclude Include="src\thrift\async\TAsyncChannel.h">
<Filter>async</Filter>
</ClInclude>
- <ClInclude Include="src\processor\PeekProcessor.h">
+ <ClInclude Include="src\thrift\processor\PeekProcessor.h">
<Filter>processor</Filter>
</ClInclude>
- <ClInclude Include="src\transport\TFDTransport.h">
+ <ClInclude Include="src\thrift\transport\TFDTransport.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\transport\TFileTransport.h">
+ <ClInclude Include="src\thrift\transport\TFileTransport.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\transport\THttpClient.h">
+ <ClInclude Include="src\thrift\transport\THttpClient.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\transport\THttpServer.h">
+ <ClInclude Include="src\thrift\transport\THttpServer.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\transport\TSSLSocket.h">
+ <ClInclude Include="src\thrift\transport\TSSLSocket.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\transport\TTransportUtils.h">
+ <ClInclude Include="src\thrift\transport\TTransportUtils.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\transport\TSimpleFileTransport.h">
+ <ClInclude Include="src\thrift\transport\TSimpleFileTransport.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\protocol\TJSONProtocol.h">
+ <ClInclude Include="src\thrift\protocol\TJSONProtocol.h">
<Filter>protocal</Filter>
</ClInclude>
- <ClInclude Include="src\protocol\TDenseProtocol.h">
+ <ClInclude Include="src\thrift\protocol\TDenseProtocol.h">
<Filter>protocal</Filter>
</ClInclude>
- <ClInclude Include="src\protocol\TDebugProtocol.h">
+ <ClInclude Include="src\thrift\protocol\TDebugProtocol.h">
<Filter>protocal</Filter>
</ClInclude>
- <ClInclude Include="src\transport\TServerSocket.h">
+ <ClInclude Include="src\thrift\transport\TServerSocket.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\windows\Operators.h">
+ <ClInclude Include="src\thrift\windows\Operators.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\windows\TWinsockSingleton.h">
+ <ClInclude Include="src\thrift\windows\TWinsockSingleton.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\windows\SocketPair.h">
+ <ClInclude Include="src\thrift\windows\SocketPair.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\windows\force_inc.h">
+ <ClInclude Include="src\thrift\windows\force_inc.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\concurrency\BoostThreadFactory.h">
+ <ClInclude Include="src\thrift\concurrency\BoostThreadFactory.h">
<Filter>concurrency</Filter>
</ClInclude>
- <ClInclude Include="src\concurrency\PlatformThreadFactory.h">
+ <ClInclude Include="src\thrift\concurrency\PlatformThreadFactory.h">
<Filter>concurrency</Filter>
</ClInclude>
- <ClInclude Include="src\windows\WinFcntl.h">
+ <ClInclude Include="src\thrift\windows\WinFcntl.h">
<Filter>windows</Filter>
</ClInclude>
<ClInclude Include="src\transport\TPipe.h">
@@ -252,10 +252,10 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <None Include="src\protocol\TBinaryProtocol.tcc">
+ <None Include="src\thrift\protocol\TBinaryProtocol.tcc">
<Filter>protocal</Filter>
</None>
- <None Include="src\windows\tr1\functional">
+ <None Include="src\thrift\windows\tr1\functional">
<Filter>windows\tr1</Filter>
</None>
</ItemGroup>
Modified: thrift/trunk/lib/cpp/libthriftnb.vcxproj
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/libthriftnb.vcxproj?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/libthriftnb.vcxproj (original)
+++ thrift/trunk/lib/cpp/libthriftnb.vcxproj Fri Apr 13 09:12:31 2012
@@ -19,41 +19,41 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\async\TAsyncProtocolProcessor.cpp">
+ <ClCompile Include="src\thrift\thrift\async\TAsyncProtocolProcessor.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\async\TEvhttpClientChannel.cpp">
+ <ClCompile Include="src\thrift\thrift\async\TEvhttpClientChannel.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\async\TEvhttpServer.cpp">
+ <ClCompile Include="src\thrift\thrift\async\TEvhttpServer.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\server\TNonblockingServer.cpp">
+ <ClCompile Include="src\thrift\thrift\server\TNonblockingServer.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\windows\StdAfx.cpp" />
+ <ClCompile Include="src\thrift\thrift\windows\StdAfx.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\async\TAsyncProtocolProcessor.h" />
- <ClInclude Include="src\async\TEvhttpClientChannel.h" />
- <ClInclude Include="src\async\TEvhttpServer.h" />
- <ClInclude Include="src\server\TNonblockingServer.h" />
- <ClInclude Include="src\windows\config.h" />
- <ClInclude Include="src\windows\force_inc.h" />
- <ClInclude Include="src\windows\StdAfx.h" />
- <ClInclude Include="src\windows\TargetVersion.h" />
+ <ClInclude Include="src\thrift\thrift\async\TAsyncProtocolProcessor.h" />
+ <ClInclude Include="src\thrift\thrift\async\TEvhttpClientChannel.h" />
+ <ClInclude Include="src\thrift\thrift\async\TEvhttpServer.h" />
+ <ClInclude Include="src\thrift\thrift\server\TNonblockingServer.h" />
+ <ClInclude Include="src\thrift\thrift\windows\config.h" />
+ <ClInclude Include="src\thrift\thrift\windows\force_inc.h" />
+ <ClInclude Include="src\thrift\thrift\windows\StdAfx.h" />
+ <ClInclude Include="src\thrift\thrift\windows\TargetVersion.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D8696CCE-7D46-4659-B432-91754A41DEB0}</ProjectGuid>
@@ -100,16 +100,16 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Modified: thrift/trunk/lib/cpp/libthriftnb.vcxproj.filters
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/libthriftnb.vcxproj.filters?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/libthriftnb.vcxproj.filters (original)
+++ thrift/trunk/lib/cpp/libthriftnb.vcxproj.filters Fri Apr 13 09:12:31 2012
@@ -12,45 +12,45 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\server\TNonblockingServer.cpp">
+ <ClCompile Include="src\thrift\server\TNonblockingServer.cpp">
<Filter>server</Filter>
</ClCompile>
- <ClCompile Include="src\async\TEvhttpClientChannel.cpp">
+ <ClCompile Include="src\thrift\async\TEvhttpClientChannel.cpp">
<Filter>async</Filter>
</ClCompile>
- <ClCompile Include="src\async\TEvhttpServer.cpp">
+ <ClCompile Include="src\thrift\async\TEvhttpServer.cpp">
<Filter>async</Filter>
</ClCompile>
- <ClCompile Include="src\async\TAsyncProtocolProcessor.cpp">
+ <ClCompile Include="src\thrift\async\TAsyncProtocolProcessor.cpp">
<Filter>async</Filter>
</ClCompile>
- <ClCompile Include="src\windows\StdAfx.cpp">
+ <ClCompile Include="src\thrift\windows\StdAfx.cpp">
<Filter>windows</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\server\TNonblockingServer.h">
+ <ClInclude Include="src\thrift\server\TNonblockingServer.h">
<Filter>server</Filter>
</ClInclude>
- <ClInclude Include="src\async\TEvhttpClientChannel.h">
+ <ClInclude Include="src\thrift\async\TEvhttpClientChannel.h">
<Filter>async</Filter>
</ClInclude>
- <ClInclude Include="src\async\TEvhttpServer.h">
+ <ClInclude Include="src\thrift\async\TEvhttpServer.h">
<Filter>async</Filter>
</ClInclude>
- <ClInclude Include="src\async\TAsyncProtocolProcessor.h">
+ <ClInclude Include="src\thrift\async\TAsyncProtocolProcessor.h">
<Filter>async</Filter>
</ClInclude>
- <ClInclude Include="src\windows\config.h">
+ <ClInclude Include="src\thrift\windows\config.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\windows\StdAfx.h">
+ <ClInclude Include="src\thrift\windows\StdAfx.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\windows\TargetVersion.h">
+ <ClInclude Include="src\thrift\windows\TargetVersion.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\windows\force_inc.h">
+ <ClInclude Include="src\thrift\windows\force_inc.h">
<Filter>windows</Filter>
</ClInclude>
</ItemGroup>
Copied: thrift/trunk/lib/cpp/src/thrift/TApplicationException.cpp (from r1325048, thrift/trunk/lib/cpp/src/TApplicationException.cpp)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/TApplicationException.cpp?p2=thrift/trunk/lib/cpp/src/thrift/TApplicationException.cpp&p1=thrift/trunk/lib/cpp/src/TApplicationException.cpp&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/TApplicationException.cpp (original)
+++ thrift/trunk/lib/cpp/src/thrift/TApplicationException.cpp Fri Apr 13 09:12:31 2012
@@ -17,8 +17,8 @@
* under the License.
*/
-#include <TApplicationException.h>
-#include <protocol/TProtocol.h>
+#include <thrift/TApplicationException.h>
+#include <thrift/protocol/TProtocol.h>
namespace apache { namespace thrift {