← Back to branch summary

~ubuntu-branches/debian/experimental/protobuf/experimental

« back to all changes in this revision

Viewing changes to src/google/protobuf/compiler/cpp/cpp_enum.h

  • Committer: Package Import Robot
  • Author(s): Robert S. Edmonds, Micah Anderson, Colin Watson, Steve Langasek, Robert S. Edmonds
  • Date: 2013-10-12 18:32:37 UTC
  • mfrom: (1.3.1) (10.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20131012183237-jz6tvmj9tn68atrf
Tags: 2.5.0-1
http://bugs.debian.org/704731
http://bugs.debian.org/725976
http://bugs.debian.org/703628
http://bugs.debian.org/726083
[ Micah Anderson ]
* New upstream version. (Closes: #704731.)
* Update debian/watch.
* Refresh patches.

[ Colin Watson ]
* Use the autotools-dev dh addon to update config.guess/config.sub for
  arm64. (Closes: #725976.)

[ Steve Langasek ]
* Don't recommend protobuf-compiler from the bindings, it's not used and
  this doesn't need to be pulled in at runtime. (Closes: #703628.)
* Mark protobuf-compiler Multi-Arch: foreign; the output of this command
  is architecture-independent source, we don't need the version of the
  compiler to match the target arch.
* Bump to debhelper compat 9, so that our libs get installed to the
  multiarch locations.
* Mark the library packages Multi-Arch: same.
* Fix debian/rules to support cross-building of the python bindings.
* Build-depend on libpython-dev, not python-dev, for cross-build
  compatibility.
* (Closes: #726083.)

[ Robert S. Edmonds ]
* Upload to experimental.
* Bump ABI version from 7 to 8.
* Bump Standards-Version to 3.9.4.
* Convert from python-support to dh-python.
* Drop support for python2.6.
* python-protobuf: switch back to the pure Python implementation, as
  upstream appears to no longer be maintaining the current C++ based Python
  binding. See the following upstream issues for details:
  - https://code.google.com/p/protobuf/issues/detail?id=434
  - https://code.google.com/p/protobuf/issues/detail?id=503

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/google/protobuf/compiler/cpp/cpp_enum.h
36
36
#define GOOGLE_PROTOBUF_COMPILER_CPP_ENUM_H__
37
37
 
38
38
#include <string>
 
39
#include <google/protobuf/compiler/cpp/cpp_options.h>
39
40
#include <google/protobuf/descriptor.h>
40
41
 
 
42
 
41
43
namespace google {
42
44
namespace protobuf {
43
45
  namespace io {
53
55
 public:
54
56
  // See generator.cc for the meaning of dllexport_decl.
55
57
  explicit EnumGenerator(const EnumDescriptor* descriptor,
56
 
                         const string& dllexport_decl);
 
58
                         const Options& options);
57
59
  ~EnumGenerator();
58
60
 
59
61
  // Header stuff.
86
88
 private:
87
89
  const EnumDescriptor* descriptor_;
88
90
  string classname_;
89
 
  string dllexport_decl_;
 
91
  Options options_;
90
92
 
91
93
  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator);
92
94
};