Skip to content

Commit 2d7fa7c

Browse files
committed
Merge pull request #9 from robertgrimm/master
Copyright header, private member variable naming and include guard updates
2 parents 9067dcd + b587828 commit 2d7fa7c

File tree

1 file changed

+28
-8
lines changed

1 file changed

+28
-8
lines changed

src/ds3.hpp

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* ******************************************************************************
3+
* Copyright 2014 Spectra Logic Corporation. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
5+
* this file except in compliance with the License. A copy of the License is located at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* or in the "license" file accompanying this file.
10+
* This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
11+
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
12+
* specific language governing permissions and limitations under the License.
13+
* ****************************************************************************
14+
*/
15+
16+
#ifndef __DS3_HPP__
17+
#define __DS3_HPP__
18+
119
#include <string>
220

321
using namespace std;
@@ -7,20 +25,22 @@ namespace ds3 {
725
class Credentials {
826
public:
927
Credentials(const string& access_key, const string& secret_key)
10-
: _access_key(access_key), _secret_key(secret_key) {/* Nothing */}
11-
string accessKey() const { return _access_key; }
12-
string secretKey() const { return _secret_key; }
28+
: m_access_key(access_key), m_secret_key(secret_key) {/* Nothing */}
29+
string accessKey() const { return m_access_key; }
30+
string secretKey() const { return m_secret_key; }
1331
private:
14-
const string _access_key;
15-
const string _secret_key;
32+
const string m_access_key;
33+
const string m_secret_key;
1634
};
1735

1836
class Ds3Client {
1937
public:
20-
Ds3Client(const Credentials& creds) : _creds(creds) {/* Nothing */}
21-
Credentials credentials() const { return _creds; }
38+
Ds3Client(const Credentials& creds) : m_creds(creds) {/* Nothing */}
39+
Credentials credentials() const { return m_creds; }
2240
//~Ds3Client();
2341
private:
24-
const Credentials _creds;
42+
const Credentials m_creds;
2543
};
2644
}
45+
46+
#endif

0 commit comments

Comments
 (0)