format sync
This commit is contained in:
@@ -403,7 +403,6 @@ class linked_hash_map {
|
||||
|
||||
template <class K = key_type, K* = nullptr>
|
||||
mapped_type& operator[](key_arg<K>&& key) {
|
||||
// K* = nullptr parameter above.
|
||||
return LazyEmplaceInternal(std::forward<K>(key)).first->second;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
#include "ortools/linear_solver/linear_solver.h"
|
||||
|
||||
extern "C" {
|
||||
|
||||
#include "ilcplex/cplexx.h"
|
||||
// This is an undocumented function, setting the objective offset
|
||||
// is not supported everywhere (for example it may not be exported if a
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
//
|
||||
#if defined(USE_GLPK)
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
@@ -11,8 +11,6 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
//
|
||||
|
||||
#include "ortools/linear_solver/linear_solver.h"
|
||||
|
||||
#if !defined(_MSC_VER)
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "google/protobuf/text_format.h"
|
||||
|
||||
namespace operations_research {
|
||||
|
||||
namespace {
|
||||
using ::google::protobuf::Descriptor;
|
||||
using ::google::protobuf::FieldDescriptor;
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "google/protobuf/message.h"
|
||||
|
||||
namespace operations_research {
|
||||
|
||||
// Casts a generic google::protobuf::Message* to a specific proto type, or
|
||||
// returns an InvalidArgumentError if it doesn't seem to be of the right type.
|
||||
// Comes in non-const and const versions.
|
||||
|
||||
Reference in New Issue
Block a user