diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-06-13 18:52:46 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-06-13 18:52:46 +0200 |
| commit | 0155137e7d56730665d406c37aa75649e5a3418a (patch) | |
| tree | 05100870215c7852cc27b6970b60c9ff5f77e763 /staging_vespalib | |
| parent | 4e5d87a9baa4176a1089f7afd1f433a8da275725 (diff) | |
| parent | 6a64952133fc05136a0e445851b49bd0fc71c00e (diff) | |
Merge with master
Diffstat (limited to 'staging_vespalib')
| -rw-r--r-- | staging_vespalib/src/vespa/vespalib/data/databuffer.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/data/databuffer.h b/staging_vespalib/src/vespa/vespalib/data/databuffer.h index 5b5b65bc70b..f7707a3ea56 100644 --- a/staging_vespalib/src/vespa/vespalib/data/databuffer.h +++ b/staging_vespalib/src/vespa/vespalib/data/databuffer.h @@ -1,10 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <string.h> -#include <stdint.h> -#include <stdlib.h> -#include <assert.h> +#include <cstring> +#include <cassert> #include <vespa/vespalib/util/alloc.h> namespace vespalib { |