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 [1/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...

Author: roger
Date: Fri Apr 13 09:12:31 2012
New Revision: 1325674

URL: http://svn.apache.org/viewvc?rev=1325674&view=rev
Log:
THRIFT-1552 Include paths for c/c++ should be prefixed with 'thrift/'

To ensure there are no include path collisions the C and C++ header
include paths should include 'thrift' as the root leaf. This will
prevent having to place /usr/include/thrift into the compilers include
header search path, which might otherwise result in the compiler
accidentally picking up headers that it shouldn't.

e.g. #include <foo/bar.h> should be #include <thrift/foo/bar.h>

Change-Id: I48f2b0f549bda0fc81e85506ac857adc800b98a1

Added:
    thrift/trunk/lib/c_glib/src/thrift/
    thrift/trunk/lib/c_glib/src/thrift/processor/
    thrift/trunk/lib/c_glib/src/thrift/processor/thrift_processor.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/processor/thrift_processor.c
    thrift/trunk/lib/c_glib/src/thrift/processor/thrift_processor.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/processor/thrift_processor.h
    thrift/trunk/lib/c_glib/src/thrift/protocol/
    thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol.c
    thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol.h
    thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol_factory.c
    thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol_factory.h
    thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_protocol.c
    thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_protocol.h
    thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_protocol_factory.c
    thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_protocol_factory.h
    thrift/trunk/lib/c_glib/src/thrift/server/
    thrift/trunk/lib/c_glib/src/thrift/server/thrift_server.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/server/thrift_server.c
    thrift/trunk/lib/c_glib/src/thrift/server/thrift_server.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/server/thrift_server.h
    thrift/trunk/lib/c_glib/src/thrift/server/thrift_simple_server.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/server/thrift_simple_server.c
    thrift/trunk/lib/c_glib/src/thrift/server/thrift_simple_server.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/server/thrift_simple_server.h
    thrift/trunk/lib/c_glib/src/thrift/thrift.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/thrift.c
    thrift/trunk/lib/c_glib/src/thrift/thrift.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/thrift.h
    thrift/trunk/lib/c_glib/src/thrift/thrift_application_exception.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/thrift_application_exception.c
    thrift/trunk/lib/c_glib/src/thrift/thrift_application_exception.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/thrift_application_exception.h
    thrift/trunk/lib/c_glib/src/thrift/thrift_struct.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/thrift_struct.c
    thrift/trunk/lib/c_glib/src/thrift/thrift_struct.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/thrift_struct.h
    thrift/trunk/lib/c_glib/src/thrift/transport/
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_buffered_transport.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_buffered_transport.c
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_buffered_transport.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_buffered_transport.h
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_framed_transport.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_framed_transport.c
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_framed_transport.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_framed_transport.h
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_memory_buffer.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_memory_buffer.c
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_memory_buffer.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_memory_buffer.h
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_socket.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_server_socket.c
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_socket.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_server_socket.h
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_transport.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_server_transport.c
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_server_transport.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_server_transport.h
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_socket.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_socket.c
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_socket.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_socket.h
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_transport.c
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_transport.h
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport_factory.c
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_transport_factory.c
    thrift/trunk/lib/c_glib/src/thrift/transport/thrift_transport_factory.h
      - copied, changed from r1325048, thrift/trunk/lib/c_glib/src/transport/thrift_transport_factory.h
    thrift/trunk/lib/cpp/src/thrift/
    thrift/trunk/lib/cpp/src/thrift/TApplicationException.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/TApplicationException.cpp
    thrift/trunk/lib/cpp/src/thrift/TApplicationException.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/TApplicationException.h
    thrift/trunk/lib/cpp/src/thrift/TDispatchProcessor.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/TDispatchProcessor.h
    thrift/trunk/lib/cpp/src/thrift/TLogging.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/TLogging.h
    thrift/trunk/lib/cpp/src/thrift/TProcessor.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/TProcessor.h
    thrift/trunk/lib/cpp/src/thrift/TReflectionLocal.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/TReflectionLocal.h
    thrift/trunk/lib/cpp/src/thrift/Thrift.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/Thrift.cpp
    thrift/trunk/lib/cpp/src/thrift/Thrift.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/Thrift.h
    thrift/trunk/lib/cpp/src/thrift/VirtualProfiling.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/VirtualProfiling.cpp
    thrift/trunk/lib/cpp/src/thrift/async/
    thrift/trunk/lib/cpp/src/thrift/async/TAsyncBufferProcessor.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/async/TAsyncBufferProcessor.h
    thrift/trunk/lib/cpp/src/thrift/async/TAsyncChannel.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/async/TAsyncChannel.cpp
    thrift/trunk/lib/cpp/src/thrift/async/TAsyncChannel.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/async/TAsyncChannel.h
    thrift/trunk/lib/cpp/src/thrift/async/TAsyncDispatchProcessor.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/async/TAsyncDispatchProcessor.h
    thrift/trunk/lib/cpp/src/thrift/async/TAsyncProcessor.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/async/TAsyncProcessor.h
    thrift/trunk/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/async/TAsyncProtocolProcessor.cpp
    thrift/trunk/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/async/TAsyncProtocolProcessor.h
    thrift/trunk/lib/cpp/src/thrift/async/TEvhttpClientChannel.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/async/TEvhttpClientChannel.cpp
    thrift/trunk/lib/cpp/src/thrift/async/TEvhttpClientChannel.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/async/TEvhttpClientChannel.h
    thrift/trunk/lib/cpp/src/thrift/async/TEvhttpServer.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/async/TEvhttpServer.cpp
    thrift/trunk/lib/cpp/src/thrift/async/TEvhttpServer.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/async/TEvhttpServer.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/
    thrift/trunk/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/BoostMonitor.cpp
    thrift/trunk/lib/cpp/src/thrift/concurrency/BoostMutex.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/BoostMutex.cpp
    thrift/trunk/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/BoostThreadFactory.cpp
    thrift/trunk/lib/cpp/src/thrift/concurrency/BoostThreadFactory.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/BoostThreadFactory.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/Exception.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/Exception.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/FunctionRunner.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/FunctionRunner.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/Monitor.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/Monitor.cpp
    thrift/trunk/lib/cpp/src/thrift/concurrency/Monitor.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/Monitor.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/Mutex.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/Mutex.cpp
    thrift/trunk/lib/cpp/src/thrift/concurrency/Mutex.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/Mutex.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/PlatformThreadFactory.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/PosixThreadFactory.cpp
    thrift/trunk/lib/cpp/src/thrift/concurrency/PosixThreadFactory.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/PosixThreadFactory.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/Thread.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/Thread.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/ThreadManager.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/ThreadManager.cpp
    thrift/trunk/lib/cpp/src/thrift/concurrency/ThreadManager.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/ThreadManager.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/TimerManager.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/TimerManager.cpp
    thrift/trunk/lib/cpp/src/thrift/concurrency/TimerManager.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/TimerManager.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/Util.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/Util.cpp
    thrift/trunk/lib/cpp/src/thrift/concurrency/Util.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/Util.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/test/
    thrift/trunk/lib/cpp/src/thrift/concurrency/test/Tests.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/test/Tests.cpp
    thrift/trunk/lib/cpp/src/thrift/concurrency/test/ThreadFactoryTests.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/test/ThreadFactoryTests.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/test/ThreadManagerTests.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/test/ThreadManagerTests.h
    thrift/trunk/lib/cpp/src/thrift/concurrency/test/TimerManagerTests.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/concurrency/test/TimerManagerTests.h
    thrift/trunk/lib/cpp/src/thrift/processor/
    thrift/trunk/lib/cpp/src/thrift/processor/PeekProcessor.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/processor/PeekProcessor.cpp
    thrift/trunk/lib/cpp/src/thrift/processor/PeekProcessor.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/processor/PeekProcessor.h
    thrift/trunk/lib/cpp/src/thrift/processor/StatsProcessor.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/processor/StatsProcessor.h
    thrift/trunk/lib/cpp/src/thrift/protocol/
    thrift/trunk/lib/cpp/src/thrift/protocol/TBase64Utils.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TBase64Utils.cpp
    thrift/trunk/lib/cpp/src/thrift/protocol/TBase64Utils.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TBase64Utils.h
    thrift/trunk/lib/cpp/src/thrift/protocol/TBinaryProtocol.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.h
    thrift/trunk/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.tcc
    thrift/trunk/lib/cpp/src/thrift/protocol/TCompactProtocol.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TCompactProtocol.h
    thrift/trunk/lib/cpp/src/thrift/protocol/TCompactProtocol.tcc
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TCompactProtocol.tcc
    thrift/trunk/lib/cpp/src/thrift/protocol/TDebugProtocol.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TDebugProtocol.cpp
    thrift/trunk/lib/cpp/src/thrift/protocol/TDebugProtocol.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TDebugProtocol.h
    thrift/trunk/lib/cpp/src/thrift/protocol/TDenseProtocol.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.cpp
    thrift/trunk/lib/cpp/src/thrift/protocol/TDenseProtocol.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.h
    thrift/trunk/lib/cpp/src/thrift/protocol/TJSONProtocol.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TJSONProtocol.cpp
    thrift/trunk/lib/cpp/src/thrift/protocol/TJSONProtocol.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TJSONProtocol.h
    thrift/trunk/lib/cpp/src/thrift/protocol/TProtocol.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TProtocol.h
    thrift/trunk/lib/cpp/src/thrift/protocol/TProtocolException.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TProtocolException.h
    thrift/trunk/lib/cpp/src/thrift/protocol/TProtocolTap.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TProtocolTap.h
    thrift/trunk/lib/cpp/src/thrift/protocol/TVirtualProtocol.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/protocol/TVirtualProtocol.h
    thrift/trunk/lib/cpp/src/thrift/qt/
    thrift/trunk/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/qt/TQIODeviceTransport.cpp
    thrift/trunk/lib/cpp/src/thrift/qt/TQIODeviceTransport.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/qt/TQIODeviceTransport.h
    thrift/trunk/lib/cpp/src/thrift/qt/TQTcpServer.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/qt/TQTcpServer.cpp
    thrift/trunk/lib/cpp/src/thrift/qt/TQTcpServer.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/qt/TQTcpServer.h
    thrift/trunk/lib/cpp/src/thrift/server/
    thrift/trunk/lib/cpp/src/thrift/server/TNonblockingServer.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/server/TNonblockingServer.cpp
    thrift/trunk/lib/cpp/src/thrift/server/TNonblockingServer.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/server/TNonblockingServer.h
    thrift/trunk/lib/cpp/src/thrift/server/TServer.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/server/TServer.cpp
    thrift/trunk/lib/cpp/src/thrift/server/TServer.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/server/TServer.h
    thrift/trunk/lib/cpp/src/thrift/server/TSimpleServer.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/server/TSimpleServer.cpp
    thrift/trunk/lib/cpp/src/thrift/server/TSimpleServer.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/server/TSimpleServer.h
    thrift/trunk/lib/cpp/src/thrift/server/TThreadPoolServer.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/server/TThreadPoolServer.cpp
    thrift/trunk/lib/cpp/src/thrift/server/TThreadPoolServer.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/server/TThreadPoolServer.h
    thrift/trunk/lib/cpp/src/thrift/server/TThreadedServer.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/server/TThreadedServer.cpp
    thrift/trunk/lib/cpp/src/thrift/server/TThreadedServer.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/server/TThreadedServer.h
    thrift/trunk/lib/cpp/src/thrift/transport/
    thrift/trunk/lib/cpp/src/thrift/transport/TBufferTransports.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TBufferTransports.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TBufferTransports.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TBufferTransports.h
    thrift/trunk/lib/cpp/src/thrift/transport/TFDTransport.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TFDTransport.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TFDTransport.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TFDTransport.h
    thrift/trunk/lib/cpp/src/thrift/transport/TFileTransport.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TFileTransport.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TFileTransport.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TFileTransport.h
    thrift/trunk/lib/cpp/src/thrift/transport/THttpClient.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/THttpClient.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/THttpClient.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/THttpClient.h
    thrift/trunk/lib/cpp/src/thrift/transport/THttpServer.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/THttpServer.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/THttpServer.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/THttpServer.h
    thrift/trunk/lib/cpp/src/thrift/transport/THttpTransport.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/THttpTransport.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/THttpTransport.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/THttpTransport.h
    thrift/trunk/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TSSLServerSocket.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TSSLServerSocket.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TSSLServerSocket.h
    thrift/trunk/lib/cpp/src/thrift/transport/TSSLSocket.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TSSLSocket.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TSSLSocket.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TSSLSocket.h
    thrift/trunk/lib/cpp/src/thrift/transport/TServerSocket.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TServerSocket.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TServerSocket.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TServerSocket.h
    thrift/trunk/lib/cpp/src/thrift/transport/TServerTransport.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TServerTransport.h
    thrift/trunk/lib/cpp/src/thrift/transport/TShortReadTransport.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TShortReadTransport.h
    thrift/trunk/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TSimpleFileTransport.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TSimpleFileTransport.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TSimpleFileTransport.h
    thrift/trunk/lib/cpp/src/thrift/transport/TSocket.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TSocket.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TSocket.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TSocket.h
    thrift/trunk/lib/cpp/src/thrift/transport/TSocketPool.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TSocketPool.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TSocketPool.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TSocketPool.h
    thrift/trunk/lib/cpp/src/thrift/transport/TTransport.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TTransport.h
    thrift/trunk/lib/cpp/src/thrift/transport/TTransportException.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TTransportException.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TTransportException.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TTransportException.h
    thrift/trunk/lib/cpp/src/thrift/transport/TTransportUtils.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TTransportUtils.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TTransportUtils.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TTransportUtils.h
    thrift/trunk/lib/cpp/src/thrift/transport/TVirtualTransport.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TVirtualTransport.h
    thrift/trunk/lib/cpp/src/thrift/transport/TZlibTransport.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TZlibTransport.cpp
    thrift/trunk/lib/cpp/src/thrift/transport/TZlibTransport.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/transport/TZlibTransport.h
    thrift/trunk/lib/cpp/src/thrift/windows/
    thrift/trunk/lib/cpp/src/thrift/windows/GetTimeOfDay.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/GetTimeOfDay.cpp
    thrift/trunk/lib/cpp/src/thrift/windows/GetTimeOfDay.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/GetTimeOfDay.h
    thrift/trunk/lib/cpp/src/thrift/windows/Operators.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/Operators.h
    thrift/trunk/lib/cpp/src/thrift/windows/SocketPair.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/SocketPair.cpp
    thrift/trunk/lib/cpp/src/thrift/windows/SocketPair.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/SocketPair.h
    thrift/trunk/lib/cpp/src/thrift/windows/StdAfx.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/StdAfx.cpp
    thrift/trunk/lib/cpp/src/thrift/windows/StdAfx.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/StdAfx.h
    thrift/trunk/lib/cpp/src/thrift/windows/TWinsockSingleton.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/TWinsockSingleton.cpp
    thrift/trunk/lib/cpp/src/thrift/windows/TWinsockSingleton.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/TWinsockSingleton.h
    thrift/trunk/lib/cpp/src/thrift/windows/TargetVersion.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/TargetVersion.h
    thrift/trunk/lib/cpp/src/thrift/windows/WinFcntl.cpp
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/WinFcntl.cpp
    thrift/trunk/lib/cpp/src/thrift/windows/WinFcntl.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/WinFcntl.h
    thrift/trunk/lib/cpp/src/thrift/windows/config.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/config.h
    thrift/trunk/lib/cpp/src/thrift/windows/force_inc.h
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/force_inc.h
    thrift/trunk/lib/cpp/src/thrift/windows/tr1/
    thrift/trunk/lib/cpp/src/thrift/windows/tr1/functional
      - copied, changed from r1325048, thrift/trunk/lib/cpp/src/windows/tr1/functional
Removed:
    thrift/trunk/lib/c_glib/src/processor/thrift_processor.c
    thrift/trunk/lib/c_glib/src/processor/thrift_processor.h
    thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol.c
    thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol.h
    thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol_factory.c
    thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol_factory.h
    thrift/trunk/lib/c_glib/src/protocol/thrift_protocol.c
    thrift/trunk/lib/c_glib/src/protocol/thrift_protocol.h
    thrift/trunk/lib/c_glib/src/protocol/thrift_protocol_factory.c
    thrift/trunk/lib/c_glib/src/protocol/thrift_protocol_factory.h
    thrift/trunk/lib/c_glib/src/server/thrift_server.c
    thrift/trunk/lib/c_glib/src/server/thrift_server.h
    thrift/trunk/lib/c_glib/src/server/thrift_simple_server.c
    thrift/trunk/lib/c_glib/src/server/thrift_simple_server.h
    thrift/trunk/lib/c_glib/src/thrift.c
    thrift/trunk/lib/c_glib/src/thrift.h
    thrift/trunk/lib/c_glib/src/thrift_application_exception.c
    thrift/trunk/lib/c_glib/src/thrift_application_exception.h
    thrift/trunk/lib/c_glib/src/thrift_struct.c
    thrift/trunk/lib/c_glib/src/thrift_struct.h
    thrift/trunk/lib/c_glib/src/transport/thrift_buffered_transport.c
    thrift/trunk/lib/c_glib/src/transport/thrift_buffered_transport.h
    thrift/trunk/lib/c_glib/src/transport/thrift_framed_transport.c
    thrift/trunk/lib/c_glib/src/transport/thrift_framed_transport.h
    thrift/trunk/lib/c_glib/src/transport/thrift_memory_buffer.c
    thrift/trunk/lib/c_glib/src/transport/thrift_memory_buffer.h
    thrift/trunk/lib/c_glib/src/transport/thrift_server_socket.c
    thrift/trunk/lib/c_glib/src/transport/thrift_server_socket.h
    thrift/trunk/lib/c_glib/src/transport/thrift_server_transport.c
    thrift/trunk/lib/c_glib/src/transport/thrift_server_transport.h
    thrift/trunk/lib/c_glib/src/transport/thrift_socket.c
    thrift/trunk/lib/c_glib/src/transport/thrift_socket.h
    thrift/trunk/lib/c_glib/src/transport/thrift_transport.c
    thrift/trunk/lib/c_glib/src/transport/thrift_transport.h
    thrift/trunk/lib/c_glib/src/transport/thrift_transport_factory.c
    thrift/trunk/lib/c_glib/src/transport/thrift_transport_factory.h
    thrift/trunk/lib/cpp/src/TApplicationException.cpp
    thrift/trunk/lib/cpp/src/TApplicationException.h
    thrift/trunk/lib/cpp/src/TDispatchProcessor.h
    thrift/trunk/lib/cpp/src/TLogging.h
    thrift/trunk/lib/cpp/src/TProcessor.h
    thrift/trunk/lib/cpp/src/TReflectionLocal.h
    thrift/trunk/lib/cpp/src/Thrift.cpp
    thrift/trunk/lib/cpp/src/Thrift.h
    thrift/trunk/lib/cpp/src/VirtualProfiling.cpp
    thrift/trunk/lib/cpp/src/async/TAsyncBufferProcessor.h
    thrift/trunk/lib/cpp/src/async/TAsyncChannel.cpp
    thrift/trunk/lib/cpp/src/async/TAsyncChannel.h
    thrift/trunk/lib/cpp/src/async/TAsyncDispatchProcessor.h
    thrift/trunk/lib/cpp/src/async/TAsyncProcessor.h
    thrift/trunk/lib/cpp/src/async/TAsyncProtocolProcessor.cpp
    thrift/trunk/lib/cpp/src/async/TAsyncProtocolProcessor.h
    thrift/trunk/lib/cpp/src/async/TEvhttpClientChannel.cpp
    thrift/trunk/lib/cpp/src/async/TEvhttpClientChannel.h
    thrift/trunk/lib/cpp/src/async/TEvhttpServer.cpp
    thrift/trunk/lib/cpp/src/async/TEvhttpServer.h
    thrift/trunk/lib/cpp/src/concurrency/BoostMonitor.cpp
    thrift/trunk/lib/cpp/src/concurrency/BoostMutex.cpp
    thrift/trunk/lib/cpp/src/concurrency/BoostThreadFactory.cpp
    thrift/trunk/lib/cpp/src/concurrency/BoostThreadFactory.h
    thrift/trunk/lib/cpp/src/concurrency/Exception.h
    thrift/trunk/lib/cpp/src/concurrency/FunctionRunner.h
    thrift/trunk/lib/cpp/src/concurrency/Monitor.cpp
    thrift/trunk/lib/cpp/src/concurrency/Monitor.h
    thrift/trunk/lib/cpp/src/concurrency/Mutex.cpp
    thrift/trunk/lib/cpp/src/concurrency/Mutex.h
    thrift/trunk/lib/cpp/src/concurrency/PlatformThreadFactory.h
    thrift/trunk/lib/cpp/src/concurrency/PosixThreadFactory.cpp
    thrift/trunk/lib/cpp/src/concurrency/PosixThreadFactory.h
    thrift/trunk/lib/cpp/src/concurrency/Thread.h
    thrift/trunk/lib/cpp/src/concurrency/ThreadManager.cpp
    thrift/trunk/lib/cpp/src/concurrency/ThreadManager.h
    thrift/trunk/lib/cpp/src/concurrency/TimerManager.cpp
    thrift/trunk/lib/cpp/src/concurrency/TimerManager.h
    thrift/trunk/lib/cpp/src/concurrency/Util.cpp
    thrift/trunk/lib/cpp/src/concurrency/Util.h
    thrift/trunk/lib/cpp/src/concurrency/test/Tests.cpp
    thrift/trunk/lib/cpp/src/concurrency/test/ThreadFactoryTests.h
    thrift/trunk/lib/cpp/src/concurrency/test/ThreadManagerTests.h
    thrift/trunk/lib/cpp/src/concurrency/test/TimerManagerTests.h
    thrift/trunk/lib/cpp/src/processor/PeekProcessor.cpp
    thrift/trunk/lib/cpp/src/processor/PeekProcessor.h
    thrift/trunk/lib/cpp/src/processor/StatsProcessor.h
    thrift/trunk/lib/cpp/src/protocol/TBase64Utils.cpp
    thrift/trunk/lib/cpp/src/protocol/TBase64Utils.h
    thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.h
    thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.tcc
    thrift/trunk/lib/cpp/src/protocol/TCompactProtocol.h
    thrift/trunk/lib/cpp/src/protocol/TCompactProtocol.tcc
    thrift/trunk/lib/cpp/src/protocol/TDebugProtocol.cpp
    thrift/trunk/lib/cpp/src/protocol/TDebugProtocol.h
    thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.cpp
    thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.h
    thrift/trunk/lib/cpp/src/protocol/TJSONProtocol.cpp
    thrift/trunk/lib/cpp/src/protocol/TJSONProtocol.h
    thrift/trunk/lib/cpp/src/protocol/TProtocol.h
    thrift/trunk/lib/cpp/src/protocol/TProtocolException.h
    thrift/trunk/lib/cpp/src/protocol/TProtocolTap.h
    thrift/trunk/lib/cpp/src/protocol/TVirtualProtocol.h
    thrift/trunk/lib/cpp/src/qt/TQIODeviceTransport.cpp
    thrift/trunk/lib/cpp/src/qt/TQIODeviceTransport.h
    thrift/trunk/lib/cpp/src/qt/TQTcpServer.cpp
    thrift/trunk/lib/cpp/src/qt/TQTcpServer.h
    thrift/trunk/lib/cpp/src/server/TNonblockingServer.cpp
    thrift/trunk/lib/cpp/src/server/TNonblockingServer.h
    thrift/trunk/lib/cpp/src/server/TServer.cpp
    thrift/trunk/lib/cpp/src/server/TServer.h
    thrift/trunk/lib/cpp/src/server/TSimpleServer.cpp
    thrift/trunk/lib/cpp/src/server/TSimpleServer.h
    thrift/trunk/lib/cpp/src/server/TThreadPoolServer.cpp
    thrift/trunk/lib/cpp/src/server/TThreadPoolServer.h
    thrift/trunk/lib/cpp/src/server/TThreadedServer.cpp
    thrift/trunk/lib/cpp/src/server/TThreadedServer.h
    thrift/trunk/lib/cpp/src/transport/TBufferTransports.cpp
    thrift/trunk/lib/cpp/src/transport/TBufferTransports.h
    thrift/trunk/lib/cpp/src/transport/TFDTransport.cpp
    thrift/trunk/lib/cpp/src/transport/TFDTransport.h
    thrift/trunk/lib/cpp/src/transport/TFileTransport.cpp
    thrift/trunk/lib/cpp/src/transport/TFileTransport.h
    thrift/trunk/lib/cpp/src/transport/THttpClient.cpp
    thrift/trunk/lib/cpp/src/transport/THttpClient.h
    thrift/trunk/lib/cpp/src/transport/THttpServer.cpp
    thrift/trunk/lib/cpp/src/transport/THttpServer.h
    thrift/trunk/lib/cpp/src/transport/THttpTransport.cpp
    thrift/trunk/lib/cpp/src/transport/THttpTransport.h
    thrift/trunk/lib/cpp/src/transport/TPipe.cpp
    thrift/trunk/lib/cpp/src/transport/TPipe.h
    thrift/trunk/lib/cpp/src/transport/TPipeServer.cpp
    thrift/trunk/lib/cpp/src/transport/TPipeServer.h
    thrift/trunk/lib/cpp/src/transport/TSSLServerSocket.cpp
    thrift/trunk/lib/cpp/src/transport/TSSLServerSocket.h
    thrift/trunk/lib/cpp/src/transport/TSSLSocket.cpp
    thrift/trunk/lib/cpp/src/transport/TSSLSocket.h
    thrift/trunk/lib/cpp/src/transport/TServerSocket.cpp
    thrift/trunk/lib/cpp/src/transport/TServerSocket.h
    thrift/trunk/lib/cpp/src/transport/TServerTransport.h
    thrift/trunk/lib/cpp/src/transport/TShortReadTransport.h
    thrift/trunk/lib/cpp/src/transport/TSimpleFileTransport.cpp
    thrift/trunk/lib/cpp/src/transport/TSimpleFileTransport.h
    thrift/trunk/lib/cpp/src/transport/TSocket.cpp
    thrift/trunk/lib/cpp/src/transport/TSocket.h
    thrift/trunk/lib/cpp/src/transport/TSocketPool.cpp
    thrift/trunk/lib/cpp/src/transport/TSocketPool.h
    thrift/trunk/lib/cpp/src/transport/TTransport.h
    thrift/trunk/lib/cpp/src/transport/TTransportException.cpp
    thrift/trunk/lib/cpp/src/transport/TTransportException.h
    thrift/trunk/lib/cpp/src/transport/TTransportUtils.cpp
    thrift/trunk/lib/cpp/src/transport/TTransportUtils.h
    thrift/trunk/lib/cpp/src/transport/TVirtualTransport.h
    thrift/trunk/lib/cpp/src/transport/TZlibTransport.cpp
    thrift/trunk/lib/cpp/src/transport/TZlibTransport.h
    thrift/trunk/lib/cpp/src/windows/GetTimeOfDay.cpp
    thrift/trunk/lib/cpp/src/windows/GetTimeOfDay.h
    thrift/trunk/lib/cpp/src/windows/Operators.h
    thrift/trunk/lib/cpp/src/windows/SocketPair.cpp
    thrift/trunk/lib/cpp/src/windows/SocketPair.h
    thrift/trunk/lib/cpp/src/windows/StdAfx.cpp
    thrift/trunk/lib/cpp/src/windows/StdAfx.h
    thrift/trunk/lib/cpp/src/windows/TWinsockSingleton.cpp
    thrift/trunk/lib/cpp/src/windows/TWinsockSingleton.h
    thrift/trunk/lib/cpp/src/windows/TargetVersion.h
    thrift/trunk/lib/cpp/src/windows/WinFcntl.cpp
    thrift/trunk/lib/cpp/src/windows/WinFcntl.h
    thrift/trunk/lib/cpp/src/windows/config.h
    thrift/trunk/lib/cpp/src/windows/force_inc.h
    thrift/trunk/lib/cpp/src/windows/tr1/functional
Modified:
    thrift/trunk/LICENSE
    thrift/trunk/compiler/cpp/compiler.vcxproj
    thrift/trunk/compiler/cpp/src/generate/t_c_glib_generator.cc
    thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc
    thrift/trunk/contrib/async-test/test-server.cpp
    thrift/trunk/contrib/fb303/TClientInfo.cpp
    thrift/trunk/contrib/fb303/TClientInfo.h
    thrift/trunk/contrib/fb303/cpp/FacebookBase.h
    thrift/trunk/contrib/fb303/cpp/ServiceTracker.cpp
    thrift/trunk/contrib/fb303/cpp/ServiceTracker.h
    thrift/trunk/contrib/thrift_dump.cpp
    thrift/trunk/contrib/zeromq/TZmqClient.h
    thrift/trunk/contrib/zeromq/TZmqServer.cpp
    thrift/trunk/contrib/zeromq/TZmqServer.h
    thrift/trunk/contrib/zeromq/test-client.cpp
    thrift/trunk/contrib/zeromq/test-sender.cpp
    thrift/trunk/lib/c_glib/Makefile.am
    thrift/trunk/lib/c_glib/test/testbinaryprotocol.c
    thrift/trunk/lib/c_glib/test/testbufferedtransport.c
    thrift/trunk/lib/c_glib/test/testframedtransport.c
    thrift/trunk/lib/c_glib/test/testmemorybuffer.c
    thrift/trunk/lib/c_glib/test/testoptionalrequired.c
    thrift/trunk/lib/c_glib/test/testsimpleserver.c
    thrift/trunk/lib/c_glib/test/testthrifttest.c
    thrift/trunk/lib/c_glib/test/testthrifttestclient.cpp
    thrift/trunk/lib/c_glib/test/testtransportsocket.c
    thrift/trunk/lib/cpp/Makefile.am
    thrift/trunk/lib/cpp/libthrift.vcxproj
    thrift/trunk/lib/cpp/libthrift.vcxproj.filters
    thrift/trunk/lib/cpp/libthriftnb.vcxproj
    thrift/trunk/lib/cpp/libthriftnb.vcxproj.filters
    thrift/trunk/lib/cpp/test/AllProtocolTests.cpp
    thrift/trunk/lib/cpp/test/AllProtocolTests.tcc
    thrift/trunk/lib/cpp/test/Benchmark.cpp
    thrift/trunk/lib/cpp/test/DebugProtoTest.cpp
    thrift/trunk/lib/cpp/test/DenseProtoTest.cpp
    thrift/trunk/lib/cpp/test/GenericHelpers.h
    thrift/trunk/lib/cpp/test/JSONProtoTest.cpp
    thrift/trunk/lib/cpp/test/OptionalRequiredTest.cpp
    thrift/trunk/lib/cpp/test/RWMutexStarveTest.cpp
    thrift/trunk/lib/cpp/test/SpecializationTest.cpp
    thrift/trunk/lib/cpp/test/TBufferBaseTest.cpp
    thrift/trunk/lib/cpp/test/TFDTransportTest.cpp
    thrift/trunk/lib/cpp/test/TFileTransportTest.cpp
    thrift/trunk/lib/cpp/test/TMemoryBufferTest.cpp
    thrift/trunk/lib/cpp/test/TPipedTransportTest.cpp
    thrift/trunk/lib/cpp/test/ThriftTest_extras.cpp
    thrift/trunk/lib/cpp/test/TransportTest.cpp
    thrift/trunk/lib/cpp/test/ZlibTest.cpp
    thrift/trunk/test/cpp/src/StressTest.cpp
    thrift/trunk/test/cpp/src/StressTestNonBlocking.cpp
    thrift/trunk/test/cpp/src/TestClient.cpp
    thrift/trunk/test/cpp/src/TestServer.cpp
    thrift/trunk/test/threads/ThreadsClient.cpp
    thrift/trunk/test/threads/ThreadsServer.cpp
    thrift/trunk/tutorial/cpp/CppClient.cpp
    thrift/trunk/tutorial/cpp/CppServer.cpp

Modified: thrift/trunk/LICENSE
URL: http://svn.apache.org/viewvc/thrift/trunk/LICENSE?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/LICENSE (original)
+++ thrift/trunk/LICENSE Fri Apr 13 09:12:31 2012
@@ -223,25 +223,25 @@ the Thrift Software License (see doc/old
 under the Apache 2.0 License:
 
   compiler/cpp/Makefile.am
-  compiler/cpp/src/generate/t_cocoa_generator.cc
-  compiler/cpp/src/generate/t_cpp_generator.cc
-  compiler/cpp/src/generate/t_csharp_generator.cc
-  compiler/cpp/src/generate/t_erl_generator.cc
-  compiler/cpp/src/generate/t_hs_generator.cc
-  compiler/cpp/src/generate/t_java_generator.cc
-  compiler/cpp/src/generate/t_ocaml_generator.cc
-  compiler/cpp/src/generate/t_perl_generator.cc
-  compiler/cpp/src/generate/t_php_generator.cc
-  compiler/cpp/src/generate/t_py_generator.cc
-  compiler/cpp/src/generate/t_rb_generator.cc
-  compiler/cpp/src/generate/t_st_generator.cc
-  compiler/cpp/src/generate/t_xsd_generator.cc
-  compiler/cpp/src/main.cc
-  compiler/cpp/src/parse/t_field.h
-  compiler/cpp/src/parse/t_program.h
-  compiler/cpp/src/platform.h
-  compiler/cpp/src/thriftl.ll
-  compiler/cpp/src/thrifty.yy
+  compiler/cpp/src/thrift/generate/t_cocoa_generator.cc
+  compiler/cpp/src/thrift/generate/t_cpp_generator.cc
+  compiler/cpp/src/thrift/generate/t_csharp_generator.cc
+  compiler/cpp/src/thrift/generate/t_erl_generator.cc
+  compiler/cpp/src/thrift/generate/t_hs_generator.cc
+  compiler/cpp/src/thrift/generate/t_java_generator.cc
+  compiler/cpp/src/thrift/generate/t_ocaml_generator.cc
+  compiler/cpp/src/thrift/generate/t_perl_generator.cc
+  compiler/cpp/src/thrift/generate/t_php_generator.cc
+  compiler/cpp/src/thrift/generate/t_py_generator.cc
+  compiler/cpp/src/thrift/generate/t_rb_generator.cc
+  compiler/cpp/src/thrift/generate/t_st_generator.cc
+  compiler/cpp/src/thrift/generate/t_xsd_generator.cc
+  compiler/cpp/src/thrift/main.cc
+  compiler/cpp/src/thrift/parse/t_field.h
+  compiler/cpp/src/thrift/parse/t_program.h
+  compiler/cpp/src/thrift/platform.h
+  compiler/cpp/src/thrift/thriftl.ll
+  compiler/cpp/src/thrift/thrifty.yy
   lib/csharp/src/Protocol/TBinaryProtocol.cs
   lib/csharp/src/Protocol/TField.cs
   lib/csharp/src/Protocol/TList.cs
@@ -289,7 +289,7 @@ For the aclocal/ax_boost_base.m4 and con
 #   the copyright notice and this notice are preserved.
 
 --------------------------------------------------
-For the compiler/cpp/src/md5.[ch] components:
+For the compiler/cpp/src/thrift/md5.[ch] components:
 
 /*
   Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.

Modified: thrift/trunk/compiler/cpp/compiler.vcxproj
URL: http://svn.apache.org/viewvc/thrift/trunk/compiler/cpp/compiler.vcxproj?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/compiler/cpp/compiler.vcxproj (original)
+++ thrift/trunk/compiler/cpp/compiler.vcxproj Fri Apr 13 09:12:31 2012
@@ -19,66 +19,66 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\generate\t_generator.h" />
-    <ClInclude Include="src\generate\t_generator_registry.h" />
-    <ClInclude Include="src\generate\t_oop_generator.h" />
-    <ClInclude Include="src\globals.h" />
-    <ClInclude Include="src\main.h" />
-    <ClInclude Include="src\md5.h" />
-    <ClInclude Include="src\parse\t_base_type.h" />
-    <ClInclude Include="src\parse\t_const.h" />
-    <ClInclude Include="src\parse\t_const_value.h" />
-    <ClInclude Include="src\parse\t_container.h" />
-    <ClInclude Include="src\parse\t_doc.h" />
-    <ClInclude Include="src\parse\t_enum.h" />
-    <ClInclude Include="src\parse\t_enum_value.h" />
-    <ClInclude Include="src\parse\t_field.h" />
-    <ClInclude Include="src\parse\t_function.h" />
-    <ClInclude Include="src\parse\t_list.h" />
-    <ClInclude Include="src\parse\t_map.h" />
-    <ClInclude Include="src\parse\t_program.h" />
-    <ClInclude Include="src\parse\t_scope.h" />
-    <ClInclude Include="src\parse\t_service.h" />
-    <ClInclude Include="src\parse\t_set.h" />
-    <ClInclude Include="src\parse\t_struct.h" />
-    <ClInclude Include="src\parse\t_type.h" />
-    <ClInclude Include="src\parse\t_typedef.h" />
-    <ClInclude Include="src\platform.h" />
-    <ClInclude Include="src\thrifty.h" />
-    <ClInclude Include="src\windows\config.h" />
-    <ClInclude Include="src\windows\version.h" />
+    <ClInclude Include="src\thrift\generate\t_generator.h" />
+    <ClInclude Include="src\thrift\generate\t_generator_registry.h" />
+    <ClInclude Include="src\thrift\generate\t_oop_generator.h" />
+    <ClInclude Include="src\thrift\globals.h" />
+    <ClInclude Include="src\thrift\main.h" />
+    <ClInclude Include="src\thrift\md5.h" />
+    <ClInclude Include="src\thrift\parse\t_base_type.h" />
+    <ClInclude Include="src\thrift\parse\t_const.h" />
+    <ClInclude Include="src\thrift\parse\t_const_value.h" />
+    <ClInclude Include="src\thrift\parse\t_container.h" />
+    <ClInclude Include="src\thrift\parse\t_doc.h" />
+    <ClInclude Include="src\thrift\parse\t_enum.h" />
+    <ClInclude Include="src\thrift\parse\t_enum_value.h" />
+    <ClInclude Include="src\thrift\parse\t_field.h" />
+    <ClInclude Include="src\thrift\parse\t_function.h" />
+    <ClInclude Include="src\thrift\parse\t_list.h" />
+    <ClInclude Include="src\thrift\parse\t_map.h" />
+    <ClInclude Include="src\thrift\parse\t_program.h" />
+    <ClInclude Include="src\thrift\parse\t_scope.h" />
+    <ClInclude Include="src\thrift\parse\t_service.h" />
+    <ClInclude Include="src\thrift\parse\t_set.h" />
+    <ClInclude Include="src\thrift\parse\t_struct.h" />
+    <ClInclude Include="src\thrift\parse\t_type.h" />
+    <ClInclude Include="src\thrift\parse\t_typedef.h" />
+    <ClInclude Include="src\thrift\platform.h" />
+    <ClInclude Include="src\thrift\thrifty.h" />
+    <ClInclude Include="src\thrift\windows\config.h" />
+    <ClInclude Include="src\thrift\windows\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\generate\t_as3_generator.cc" />
-    <ClCompile Include="src\generate\t_cocoa_generator.cc" />
-    <ClCompile Include="src\generate\t_cpp_generator.cc" />
-    <ClCompile Include="src\generate\t_csharp_generator.cc" />
-    <ClCompile Include="src\generate\t_c_glib_generator.cc" />
-    <ClCompile Include="src\generate\t_erl_generator.cc" />
-    <ClCompile Include="src\generate\t_generator.cc" />
-    <ClCompile Include="src\generate\t_go_generator.cc" />
-    <ClCompile Include="src\generate\t_hs_generator.cc" />
-    <ClCompile Include="src\generate\t_html_generator.cc" />
-    <ClCompile Include="src\generate\t_javame_generator.cc" />
-    <ClCompile Include="src\generate\t_java_generator.cc" />
-    <ClCompile Include="src\generate\t_js_generator.cc" />
-    <ClCompile Include="src\generate\t_ocaml_generator.cc" />
-    <ClCompile Include="src\generate\t_perl_generator.cc" />
-    <ClCompile Include="src\generate\t_php_generator.cc" />
-    <ClCompile Include="src\generate\t_py_generator.cc" />
-    <ClCompile Include="src\generate\t_rb_generator.cc" />
-    <ClCompile Include="src\generate\t_st_generator.cc" />
-    <ClCompile Include="src\generate\t_xsd_generator.cc" />
-    <ClCompile Include="src\main.cc" />
-    <ClCompile Include="src\md5.c" />
-    <ClCompile Include="src\parse\parse.cc" />
-    <ClCompile Include="src\thriftl.cc" />
-    <ClCompile Include="src\thrifty.cc" />
+    <ClCompile Include="src\thrift\generate\t_as3_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_cocoa_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_cpp_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_csharp_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_c_glib_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_erl_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_go_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_hs_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_html_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_javame_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_java_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_js_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_ocaml_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_perl_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_php_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_py_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_rb_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_st_generator.cc" />
+    <ClCompile Include="src\thrift\generate\t_xsd_generator.cc" />
+    <ClCompile Include="src\thrift\main.cc" />
+    <ClCompile Include="src\thrift\md5.c" />
+    <ClCompile Include="src\thrift\parse\parse.cc" />
+    <ClCompile Include="src\thrift\thriftl.cc" />
+    <ClCompile Include="src\thrift\thrifty.cc" />
   </ItemGroup>
   <ItemGroup>
     <None Include="README_WINDOWS" />
-    <None Include="src\thriftl.ll" />
-    <None Include="src\thrifty.yy" />
+    <None Include="src\thrift\thriftl.ll" />
+    <None Include="src\thrift\thrifty.yy" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{89975A1A-F799-4556-98B8-64E30AB39A90}</ProjectGuid>
@@ -126,25 +126,25 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
     <TargetName>thrift</TargetName>
     <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
     <TargetName>thrift</TargetName>
     <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
     <TargetName>thrift</TargetName>
     <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
     <TargetName>thrift</TargetName>
     <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
   </PropertyGroup>
@@ -163,8 +163,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PreBuildEvent>
-      <Command>flex -o "src/thriftl.cc" src/thriftl.ll
-bison -y -o "src/thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
+      <Command>flex -o "src\thrift\thriftl.cc" src/thriftl.ll
+bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -182,8 +182,8 @@ bison -y -o "src/thrifty.cc" --defines="
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PreBuildEvent>
-      <Command>flex -o "src/thriftl.cc" src/thriftl.ll
-bison -y -o "src/thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
+      <Command>flex -o "src\thrift\thriftl.cc" src/thriftl.ll
+bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -205,8 +205,8 @@ bison -y -o "src/thrifty.cc" --defines="
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>flex -o "src/thriftl.cc" src/thriftl.ll
-bison -y -o "src/thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
+      <Command>flex -o "src\thrift\thriftl.cc" src/thriftl.ll
+bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -228,8 +228,8 @@ bison -y -o "src/thrifty.cc" --defines="
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>flex -o "src/thriftl.cc" src/thriftl.ll
-bison -y -o "src/thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
+      <Command>flex -o "src\thrift\thriftl.cc" src/thriftl.ll
+bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Modified: thrift/trunk/compiler/cpp/src/generate/t_c_glib_generator.cc
URL: http://svn.apache.org/viewvc/thrift/trunk/compiler/cpp/src/generate/t_c_glib_generator.cc?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/compiler/cpp/src/generate/t_c_glib_generator.cc (original)
+++ thrift/trunk/compiler/cpp/src/generate/t_c_glib_generator.cc Fri Apr 13 09:12:31 2012
@@ -186,7 +186,7 @@ void t_c_glib_generator::init_generator(
     "/* base includes */" << endl <<
     "#include <glib-object.h>" << endl <<
     "#include <thrift_struct.h>" << endl <<
-    "#include <protocol/thrift_protocol.h>" << endl;
+    "#include <thrift/protocol/thrift_protocol.h>" << endl;
 
   /* include other thrift includes */
   const vector<t_program *> &includes = program_->get_includes();
@@ -217,7 +217,7 @@ void t_c_glib_generator::init_generator(
     endl <<
     "#include \"" << this->nspace_lc << program_name_u << 
         "_types.h\"" << endl <<
-    "#include <thrift.h>" << endl <<
+    "#include <thrift/thrift.h>" << endl <<
     endl;
 
   f_types_ <<
@@ -410,7 +410,7 @@ void t_c_glib_generator::generate_servic
   // include the headers
   f_service_ <<
     "#include <string.h>" << endl <<
-    "#include <thrift.h>" << endl <<
+    "#include <thrift/thrift.h>" << endl <<
     "#include <thrift_application_exception.h>" << endl <<
     "#include \"" << filename << ".h\"" << endl <<
     endl;

Modified: thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc
URL: http://svn.apache.org/viewvc/thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc (original)
+++ thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc Fri Apr 13 09:12:31 2012
@@ -343,10 +343,10 @@ void t_cpp_generator::init_generator() {
 
   // Include base types
   f_types_ <<
-    "#include <Thrift.h>" << endl <<
-    "#include <TApplicationException.h>" << endl <<
-    "#include <protocol/TProtocol.h>" << endl <<
-    "#include <transport/TTransport.h>" << endl <<
+    "#include <thrift/Thrift.h>" << endl <<
+    "#include <thrift/TApplicationException.h>" << endl <<
+    "#include <thrift/protocol/TProtocol.h>" << endl <<
+    "#include <thrift/transport/TTransport.h>" << endl <<
     endl;
 
   // Include other Thrift includes
@@ -392,7 +392,7 @@ void t_cpp_generator::init_generator() {
   // the definition of TypeSpec.
   if (gen_dense_) {
     f_types_impl_ <<
-      "#include <TReflectionLocal.h>" << endl <<
+      "#include <thrift/TReflectionLocal.h>" << endl <<
       endl;
   }
 
@@ -1571,17 +1571,17 @@ void t_cpp_generator::generate_service(t
     endl;
   if (gen_cob_style_) {
     f_header_ <<
-      "#include <transport/TBufferTransports.h>" << endl << // TMemoryBuffer
+      "#include <thrift/transport/TBufferTransports.h>" << endl << // TMemoryBuffer
       "#include <tr1/functional>" << endl <<
       "namespace apache { namespace thrift { namespace async {" << endl <<
       "class TAsyncChannel;" << endl <<
       "}}}" << endl;
   }
   f_header_ <<
-    "#include <TDispatchProcessor.h>" << endl;
+    "#include <thrift/TDispatchProcessor.h>" << endl;
   if (gen_cob_style_) {
     f_header_ <<
-      "#include <async/TAsyncDispatchProcessor.h>" << endl;
+      "#include <thrift/async/TAsyncDispatchProcessor.h>" << endl;
   }
   f_header_ <<
     "#include \"" << get_include_prefix(*get_program()) << program_name_ <<
@@ -1608,7 +1608,7 @@ void t_cpp_generator::generate_service(t
     "#include \"" << get_include_prefix(*get_program()) << svcname << ".h\"" << endl;
   if (gen_cob_style_) {
     f_service_ <<
-      "#include \"async/TAsyncChannel.h\"" << endl;
+      "#include \"thrift/async/TAsyncChannel.h\"" << endl;
   }
   if (gen_templates_) {
     f_service_ <<
@@ -1630,7 +1630,7 @@ void t_cpp_generator::generate_service(t
 
     if (gen_cob_style_) {
       f_service_tcc_ <<
-        "#include \"async/TAsyncChannel.h\"" << endl;
+        "#include \"thrift/async/TAsyncChannel.h\"" << endl;
     }
   }
 
@@ -1974,8 +1974,8 @@ void t_cpp_generator::generate_service_a
     "// that would otherwise introduce unwanted latency." << endl <<
     endl <<
     "#include \"" << get_include_prefix(*get_program()) << svcname << ".h\"" << endl <<
-    "#include <protocol/TBinaryProtocol.h>" << endl <<
-    "#include <async/TEventServer.h>" << endl <<
+    "#include <thrift/protocol/TBinaryProtocol.h>" << endl <<
+    "#include <thrift/async/TEventServer.h>" << endl <<
     endl <<
     "using namespace ::apache::thrift;" << endl <<
     "using namespace ::apache::thrift::protocol;" << endl <<
@@ -3703,10 +3703,10 @@ void t_cpp_generator::generate_service_s
     "// You should copy it to another filename to avoid overwriting it." << endl <<
     endl <<
     "#include \"" << get_include_prefix(*get_program()) << svcname << ".h\"" << endl <<
-    "#include <protocol/TBinaryProtocol.h>" << endl <<
-    "#include <server/TSimpleServer.h>" << endl <<
-    "#include <transport/TServerSocket.h>" << endl <<
-    "#include <transport/TBufferTransports.h>" << endl <<
+    "#include <thrift/protocol/TBinaryProtocol.h>" << endl <<
+    "#include <thrift/server/TSimpleServer.h>" << endl <<
+    "#include <thrift/transport/TServerSocket.h>" << endl <<
+    "#include <thrift/transport/TBufferTransports.h>" << endl <<
     endl <<
     "using namespace ::apache::thrift;" << endl <<
     "using namespace ::apache::thrift::protocol;" << endl <<

Modified: thrift/trunk/contrib/async-test/test-server.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/contrib/async-test/test-server.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/contrib/async-test/test-server.cpp (original)
+++ thrift/trunk/contrib/async-test/test-server.cpp Fri Apr 13 09:12:31 2012
@@ -1,8 +1,8 @@
 #include <tr1/functional>
-#include "protocol/TBinaryProtocol.h"
-#include "async/TAsyncProtocolProcessor.h"
-#include "async/TEvhttpServer.h"
-#include "async/TEvhttpClientChannel.h"
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/async/TAsyncProtocolProcessor.h>
+#include <thrift/async/TEvhttpServer.h>
+#include <thrift/async/TEvhttpClientChannel.h>
 #include "Aggr.h"
 
 using std::tr1::bind;

Modified: thrift/trunk/contrib/fb303/TClientInfo.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/contrib/fb303/TClientInfo.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/contrib/fb303/TClientInfo.cpp (original)
+++ thrift/trunk/contrib/fb303/TClientInfo.cpp Fri Apr 13 09:12:31 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <server/TClientInfo.h>
+#include <thrift/server/TClientInfo.h>
 
 namespace apache { namespace thrift { namespace server {
 

Modified: thrift/trunk/contrib/fb303/TClientInfo.h
URL: http://svn.apache.org/viewvc/thrift/trunk/contrib/fb303/TClientInfo.h?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/contrib/fb303/TClientInfo.h (original)
+++ thrift/trunk/contrib/fb303/TClientInfo.h Fri Apr 13 09:12:31 2012
@@ -22,9 +22,9 @@
 
 // for inet_ntop --
 #include <arpa/inet.h>
-#include <server/TServer.h>
-#include <transport/TSocket.h>
-#include <concurrency/Mutex.h>
+#include <thrift/server/TServer.h>
+#include <thrift/transport/TSocket.h>
+#include <thrift/concurrency/Mutex.h>
 
 namespace apache { namespace thrift { namespace server {
 

Modified: thrift/trunk/contrib/fb303/cpp/FacebookBase.h
URL: http://svn.apache.org/viewvc/thrift/trunk/contrib/fb303/cpp/FacebookBase.h?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/contrib/fb303/cpp/FacebookBase.h (original)
+++ thrift/trunk/contrib/fb303/cpp/FacebookBase.h Fri Apr 13 09:12:31 2012
@@ -22,8 +22,8 @@
 
 #include "FacebookService.h"
 
-#include "server/TServer.h"
-#include "concurrency/Mutex.h"
+#include <thrift/server/TServer.h>
+#include <thrift/concurrency/Mutex.h>
 
 #include <time.h>
 #include <string>

Modified: thrift/trunk/contrib/fb303/cpp/ServiceTracker.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/contrib/fb303/cpp/ServiceTracker.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/contrib/fb303/cpp/ServiceTracker.cpp (original)
+++ thrift/trunk/contrib/fb303/cpp/ServiceTracker.cpp Fri Apr 13 09:12:31 2012
@@ -21,7 +21,7 @@
 
 #include "FacebookBase.h"
 #include "ServiceTracker.h"
-#include "concurrency/ThreadManager.h"
+#include <thrift/concurrency/ThreadManager.h>
 
 using namespace std;
 using namespace facebook::fb303;

Modified: thrift/trunk/contrib/fb303/cpp/ServiceTracker.h
URL: http://svn.apache.org/viewvc/thrift/trunk/contrib/fb303/cpp/ServiceTracker.h?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/contrib/fb303/cpp/ServiceTracker.h (original)
+++ thrift/trunk/contrib/fb303/cpp/ServiceTracker.h Fri Apr 13 09:12:31 2012
@@ -100,7 +100,7 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
 
-#include "concurrency/Mutex.h"
+#include <thrift/concurrency/Mutex.h>
 
 
 namespace apache { namespace thrift { namespace concurrency {

Modified: thrift/trunk/contrib/thrift_dump.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/contrib/thrift_dump.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/contrib/thrift_dump.cpp (original)
+++ thrift/trunk/contrib/thrift_dump.cpp Fri Apr 13 09:12:31 2012
@@ -20,11 +20,11 @@
 #include <cstdlib>
 #include <iostream>
 
-#include <transport/TBufferTransports.h>
-#include <transport/TFDTransport.h>
-#include <protocol/TBinaryProtocol.h>
-#include <protocol/TDebugProtocol.h>
-#include <protocol/TProtocolTap.h>
+#include <thrift/transport/TBufferTransports.h>
+#include <thrift/transport/TFDTransport.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/protocol/TDebugProtocol.h>
+#include <thrift/protocol/TProtocolTap.h>
 
 using namespace std;
 using boost::shared_ptr;

Modified: thrift/trunk/contrib/zeromq/TZmqClient.h
URL: http://svn.apache.org/viewvc/thrift/trunk/contrib/zeromq/TZmqClient.h?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/contrib/zeromq/TZmqClient.h (original)
+++ thrift/trunk/contrib/zeromq/TZmqClient.h Fri Apr 13 09:12:31 2012
@@ -21,7 +21,7 @@
 #define _THRIFT_TRANSPORT_TZMQCLIENT_H_ 1
 
 #include <zmq.hpp>
-#include <transport/TBufferTransports.h>
+#include <thrift/transport/TBufferTransports.h>
 
 namespace apache { namespace thrift { namespace transport {
 

Modified: thrift/trunk/contrib/zeromq/TZmqServer.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/contrib/zeromq/TZmqServer.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/contrib/zeromq/TZmqServer.cpp (original)
+++ thrift/trunk/contrib/zeromq/TZmqServer.cpp Fri Apr 13 09:12:31 2012
@@ -18,7 +18,7 @@
  */
 
 #include "TZmqServer.h"
-#include <transport/TBufferTransports.h>
+#include <thrift/transport/TBufferTransports.h>
 #include <boost/scoped_ptr.hpp>
 
 using boost::shared_ptr;

Modified: thrift/trunk/contrib/zeromq/TZmqServer.h
URL: http://svn.apache.org/viewvc/thrift/trunk/contrib/zeromq/TZmqServer.h?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/contrib/zeromq/TZmqServer.h (original)
+++ thrift/trunk/contrib/zeromq/TZmqServer.h Fri Apr 13 09:12:31 2012
@@ -21,7 +21,7 @@
 #define _THRIFT_SERVER_TZMQSERVER_H_ 1
 
 #include <zmq.hpp>
-#include <server/TServer.h>
+#include <thrift/server/TServer.h>
 
 namespace apache { namespace thrift { namespace server {
 

Modified: thrift/trunk/contrib/zeromq/test-client.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/contrib/zeromq/test-client.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/contrib/zeromq/test-client.cpp (original)
+++ thrift/trunk/contrib/zeromq/test-client.cpp Fri Apr 13 09:12:31 2012
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <cstdlib>
-#include <protocol/TBinaryProtocol.h>
+#include <thrift/protocol/TBinaryProtocol.h>
 
 #include "zmq.hpp"
 #include "TZmqClient.h"

Modified: thrift/trunk/contrib/zeromq/test-sender.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/contrib/zeromq/test-sender.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/contrib/zeromq/test-sender.cpp (original)
+++ thrift/trunk/contrib/zeromq/test-sender.cpp Fri Apr 13 09:12:31 2012
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <cstdlib>
-#include <protocol/TBinaryProtocol.h>
+#include <thrift/protocol/TBinaryProtocol.h>
 
 #include "zmq.hpp"
 #include "TZmqClient.h"

Modified: thrift/trunk/lib/c_glib/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/Makefile.am?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/Makefile.am (original)
+++ thrift/trunk/lib/c_glib/Makefile.am Fri Apr 13 09:12:31 2012
@@ -24,7 +24,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 lib_LTLIBRARIES = libthrift_c_glib.la
 pkgconfig_DATA = thrift_c_glib.pc
 
-common_cflags = -g -Wall -W -Werror -Isrc $(GLIB_CFLAGS)
+common_cflags = -g -Wall -W -Werror -Isrc -I src/thrift $(GLIB_CFLAGS)
 common_ldflags = -g -Wall -W $(GLIB_LDFLAGS) @GCOV_LDFLAGS@
 
 # this removes optimizations and adds coverage flags
@@ -32,56 +32,56 @@ CFLAGS = @GCOV_CFLAGS@
 
 # Define the source files for the module
 
-libthrift_c_glib_la_SOURCES = src/thrift.c \
-                              src/thrift_struct.c \
-                              src/thrift_application_exception.c \
-                              src/processor/thrift_processor.c \
-                              src/protocol/thrift_protocol.c \
-                              src/protocol/thrift_protocol_factory.c \
-                              src/protocol/thrift_binary_protocol.c \
-                              src/protocol/thrift_binary_protocol_factory.c \
-                              src/transport/thrift_transport.c \
-                              src/transport/thrift_transport_factory.c \
-                              src/transport/thrift_socket.c \
-                              src/transport/thrift_server_transport.c \
-                              src/transport/thrift_server_socket.c \
-                              src/transport/thrift_buffered_transport.c \
-                              src/transport/thrift_framed_transport.c \
-                              src/transport/thrift_memory_buffer.c \
-                              src/server/thrift_server.c \
-                              src/server/thrift_simple_server.c
+libthrift_c_glib_la_SOURCES = src/thrift/thrift.c \
+                              src/thrift/thrift_struct.c \
+                              src/thrift/thrift_application_exception.c \
+                              src/thrift/processor/thrift_processor.c \
+                              src/thrift/protocol/thrift_protocol.c \
+                              src/thrift/protocol/thrift_protocol_factory.c \
+                              src/thrift/protocol/thrift_binary_protocol.c \
+                              src/thrift/protocol/thrift_binary_protocol_factory.c \
+                              src/thrift/transport/thrift_transport.c \
+                              src/thrift/transport/thrift_transport_factory.c \
+                              src/thrift/transport/thrift_socket.c \
+                              src/thrift/transport/thrift_server_transport.c \
+                              src/thrift/transport/thrift_server_socket.c \
+                              src/thrift/transport/thrift_buffered_transport.c \
+                              src/thrift/transport/thrift_framed_transport.c \
+                              src/thrift/transport/thrift_memory_buffer.c \
+                              src/thrift/server/thrift_server.c \
+                              src/thrift/server/thrift_simple_server.c
 
 libthrift_c_glib_la_CFLAGS = $(common_cflags)
 
 include_thriftdir = $(includedir)/thrift/c_glib
 include_thrift_HEADERS = \
                          $(top_builddir)/config.h \
-                         src/thrift.h \
-                         src/thrift_application_exception.h \
-                         src/thrift_struct.h
+                         src/thrift/thrift.h \
+                         src/thrift/thrift_application_exception.h \
+                         src/thrift/thrift_struct.h
 
 include_protocoldir = $(include_thriftdir)/protocol
-include_protocol_HEADERS = src/protocol/thrift_protocol.h \
-                           src/protocol/thrift_protocol_factory.h \
-                           src/protocol/thrift_binary_protocol.h \
-                           src/protocol/thrift_binary_protocol_factory.h
+include_protocol_HEADERS = src/thrift/protocol/thrift_protocol.h \
+                           src/thrift/protocol/thrift_protocol_factory.h \
+                           src/thrift/protocol/thrift_binary_protocol.h \
+                           src/thrift/protocol/thrift_binary_protocol_factory.h
 
 include_transportdir = $(include_thriftdir)/transport
-include_transport_HEADERS = src/transport/thrift_buffered_transport.h \
-                            src/transport/thrift_framed_transport.h \
-                            src/transport/thrift_memory_buffer.h \
-                            src/transport/thrift_server_socket.h \
-                            src/transport/thrift_server_transport.h \
-                            src/transport/thrift_socket.h \
-                            src/transport/thrift_transport.h \
-                            src/transport/thrift_transport_factory.h
+include_transport_HEADERS = src/thrift/transport/thrift_buffered_transport.h \
+                            src/thrift/transport/thrift_framed_transport.h \
+                            src/thrift/transport/thrift_memory_buffer.h \
+                            src/thrift/transport/thrift_server_socket.h \
+                            src/thrift/transport/thrift_server_transport.h \
+                            src/thrift/transport/thrift_socket.h \
+                            src/thrift/transport/thrift_transport.h \
+                            src/thrift/transport/thrift_transport_factory.h
 
 include_serverdir = $(include_thriftdir)/server
-include_server_HEADERS = src/server/thrift_server.h \
-                         src/server/thrift_simple_server.h
+include_server_HEADERS = src/thrift/server/thrift_server.h \
+                         src/thrift/server/thrift_simple_server.h
 
 include_processordir = $(include_thriftdir)/processor
-include_processor_HEADERS = src/processor/thrift_processor.h
+include_processor_HEADERS = src/thrift/processor/thrift_processor.h
 
 
 EXTRA_DIST = \

Copied: thrift/trunk/lib/c_glib/src/thrift/processor/thrift_processor.c (from r1325048, thrift/trunk/lib/c_glib/src/processor/thrift_processor.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/processor/thrift_processor.c?p2=thrift/trunk/lib/c_glib/src/thrift/processor/thrift_processor.c&p1=thrift/trunk/lib/c_glib/src/processor/thrift_processor.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/processor/thrift_processor.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/processor/thrift_processor.c Fri Apr 13 09:12:31 2012
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include "thrift.h"
-#include "processor/thrift_processor.h"
+#include <thrift/thrift.h>
+#include <thrift/processor/thrift_processor.h>
 
 G_DEFINE_ABSTRACT_TYPE(ThriftProcessor, thrift_processor, G_TYPE_OBJECT)
 

Copied: thrift/trunk/lib/c_glib/src/thrift/processor/thrift_processor.h (from r1325048, thrift/trunk/lib/c_glib/src/processor/thrift_processor.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/processor/thrift_processor.h?p2=thrift/trunk/lib/c_glib/src/thrift/processor/thrift_processor.h&p1=thrift/trunk/lib/c_glib/src/processor/thrift_processor.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/processor/thrift_processor.h (original)
+++ thrift/trunk/lib/c_glib/src/thrift/processor/thrift_processor.h Fri Apr 13 09:12:31 2012
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include "protocol/thrift_protocol.h"
+#include <thrift/protocol/thrift_protocol.h>
 
 G_BEGIN_DECLS
 

Copied: thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.c (from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.c?p2=thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.c&p1=thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.c Fri Apr 13 09:12:31 2012
@@ -20,9 +20,9 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "thrift.h"
-#include "protocol/thrift_protocol.h"
-#include "protocol/thrift_binary_protocol.h"
+#include <thrift/thrift.h>
+#include <thrift/protocol/thrift_protocol.h>
+#include <thrift/protocol/thrift_binary_protocol.h>
 
 G_DEFINE_TYPE(ThriftBinaryProtocol, thrift_binary_protocol, THRIFT_TYPE_PROTOCOL)
 

Copied: thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.h (from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.h?p2=thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.h&p1=thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol.h (original)
+++ thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.h Fri Apr 13 09:12:31 2012
@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 
-#include "protocol/thrift_protocol.h"
-#include "transport/thrift_transport.h"
+#include <thrift/protocol/thrift_protocol.h>
+#include <thrift/transport/thrift_transport.h>
 
 G_BEGIN_DECLS
 

Copied: thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.c (from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol_factory.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.c?p2=thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.c&p1=thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol_factory.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol_factory.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.c Fri Apr 13 09:12:31 2012
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-#include "thrift.h"
-#include "protocol/thrift_binary_protocol.h"
-#include "protocol/thrift_binary_protocol_factory.h"
+#include <thrift/thrift.h>
+#include <thrift/protocol/thrift_binary_protocol.h>
+#include <thrift/protocol/thrift_binary_protocol_factory.h>
 
 G_DEFINE_TYPE(ThriftBinaryProtocolFactory, thrift_binary_protocol_factory, THRIFT_TYPE_PROTOCOL_FACTORY)
 

Copied: thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.h (from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol_factory.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.h?p2=thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.h&p1=thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol_factory.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/protocol/thrift_binary_protocol_factory.h (original)
+++ thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.h Fri Apr 13 09:12:31 2012
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include "protocol/thrift_protocol_factory.h"
+#include <thrift/protocol/thrift_protocol_factory.h>
 
 G_BEGIN_DECLS
 

Copied: thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol.c (from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_protocol.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol.c?p2=thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol.c&p1=thrift/trunk/lib/c_glib/src/protocol/thrift_protocol.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/protocol/thrift_protocol.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol.c Fri Apr 13 09:12:31 2012
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-#include "thrift.h"
-#include "protocol/thrift_protocol.h"
-#include "transport/thrift_transport.h"
+#include <thrift/thrift.h>
+#include <thrift/protocol/thrift_protocol.h>
+#include <thrift/transport/thrift_transport.h>
 
 /* define the GError domain string */
 #define THRIFT_PROTOCOL_ERROR_DOMAIN "thrift-protocol-error-quark"

Copied: thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol.h (from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_protocol.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol.h?p2=thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol.h&p1=thrift/trunk/lib/c_glib/src/protocol/thrift_protocol.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/protocol/thrift_protocol.h (original)
+++ thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol.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/protocol/thrift_protocol_factory.c (from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_protocol_factory.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.c?p2=thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.c&p1=thrift/trunk/lib/c_glib/src/protocol/thrift_protocol_factory.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/protocol/thrift_protocol_factory.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.c Fri Apr 13 09:12:31 2012
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include "thrift.h"
-#include "protocol/thrift_protocol_factory.h"
+#include <thrift/thrift.h>
+#include <thrift/protocol/thrift_protocol_factory.h>
 
 G_DEFINE_ABSTRACT_TYPE(ThriftProtocolFactory, thrift_protocol_factory, G_TYPE_OBJECT)
 

Copied: thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.h (from r1325048, thrift/trunk/lib/c_glib/src/protocol/thrift_protocol_factory.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.h?p2=thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.h&p1=thrift/trunk/lib/c_glib/src/protocol/thrift_protocol_factory.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/protocol/thrift_protocol_factory.h (original)
+++ thrift/trunk/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.h Fri Apr 13 09:12:31 2012
@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 
-#include "transport/thrift_transport.h"
-#include "protocol/thrift_protocol.h"
+#include <thrift/transport/thrift_transport.h>
+#include <thrift/protocol/thrift_protocol.h>
 
 G_BEGIN_DECLS
 

Copied: thrift/trunk/lib/c_glib/src/thrift/server/thrift_server.c (from r1325048, thrift/trunk/lib/c_glib/src/server/thrift_server.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/server/thrift_server.c?p2=thrift/trunk/lib/c_glib/src/thrift/server/thrift_server.c&p1=thrift/trunk/lib/c_glib/src/server/thrift_server.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/server/thrift_server.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/server/thrift_server.c Fri Apr 13 09:12:31 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "thrift.h"
+#include <thrift/thrift.h>
 #include "thrift_server.h"
 
 /* object properties */

Copied: thrift/trunk/lib/c_glib/src/thrift/server/thrift_server.h (from r1325048, thrift/trunk/lib/c_glib/src/server/thrift_server.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/server/thrift_server.h?p2=thrift/trunk/lib/c_glib/src/thrift/server/thrift_server.h&p1=thrift/trunk/lib/c_glib/src/server/thrift_server.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/server/thrift_server.h (original)
+++ thrift/trunk/lib/c_glib/src/thrift/server/thrift_server.h Fri Apr 13 09:12:31 2012
@@ -22,10 +22,10 @@
 
 #include <glib-object.h>
 
-#include "processor/thrift_processor.h"
-#include "transport/thrift_server_transport.h"
-#include "transport/thrift_transport_factory.h"
-#include "protocol/thrift_protocol_factory.h"
+#include <thrift/processor/thrift_processor.h>
+#include <thrift/transport/thrift_server_transport.h>
+#include <thrift/transport/thrift_transport_factory.h>
+#include <thrift/protocol/thrift_protocol_factory.h>
 
 G_BEGIN_DECLS
 

Copied: thrift/trunk/lib/c_glib/src/thrift/server/thrift_simple_server.c (from r1325048, thrift/trunk/lib/c_glib/src/server/thrift_simple_server.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/server/thrift_simple_server.c?p2=thrift/trunk/lib/c_glib/src/thrift/server/thrift_simple_server.c&p1=thrift/trunk/lib/c_glib/src/server/thrift_simple_server.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/server/thrift_simple_server.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/server/thrift_simple_server.c Fri Apr 13 09:12:31 2012
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-#include "server/thrift_simple_server.h"
-#include "transport/thrift_transport_factory.h"
-#include "protocol/thrift_protocol_factory.h"
-#include "protocol/thrift_binary_protocol_factory.h"
+#include <thrift/server/thrift_simple_server.h>
+#include <thrift/transport/thrift_transport_factory.h>
+#include <thrift/protocol/thrift_protocol_factory.h>
+#include <thrift/protocol/thrift_binary_protocol_factory.h>
 
 G_DEFINE_TYPE(ThriftSimpleServer, thrift_simple_server, THRIFT_TYPE_SERVER)
 

Copied: thrift/trunk/lib/c_glib/src/thrift/server/thrift_simple_server.h (from r1325048, thrift/trunk/lib/c_glib/src/server/thrift_simple_server.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/server/thrift_simple_server.h?p2=thrift/trunk/lib/c_glib/src/thrift/server/thrift_simple_server.h&p1=thrift/trunk/lib/c_glib/src/server/thrift_simple_server.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/server/thrift_simple_server.h (original)
+++ thrift/trunk/lib/c_glib/src/thrift/server/thrift_simple_server.h Fri Apr 13 09:12:31 2012
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include "server/thrift_server.h"
+#include <thrift/server/thrift_server.h>
 
 G_BEGIN_DECLS
 

Copied: thrift/trunk/lib/c_glib/src/thrift/thrift.c (from r1325048, thrift/trunk/lib/c_glib/src/thrift.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/thrift.c?p2=thrift/trunk/lib/c_glib/src/thrift/thrift.c&p1=thrift/trunk/lib/c_glib/src/thrift.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/thrift.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/thrift.c Fri Apr 13 09:12:31 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "thrift.h"
+#include <thrift/thrift.h>
 
 /**
  * GHashTable callback to add keys to a GList.

Copied: thrift/trunk/lib/c_glib/src/thrift/thrift.h (from r1325048, thrift/trunk/lib/c_glib/src/thrift.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/thrift.h?p2=thrift/trunk/lib/c_glib/src/thrift/thrift.h&p1=thrift/trunk/lib/c_glib/src/thrift.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
    (empty)

Copied: thrift/trunk/lib/c_glib/src/thrift/thrift_application_exception.c (from r1325048, thrift/trunk/lib/c_glib/src/thrift_application_exception.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/thrift_application_exception.c?p2=thrift/trunk/lib/c_glib/src/thrift/thrift_application_exception.c&p1=thrift/trunk/lib/c_glib/src/thrift_application_exception.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/thrift_application_exception.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/thrift_application_exception.c Fri Apr 13 09:12:31 2012
@@ -18,7 +18,7 @@
  */
 
 #include "thrift_application_exception.h"
-#include "protocol/thrift_protocol.h"
+#include <thrift/protocol/thrift_protocol.h>
 
 G_DEFINE_TYPE(ThriftApplicationException, thrift_application_exception, THRIFT_TYPE_STRUCT)
 

Copied: thrift/trunk/lib/c_glib/src/thrift/thrift_application_exception.h (from r1325048, thrift/trunk/lib/c_glib/src/thrift_application_exception.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/thrift_application_exception.h?p2=thrift/trunk/lib/c_glib/src/thrift/thrift_application_exception.h&p1=thrift/trunk/lib/c_glib/src/thrift_application_exception.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
    (empty)

Copied: thrift/trunk/lib/c_glib/src/thrift/thrift_struct.c (from r1325048, thrift/trunk/lib/c_glib/src/thrift_struct.c)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/thrift_struct.c?p2=thrift/trunk/lib/c_glib/src/thrift/thrift_struct.c&p1=thrift/trunk/lib/c_glib/src/thrift_struct.c&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/thrift_struct.c (original)
+++ thrift/trunk/lib/c_glib/src/thrift/thrift_struct.c Fri Apr 13 09:12:31 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "thrift.h"
+#include <thrift/thrift.h>
 #include "thrift_struct.h"
 
 G_DEFINE_ABSTRACT_TYPE(ThriftStruct, thrift_struct, G_TYPE_OBJECT)

Copied: thrift/trunk/lib/c_glib/src/thrift/thrift_struct.h (from r1325048, thrift/trunk/lib/c_glib/src/thrift_struct.h)
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/src/thrift/thrift_struct.h?p2=thrift/trunk/lib/c_glib/src/thrift/thrift_struct.h&p1=thrift/trunk/lib/c_glib/src/thrift_struct.h&r1=1325048&r2=1325674&rev=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/src/thrift_struct.h (original)
+++ thrift/trunk/lib/c_glib/src/thrift/thrift_struct.h Fri Apr 13 09:12:31 2012
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include "protocol/thrift_protocol.h"
+#include <thrift/protocol/thrift_protocol.h>
 
 G_BEGIN_DECLS