diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-13 12:32:21 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-13 12:32:21 -0700 |
| commit | 14be563f00b5fd04e50c44420bef6e5061080156 (patch) | |
| tree | 305de6fec737246373cd50f3accdf02ebf461037 /src/google/protobuf/compiler/cpp/cpp_unittest.h | |
| parent | ba8692fbade4ba329cc4531e286ab5a8e0821d97 (diff) | |
| download | protobuf-14be563f00b5fd04e50c44420bef6e5061080156.tar.gz protobuf-14be563f00b5fd04e50c44420bef6e5061080156.tar.bz2 protobuf-14be563f00b5fd04e50c44420bef6e5061080156.zip | |
Down-integrate proto2 namespace fix.
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_unittest.h')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_unittest.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_unittest.h b/src/google/protobuf/compiler/cpp/cpp_unittest.h index d2dcf0a5..c5dc767a 100644 --- a/src/google/protobuf/compiler/cpp/cpp_unittest.h +++ b/src/google/protobuf/compiler/cpp/cpp_unittest.h @@ -28,14 +28,14 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// This header declares the namespace proto2::protobuf_unittest in order to expose +// This header declares the namespace google::protobuf::protobuf_unittest in order to expose // any problems with the generated class names. We use this header to ensure // unittest.cc will declare the namespace prior to other includes, while obeying // normal include ordering. // // When generating a class name of "foo.Bar" we must ensure we prefix the class -// name with "::", in case the namespace proto2::foo exists. We intentionally -// trigger that case here by declaring proto2::protobuf_unittest. +// name with "::", in case the namespace google::protobuf::foo exists. We intentionally +// trigger that case here by declaring google::protobuf::protobuf_unittest. // // See ClassName in helpers.h for more details. |