THRIFT-270: change cpp namespaces from facebook::thrift to apache::thrift
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@739644 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/transport/TBufferTransports.cpp b/lib/cpp/src/transport/TBufferTransports.cpp
index 1583014..8829b48 100644
--- a/lib/cpp/src/transport/TBufferTransports.cpp
+++ b/lib/cpp/src/transport/TBufferTransports.cpp
@@ -11,7 +11,7 @@
using std::string;
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
uint32_t TBufferedTransport::readSlow(uint8_t* buf, uint32_t len) {
@@ -354,4 +354,4 @@
return NULL;
}
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
diff --git a/lib/cpp/src/transport/TBufferTransports.h b/lib/cpp/src/transport/TBufferTransports.h
index 334ad51..f0298df 100644
--- a/lib/cpp/src/transport/TBufferTransports.h
+++ b/lib/cpp/src/transport/TBufferTransports.h
@@ -20,7 +20,7 @@
#define TDB_UNLIKELY(val) (val)
#endif
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
/**
@@ -660,6 +660,6 @@
// you add new members.
};
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
#endif // #ifndef _THRIFT_TRANSPORT_TBUFFERTRANSPORTS_H_
diff --git a/lib/cpp/src/transport/TFDTransport.cpp b/lib/cpp/src/transport/TFDTransport.cpp
index bbdcb19..dbc7e4e 100644
--- a/lib/cpp/src/transport/TFDTransport.cpp
+++ b/lib/cpp/src/transport/TFDTransport.cpp
@@ -13,7 +13,7 @@
using namespace std;
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
void TFDTransport::close() {
if (!isOpen()) {
@@ -61,4 +61,4 @@
}
}
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
diff --git a/lib/cpp/src/transport/TFDTransport.h b/lib/cpp/src/transport/TFDTransport.h
index 7cb6140..56408ca 100644
--- a/lib/cpp/src/transport/TFDTransport.h
+++ b/lib/cpp/src/transport/TFDTransport.h
@@ -13,7 +13,7 @@
#include "TTransport.h"
#include "TServerSocket.h"
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
/**
* Dead-simple wrapper around a file descriptor.
@@ -56,6 +56,6 @@
ClosePolicy close_policy_;
};
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
#endif // #ifndef _THRIFT_TRANSPORT_TFDTRANSPORT_H_
diff --git a/lib/cpp/src/transport/TFileTransport.cpp b/lib/cpp/src/transport/TFileTransport.cpp
index 121b4df..3bc2b91 100644
--- a/lib/cpp/src/transport/TFileTransport.cpp
+++ b/lib/cpp/src/transport/TFileTransport.cpp
@@ -28,11 +28,11 @@
#include <iostream>
#include <sys/stat.h>
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
using boost::shared_ptr;
using namespace std;
-using namespace facebook::thrift::protocol;
+using namespace apache::thrift::protocol;
#ifndef HAVE_CLOCK_GETTIME
@@ -938,4 +938,4 @@
}
}
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
diff --git a/lib/cpp/src/transport/TFileTransport.h b/lib/cpp/src/transport/TFileTransport.h
index c4c921e..66f17d3 100644
--- a/lib/cpp/src/transport/TFileTransport.h
+++ b/lib/cpp/src/transport/TFileTransport.h
@@ -16,10 +16,10 @@
#include <boost/shared_ptr.hpp>
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
-using facebook::thrift::TProcessor;
-using facebook::thrift::protocol::TProtocolFactory;
+using apache::thrift::TProcessor;
+using apache::thrift::protocol::TProtocolFactory;
// Data pertaining to a single event
typedef struct eventInfo {
@@ -424,6 +424,6 @@
};
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
#endif // _THRIFT_TRANSPORT_TFILETRANSPORT_H_
diff --git a/lib/cpp/src/transport/THttpClient.cpp b/lib/cpp/src/transport/THttpClient.cpp
index 8c82d7f..fffb4bd 100644
--- a/lib/cpp/src/transport/THttpClient.cpp
+++ b/lib/cpp/src/transport/THttpClient.cpp
@@ -10,7 +10,7 @@
#include "THttpClient.h"
#include "TSocket.h"
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
using namespace std;
@@ -333,4 +333,4 @@
readHeaders_ = true;
}
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
diff --git a/lib/cpp/src/transport/THttpClient.h b/lib/cpp/src/transport/THttpClient.h
index dbffe99..b0fa28e 100644
--- a/lib/cpp/src/transport/THttpClient.h
+++ b/lib/cpp/src/transport/THttpClient.h
@@ -9,7 +9,7 @@
#include <transport/TBufferTransports.h>
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
/**
* HTTP client implementation of the thrift transport. This was irritating
@@ -94,6 +94,6 @@
};
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
#endif // #ifndef _THRIFT_TRANSPORT_THTTPCLIENT_H_
diff --git a/lib/cpp/src/transport/TServerSocket.cpp b/lib/cpp/src/transport/TServerSocket.cpp
index 3493fc0..69f5217 100644
--- a/lib/cpp/src/transport/TServerSocket.cpp
+++ b/lib/cpp/src/transport/TServerSocket.cpp
@@ -18,7 +18,7 @@
#include "TServerSocket.h"
#include <boost/shared_ptr.hpp>
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
using namespace std;
using boost::shared_ptr;
@@ -350,4 +350,4 @@
intSock2_ = -1;
}
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
diff --git a/lib/cpp/src/transport/TServerSocket.h b/lib/cpp/src/transport/TServerSocket.h
index b6bafa0..b406b78 100644
--- a/lib/cpp/src/transport/TServerSocket.h
+++ b/lib/cpp/src/transport/TServerSocket.h
@@ -10,7 +10,7 @@
#include "TServerTransport.h"
#include <boost/shared_ptr.hpp>
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
class TSocket;
@@ -59,6 +59,6 @@
int intSock2_;
};
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
#endif // #ifndef _THRIFT_TRANSPORT_TSERVERSOCKET_H_
diff --git a/lib/cpp/src/transport/TServerTransport.h b/lib/cpp/src/transport/TServerTransport.h
index b8e6b97..612a94c 100644
--- a/lib/cpp/src/transport/TServerTransport.h
+++ b/lib/cpp/src/transport/TServerTransport.h
@@ -11,7 +11,7 @@
#include "TTransportException.h"
#include <boost/shared_ptr.hpp>
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
/**
* Server transport framework. A server needs to have some facility for
@@ -75,6 +75,6 @@
};
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
#endif // #ifndef _THRIFT_TRANSPORT_TSERVERTRANSPORT_H_
diff --git a/lib/cpp/src/transport/TShortReadTransport.h b/lib/cpp/src/transport/TShortReadTransport.h
index 428fa9e..8b9b192 100644
--- a/lib/cpp/src/transport/TShortReadTransport.h
+++ b/lib/cpp/src/transport/TShortReadTransport.h
@@ -11,7 +11,7 @@
#include <transport/TTransport.h>
-namespace facebook { namespace thrift { namespace transport { namespace test {
+namespace apache { namespace thrift { namespace transport { namespace test {
/**
* This class is only meant for testing. It wraps another transport.
@@ -79,6 +79,6 @@
double fullProb_;
};
-}}}} // facebook::thrift::transport::test
+}}}} // apache::thrift::transport::test
#endif // #ifndef _THRIFT_TRANSPORT_TSHORTREADTRANSPORT_H_
diff --git a/lib/cpp/src/transport/TSocket.cpp b/lib/cpp/src/transport/TSocket.cpp
index 46cd2b4..04cd81e 100644
--- a/lib/cpp/src/transport/TSocket.cpp
+++ b/lib/cpp/src/transport/TSocket.cpp
@@ -22,7 +22,7 @@
#include "TSocket.h"
#include "TTransportException.h"
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
using namespace std;
@@ -556,4 +556,4 @@
return peerPort_;
}
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
diff --git a/lib/cpp/src/transport/TSocket.h b/lib/cpp/src/transport/TSocket.h
index 8d4a5a7..27baa99 100644
--- a/lib/cpp/src/transport/TSocket.h
+++ b/lib/cpp/src/transport/TSocket.h
@@ -13,7 +13,7 @@
#include "TTransport.h"
#include "TServerSocket.h"
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
/**
* TCP Socket implementation of the TTransport interface.
@@ -225,7 +225,7 @@
struct timeval recvTimeval_;
};
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
#endif // #ifndef _THRIFT_TRANSPORT_TSOCKET_H_
diff --git a/lib/cpp/src/transport/TSocketPool.cpp b/lib/cpp/src/transport/TSocketPool.cpp
index d5a6501..549569f 100644
--- a/lib/cpp/src/transport/TSocketPool.cpp
+++ b/lib/cpp/src/transport/TSocketPool.cpp
@@ -9,7 +9,7 @@
#include "TSocketPool.h"
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
using namespace std;
@@ -221,4 +221,4 @@
}
}
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
diff --git a/lib/cpp/src/transport/TSocketPool.h b/lib/cpp/src/transport/TSocketPool.h
index a455aca..b72dfb2 100644
--- a/lib/cpp/src/transport/TSocketPool.h
+++ b/lib/cpp/src/transport/TSocketPool.h
@@ -10,7 +10,7 @@
#include <vector>
#include "TSocket.h"
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
/**
* Class to hold server information for TSocketPool
@@ -174,7 +174,7 @@
bool alwaysTryLast_;
};
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
#endif // #ifndef _THRIFT_TRANSPORT_TSOCKETPOOL_H_
diff --git a/lib/cpp/src/transport/TTransport.h b/lib/cpp/src/transport/TTransport.h
index d775d4e..e2e30f8 100644
--- a/lib/cpp/src/transport/TTransport.h
+++ b/lib/cpp/src/transport/TTransport.h
@@ -12,7 +12,7 @@
#include <transport/TTransportException.h>
#include <string>
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
/**
* Generic interface for a method of transporting data. A TTransport may be
@@ -208,6 +208,6 @@
};
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
#endif // #ifndef _THRIFT_TRANSPORT_TTRANSPORT_H_
diff --git a/lib/cpp/src/transport/TTransportException.cpp b/lib/cpp/src/transport/TTransportException.cpp
index e231a93..e48fe93 100644
--- a/lib/cpp/src/transport/TTransportException.cpp
+++ b/lib/cpp/src/transport/TTransportException.cpp
@@ -12,7 +12,7 @@
using std::string;
using boost::lexical_cast;
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
diff --git a/lib/cpp/src/transport/TTransportException.h b/lib/cpp/src/transport/TTransportException.h
index e254aac..d0c44cf 100644
--- a/lib/cpp/src/transport/TTransportException.h
+++ b/lib/cpp/src/transport/TTransportException.h
@@ -10,7 +10,7 @@
#include <string>
#include <Thrift.h>
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
/**
* Class to encapsulate all the possible types of transport errors that may
@@ -21,7 +21,7 @@
*
* @author Mark Slee <mcslee@facebook.com>
*/
-class TTransportException : public facebook::thrift::TException {
+class TTransportException : public apache::thrift::TException {
public:
/**
* Error codes for the various types of exceptions.
@@ -39,25 +39,25 @@
};
TTransportException() :
- facebook::thrift::TException(),
+ apache::thrift::TException(),
type_(UNKNOWN) {}
TTransportException(TTransportExceptionType type) :
- facebook::thrift::TException(),
+ apache::thrift::TException(),
type_(type) {}
TTransportException(const std::string& message) :
- facebook::thrift::TException(message),
+ apache::thrift::TException(message),
type_(UNKNOWN) {}
TTransportException(TTransportExceptionType type, const std::string& message) :
- facebook::thrift::TException(message),
+ apache::thrift::TException(message),
type_(type) {}
TTransportException(TTransportExceptionType type,
const std::string& message,
int errno_copy) :
- facebook::thrift::TException(message + ": " + TOutput::strerror_s(errno_copy)),
+ apache::thrift::TException(message + ": " + TOutput::strerror_s(errno_copy)),
type_(type) {}
virtual ~TTransportException() throw() {}
@@ -100,6 +100,6 @@
};
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
#endif // #ifndef _THRIFT_TRANSPORT_TTRANSPORTEXCEPTION_H_
diff --git a/lib/cpp/src/transport/TTransportUtils.cpp b/lib/cpp/src/transport/TTransportUtils.cpp
index d365a3c..6ce0c1a 100644
--- a/lib/cpp/src/transport/TTransportUtils.cpp
+++ b/lib/cpp/src/transport/TTransportUtils.cpp
@@ -8,7 +8,7 @@
using std::string;
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
uint32_t TPipedTransport::read(uint8_t* buf, uint32_t len) {
uint32_t need = len;
@@ -162,4 +162,4 @@
srcTrans_->seekToEnd();
}
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
diff --git a/lib/cpp/src/transport/TTransportUtils.h b/lib/cpp/src/transport/TTransportUtils.h
index 61f6822..50ce859 100644
--- a/lib/cpp/src/transport/TTransportUtils.h
+++ b/lib/cpp/src/transport/TTransportUtils.h
@@ -16,7 +16,7 @@
#include <transport/TBufferTransports.h>
#include <transport/TFileTransport.h>
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
/**
* The null transport is a dummy transport that doesn't actually do anything.
@@ -274,6 +274,6 @@
}
};
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
#endif // #ifndef _THRIFT_TRANSPORT_TTRANSPORTUTILS_H_
diff --git a/lib/cpp/src/transport/TZlibTransport.cpp b/lib/cpp/src/transport/TZlibTransport.cpp
index c14b039..7519d96 100644
--- a/lib/cpp/src/transport/TZlibTransport.cpp
+++ b/lib/cpp/src/transport/TZlibTransport.cpp
@@ -12,7 +12,7 @@
using std::string;
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
// Don't call this outside of the constructor.
void TZlibTransport::initZlib() {
@@ -283,4 +283,4 @@
}
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
diff --git a/lib/cpp/src/transport/TZlibTransport.h b/lib/cpp/src/transport/TZlibTransport.h
index c2c1849..482bfda 100644
--- a/lib/cpp/src/transport/TZlibTransport.h
+++ b/lib/cpp/src/transport/TZlibTransport.h
@@ -12,7 +12,7 @@
struct z_stream_s;
-namespace facebook { namespace thrift { namespace transport {
+namespace apache { namespace thrift { namespace transport {
class TZlibTransportException : public TTransportException {
public:
@@ -202,6 +202,6 @@
struct z_stream_s* wstream_;
};
-}}} // facebook::thrift::transport
+}}} // apache::thrift::transport
#endif // #ifndef _THRIFT_TRANSPORT_TZLIBTRANSPORT_H_